From e14b5d9b3fd59f7a2a3b173efff3842ddd6c05f1 Mon Sep 17 00:00:00 2001
From: M66B <marcel@bokhorst.biz>
Date: Wed, 13 Nov 2013 13:07:23 +0100
Subject: [PATCH] Option to randomize subscriber ID (ICC)

Fixes #690
---
 CHANGELOG.md                                  |  2 ++
 res/layout/settings.xml                       |  2 +-
 src/biz/bokhorst/xprivacy/BootReceiver.java   |  2 ++
 src/biz/bokhorst/xprivacy/PrivacyManager.java | 13 ++++++++++--
 src/biz/bokhorst/xprivacy/SettingsDialog.java | 21 ++++++++++++++-----
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 776beff2f..753399778 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,10 @@ Changelog
 
 * Fixed rare null pointer exception ([issue](https://github.com/M66B/XPrivacy/issues/739))
 * Fixed flickering with black theme
+* Fixed setting global and randomize on boot settings
 * Require Android 4.0.3 (minimum for Xposed)
 * Added settings for Advertisement ID (including randomization) ([issue](https://github.com/M66B/XPrivacy/issues/738))
+* Option to randomize subscriber ID (IMSI) ([issue](https://github.com/M66B/XPrivacy/issues/690))
 * Added traditional Chinese translation
 * Updated German translation
 * Updated Vietnamese translation
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index c6f1d3ec9..14071a6fd 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -279,7 +279,7 @@
                     android:text="@string/settings_subscriber"
                     android:textIsSelectable="false" />
 
-                <View />
+                <CheckBox android:id="@+id/cbSubscriber" />
 
                 <EditText
                     android:id="@+id/etSubscriber"
diff --git a/src/biz/bokhorst/xprivacy/BootReceiver.java b/src/biz/bokhorst/xprivacy/BootReceiver.java
index 0c8251709..93726e8dc 100644
--- a/src/biz/bokhorst/xprivacy/BootReceiver.java
+++ b/src/biz/bokhorst/xprivacy/BootReceiver.java
@@ -74,6 +74,8 @@ private void randomizeSettings(Context context, int uid) {
 					PrivacyManager.getRandomProp("AdvertisingId"));
 			PrivacyManager.setSetting(null, context, uid, PrivacyManager.cSettingCountry,
 					PrivacyManager.getRandomProp("ISO3166"));
+			PrivacyManager.setSetting(null, context, uid, PrivacyManager.cSettingSubscriber,
+					PrivacyManager.getRandomProp("SubscriberId"));
 		}
 	}
 }
diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java
index af5a3adf1..dd3034b80 100644
--- a/src/biz/bokhorst/xprivacy/PrivacyManager.java
+++ b/src/biz/bokhorst/xprivacy/PrivacyManager.java
@@ -776,8 +776,10 @@ public static Object getDefacedProp(int uid, String name) {
 		if (name.equals("getSimSerialNumber"))
 			return getSetting(null, null, uid, cSettingIccId, null, true);
 
-		if (name.equals("getSubscriberId")) // IMSI for a GSM phone
-			return getSetting(null, null, uid, cSettingSubscriber, null, true);
+		if (name.equals("getSubscriberId")) { // IMSI for a GSM phone
+			String value = getSetting(null, null, uid, cSettingSubscriber, null, true);
+			return (cValueRandom.equals(value) ? getRandomProp("SubscriberId") : value);
+		}
 
 		if (name.equals("SSID"))
 			return ""; // Hidden network
@@ -961,6 +963,13 @@ public static String getRandomProp(String name) {
 			return Double.toString(d);
 		}
 
+		if (name.equals("SubscriberId")) {
+			String subscriber = "001";
+			while (subscriber.length() < 15)
+				subscriber += Character.forDigit(r.nextInt(10), 10);
+			return subscriber;
+		}
+
 		return "";
 	}
 
diff --git a/src/biz/bokhorst/xprivacy/SettingsDialog.java b/src/biz/bokhorst/xprivacy/SettingsDialog.java
index 618f77b97..6d6c0776f 100644
--- a/src/biz/bokhorst/xprivacy/SettingsDialog.java
+++ b/src/biz/bokhorst/xprivacy/SettingsDialog.java
@@ -65,6 +65,7 @@ public static void edit(final Context context, ApplicationInfoEx appInfo) {
 		final CheckBox cbGsfId = (CheckBox) dlgSettings.findViewById(R.id.cbGsfId);
 		final CheckBox cbAdId = (CheckBox) dlgSettings.findViewById(R.id.cbAdId);
 		final CheckBox cbCountry = (CheckBox) dlgSettings.findViewById(R.id.cbCountry);
+		final CheckBox cbSubscriber = (CheckBox) dlgSettings.findViewById(R.id.cbSubscriber);
 
 		Button btnOk = (Button) dlgSettings.findViewById(R.id.btnOk);
 		Button btnClear = (Button) dlgSettings.findViewById(R.id.btnClear);
@@ -91,6 +92,7 @@ public static void edit(final Context context, ApplicationInfoEx appInfo) {
 		String gsfid = PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingGsfId, "", false);
 		String adid = PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingAdId, "", false);
 		String country = PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingCountry, "", false);
+		String subscriber = PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingSubscriber, "", false);
 
 		cbSerial.setChecked(serial.equals(PrivacyManager.cValueRandom));
 		cbLat.setChecked(lat.equals(PrivacyManager.cValueRandom));
@@ -102,6 +104,7 @@ public static void edit(final Context context, ApplicationInfoEx appInfo) {
 		cbGsfId.setChecked(gsfid.equals(PrivacyManager.cValueRandom));
 		cbAdId.setChecked(adid.equals(PrivacyManager.cValueRandom));
 		cbCountry.setChecked(country.equals(PrivacyManager.cValueRandom));
+		cbSubscriber.setChecked(subscriber.equals(PrivacyManager.cValueRandom));
 
 		etSerial.setText(cbSerial.isChecked() ? "" : serial);
 		etLat.setText(cbLat.isChecked() ? "" : lat);
@@ -113,6 +116,7 @@ public static void edit(final Context context, ApplicationInfoEx appInfo) {
 		etGsfId.setText(cbGsfId.isChecked() ? "" : gsfid);
 		etAdId.setText(cbAdId.isChecked() ? "" : adid);
 		etCountry.setText(cbCountry.isChecked() ? "" : country);
+		etSubscriber.setText(cbSubscriber.isChecked() ? "" : subscriber);
 
 		etSerial.setEnabled(!cbSerial.isChecked());
 		etLat.setEnabled(!cbLat.isChecked());
@@ -124,6 +128,7 @@ public static void edit(final Context context, ApplicationInfoEx appInfo) {
 		etGsfId.setEnabled(!cbGsfId.isChecked());
 		etAdId.setEnabled(!cbAdId.isChecked());
 		etCountry.setEnabled(!cbCountry.isChecked());
+		etSubscriber.setEnabled(!cbSubscriber.isChecked());
 
 		cbSerial.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 			@Override
@@ -185,14 +190,18 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 				etCountry.setEnabled(!isChecked);
 			}
 		});
+		cbSubscriber.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+				etSubscriber.setEnabled(!isChecked);
+			}
+		});
 
 		etIP.setText(PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingIP, "", false));
 		etMcc.setText(PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingMcc, "", false));
 		etMnc.setText(PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingMnc, "", false));
 		etOperator.setText(PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingOperator, "", false));
 		etIccId.setText(PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingIccId, "", false));
