From c168fcd0c2468ec939b8d164175e9c5776a63147 Mon Sep 17 00:00:00 2001
From: Alan Young <consult.awy@gmail.com>
Date: Thu, 17 Sep 2015 10:16:29 +0200
Subject: Do not override system default time-zone.

Remove calls to TimeZone.setDefault().

Whatever problem the changes that introduced these calls were supposed
to solve, overriding the system default timezone is not the right
solution.

Change-Id: I626419a1c00fe9d68df0c63472d4433e12502acb

diff --git a/src/com/isode/stroke/elements/JingleFileTransferFileInfo.java b/src/com/isode/stroke/elements/JingleFileTransferFileInfo.java
index fc4675e..271a0e2 100644
--- a/src/com/isode/stroke/elements/JingleFileTransferFileInfo.java
+++ b/src/com/isode/stroke/elements/JingleFileTransferFileInfo.java
@@ -79,7 +79,6 @@ public class JingleFileTransferFileInfo extends Payload {
 	public JingleFileTransferFileInfo(String name, String description, long size, Date date) {
 		NotNull.exceptIfNull(name, "name");
 		NotNull.exceptIfNull(description, "description");
-		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
 		this.name_ = name;
 		this.description_ = description;
 		this.size_ = size;
diff --git a/src/com/isode/stroke/vcards/VCardManager.java b/src/com/isode/stroke/vcards/VCardManager.java
index a5b62e8..80e7942 100644
--- a/src/com/isode/stroke/vcards/VCardManager.java
+++ b/src/com/isode/stroke/vcards/VCardManager.java
@@ -39,7 +39,6 @@ public class VCardManager {
         this.ownJID = ownJID;
         this.iqRouter = iqRouter;
         this.storage = vcardStorage;
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
     }
 
     public void delete() {
diff --git a/src/com/isode/stroke/vcards/VCardMemoryStorage.java b/src/com/isode/stroke/vcards/VCardMemoryStorage.java
index 24ca6f4..6a1bc75 100644
--- a/src/com/isode/stroke/vcards/VCardMemoryStorage.java
+++ b/src/com/isode/stroke/vcards/VCardMemoryStorage.java
@@ -16,7 +16,6 @@ import java.util.TimeZone;
 public class VCardMemoryStorage extends VCardStorage {
     public VCardMemoryStorage(CryptoProvider crypto) {
         super(crypto);
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
     }
 
     private Map<JID, VCard> vcards = new HashMap<JID, VCard>();
-- 
cgit v0.10.2-6-g49f6