Fixed randomize on access combined with randomize on boot

Fixes #1547
M66B · Mar 13, 2014 · 19d7a1a · 19d7a1a
1 parent 58da9b0
commit 19d7a1a
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ Changelog
 * Fixed restrictions not always showing correct after on demand restricting ([issue](/../../issues/1549))
 * Fixed invalid *restart required* when toggling restrictions of a category
 * Fixed and improved batch operation layout ([issue](/../../issues/1539))
+* Fixed randomize on access combined with randomize on boot ([issue](/../../issues/1547))
 * Better matching of *sh* and *su* ([issue](/../../issues/1551))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)

diff --git a/src/biz/bokhorst/xprivacy/UpdateService.java b/src/biz/bokhorst/xprivacy/UpdateService.java
@@ -196,25 +196,58 @@ private static void randomize(Context context) {
 	private static List<PSetting> getRandomizeWork(Context context, int uid) {
 		List<PSetting> listWork = new ArrayList<PSetting>();
 		if (PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingRandom, false, true)) {
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingLatitude, PrivacyManager.getRandomProp("LAT")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingLongitude, PrivacyManager.getRandomProp("LON")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingAltitude, PrivacyManager.getRandomProp("ALT")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingSerial, PrivacyManager.getRandomProp("SERIAL")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingMac, PrivacyManager.getRandomProp("MAC")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingPhone, PrivacyManager.getRandomProp("PHONE")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingImei, PrivacyManager.getRandomProp("IMEI")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingId, PrivacyManager.getRandomProp("ANDROID_ID")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingGsfId, PrivacyManager.getRandomProp("GSF_ID")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingAdId, PrivacyManager
-					.getRandomProp("AdvertisingId")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingCountry, PrivacyManager.getRandomProp("ISO3166")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingSubscriber, PrivacyManager
-					.getRandomProp("SubscriberId")));
-			listWork.add(new PSetting(uid, "", PrivacyManager.cSettingSSID, PrivacyManager.getRandomProp("SSID")));
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingLatitude))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingLatitude, PrivacyManager.getRandomProp("LAT")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingLongitude))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingLongitude, PrivacyManager
+						.getRandomProp("LON")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingAltitude))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingAltitude, PrivacyManager.getRandomProp("ALT")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingSerial))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingSerial, PrivacyManager
+						.getRandomProp("SERIAL")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingMac))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingMac, PrivacyManager.getRandomProp("MAC")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingPhone))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingPhone, PrivacyManager.getRandomProp("PHONE")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingImei))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingImei, PrivacyManager.getRandomProp("IMEI")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingId))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingId, PrivacyManager
+						.getRandomProp("ANDROID_ID")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingGsfId))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingGsfId, PrivacyManager.getRandomProp("GSF_ID")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingAdId))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingAdId, PrivacyManager
+						.getRandomProp("AdvertisingId")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingCountry))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingCountry, PrivacyManager
+						.getRandomProp("ISO3166")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingSubscriber))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingSubscriber, PrivacyManager
+						.getRandomProp("SubscriberId")));
+
+			if (!hasRandomOnAccess(uid, PrivacyManager.cSettingSSID))
+				listWork.add(new PSetting(uid, "", PrivacyManager.cSettingSSID, PrivacyManager.getRandomProp("SSID")));
 		}
 		return listWork;
 	}
 
+	private static boolean hasRandomOnAccess(int uid, String setting) {
+		return PrivacyManager.cValueRandom.equals(PrivacyManager.getSetting(uid, setting, null, false));
+	}
+
 	private static List<PRestriction> getUpgradeWork(Version sVersion, boolean dangerous, int uid) {
 		List<PRestriction> listWork = new ArrayList<PRestriction>();
 		for (String restrictionName : PrivacyManager.getRestrictions())