-		etSubscriber.setText(PrivacyManager
-				.getSetting(null, context, uid, PrivacyManager.cSettingSubscriber, "", false));
 		etUa.setText(PrivacyManager.getSetting(null, context, uid, PrivacyManager.cSettingUa, "", false));
 
 		if (uid == 0) {
@@ -253,6 +262,7 @@ public void onClick(View view) {
 				etGsfId.setText(PrivacyManager.getRandomProp("GSF_ID"));
 				etAdId.setText(PrivacyManager.getRandomProp("AdvertisingId"));
 				etCountry.setText(PrivacyManager.getRandomProp("ISO3166"));
+				etSubscriber.setText(PrivacyManager.getRandomProp("SubscriberId"));
 			}
 		});
 
@@ -276,7 +286,7 @@ public void onClick(View view) {
 					!cbCountry.isChecked() && etCountry.getText().toString().equals("") &&
 					etOperator.getText().toString().equals("") &&
 					etIccId.getText().toString().equals("") &&
-					etSubscriber.getText().toString().equals("") &&
+					!cbSubscriber.isChecked() && etSubscriber.getText().toString().equals("") &&
 					etUa.getText().toString().equals("")) {
 					// @formatter:on
 
@@ -352,8 +362,8 @@ public void onClick(View view) {
 							.toString());
 					PrivacyManager.setSetting(null, context, uid, PrivacyManager.cSettingIccId, etIccId.getText()
 							.toString());
-					PrivacyManager.setSetting(null, context, uid, PrivacyManager.cSettingSubscriber, etSubscriber
-							.getText().toString());
+					PrivacyManager.setSetting(null, context, uid, PrivacyManager.cSettingSubscriber,
+							cbSubscriber.isChecked() ? PrivacyManager.cValueRandom : etSubscriber.getText().toString());
 					PrivacyManager.setSetting(null, context, uid, PrivacyManager.cSettingUa, etUa.getText().toString());
 				}
 
@@ -410,6 +420,7 @@ public void onClick(View view) {
 				cbGsfId.setChecked(false);
 				cbAdId.setChecked(false);
 				cbCountry.setChecked(false);
+				cbSubscriber.setChecked(false);
 			}
 		});