Revert "Added restriction for time zone"

This reverts commit 6d9cfb6. Conflicts: CHANGELOG.md src/biz/bokhorst/xprivacy/Meta.java
M66B · Mar 11, 2014 · 91a0080 · 91a0080
1 parent 50f2ed4
commit 91a0080
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,10 +15,13 @@ Changelog
 
 **Next release**
 
-* Updated Norwegian translation
-
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
+**Version 2.0.1 STABLE**
+
+* Reverted restriction for time zone ([issue](/../../issues/1524))
+* Updated Norwegian translation
+
 **Version 2.0 STABLE**
 
 * Replaced XML settings files by a privacy service and a privacy database

diff --git a/res/values/functions.xml b/res/values/functions.xml
@@ -239,7 +239,6 @@
  <string name="system_android_intent_action_EXTERNAL_APPLICATIONS_AVAILABLE" translatable="false"><![CDATA[<a href="http://developer.android.com/reference/android/content/Intent.html#ACTION_EXTERNAL_APPLICATIONS_AVAILABLE">Google documentation</a>]]></string>
  <string name="system_android_intent_action_EXTERNAL_APPLICATIONS_UNAVAILABLE" translatable="false"><![CDATA[<a href="http://developer.android.com/reference/android/content/Intent.html#ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE">Google documentation</a>]]></string>
  <string name="system_ApplicationsProvider" translatable="false"><![CDATA[Will restrict access to a list of applications installed on the phone to provide search suggestions]]></string>
- <string name="system_TZ_getDefault" translatable="false"><![CDATA[<a href="http://developer.android.com/reference/java/util/TimeZone.html#getDefault()">Google documentation</a>]]></string>
  <!-- view -->
  <string name="view_loadUrl" translatable="false"><![CDATA[<a href="http://developer.android.com/reference/android/webkit/WebView.html#loadUrl(java.lang.String)">Google documentation</a>]]></string>
  <string name="view_WebView" translatable="false"><![CDATA[<a href="http://developer.android.com/reference/android/webkit/WebView.html">Google documentation</a>]]></string>

diff --git a/src/biz/bokhorst/xprivacy/Meta.java b/src/biz/bokhorst/xprivacy/Meta.java
@@ -272,8 +272,6 @@ public static List<Hook> get() {
  mListHook.add(new Hook("system", "android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE", "", 8, null, null).dangerous());
  mListHook.add(new Hook("system", "ApplicationsProvider", "", 1, null, null));
 
- mListHook.add(new Hook("system", "TZ.getDefault", "", 1, "2.0", null).dangerous());
-
  mListHook.add(new Hook("view", "loadUrl", "", 1, null, null).whitelist(cTypeUrl));
  mListHook.add(new Hook("view", "WebView", "", 1, null, null));
  mListHook.add(new Hook("view", "getDefaultUserAgent", "", 17, null, null));

diff --git a/src/biz/bokhorst/xprivacy/XPrivacy.java b/src/biz/bokhorst/xprivacy/XPrivacy.java
@@ -143,9 +143,6 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
  // System properties
  hookAll(XSystemProperties.getInstances(), mSecret);
 
- // Time zone
- hookAll(XTimeZone.getInstances(), mSecret);
-
  // Web view
  hookAll(XWebView.getInstances(), mSecret);
 

diff --git a/src/biz/bokhorst/xprivacy/XTimeZone.java b/src/biz/bokhorst/xprivacy/XTimeZone.java