From 549e45e2d6d511571bff7b3fac9c6c6a7b0bcdbf Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 5 Oct 2016 10:27:32 -0700
Subject: [PATCH] Disable non-blocking identity changes for iOS compat

// FREEBIE
---
 res/xml/preferences_app_protection.xml                 | 10 +++++-----
 .../securesms/DatabaseUpgradeActivity.java             | 10 +++++-----
 .../securesms/util/TextSecurePreferences.java          |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/res/xml/preferences_app_protection.xml b/res/xml/preferences_app_protection.xml
index 0cdee84f75..b5d9b3b17d 100644
--- a/res/xml/preferences_app_protection.xml
+++ b/res/xml/preferences_app_protection.xml
@@ -28,11 +28,11 @@
                         android:title="@string/preferences__screen_security"
                         android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
 
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="pref_blocking_identity_changes"
-            android:title="@string/preferences_app_protection__safety_numbers_approval"
-            android:summary="@string/preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change"/>
+    <!--<org.thoughtcrime.securesms.components.SwitchPreferenceCompat-->
+            <!--android:defaultValue="false"-->
+            <!--android:key="pref_blocking_identity_changes"-->
+            <!--android:title="@string/preferences_app_protection__safety_numbers_approval"-->
+            <!--android:summary="@string/preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change"/>-->
 
     <Preference android:key="preference_category_blocked"
                 android:title="@string/preferences_app_protection__blocked_contacts" />
diff --git a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
index 9c62e4c17b..6dcc39cdf4 100644
--- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
@@ -69,7 +69,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
   public static final int CONTACTS_ACCOUNT_VERSION             = 136;
   public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION      = 151;
   public static final int REDPHONE_SUPPORT_VERSION             = 157;
-  public static final int FINGERPRINTS_NON_BLOCKING_VESRION    = 197;
+//  public static final int FINGERPRINTS_NON_BLOCKING_VESRION    = 197;
 
   private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
     add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);
@@ -83,7 +83,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
     add(MIGRATE_SESSION_PLAINTEXT);
     add(MEDIA_DOWNLOAD_CONTROLS_VERSION);
     add(REDPHONE_SUPPORT_VERSION);
-    add(FINGERPRINTS_NON_BLOCKING_VESRION);
+//    add(FINGERPRINTS_NON_BLOCKING_VESRION);
   }};
 
   private MasterSecret masterSecret;
@@ -234,9 +234,9 @@ public class DatabaseUpgradeActivity extends BaseActivity {
                           .add(new DirectoryRefreshJob(getApplicationContext()));
       }
 
-      if (params[0] < FINGERPRINTS_NON_BLOCKING_VESRION) {
-        TextSecurePreferences.setBlockingIdentityUpdates(getApplicationContext(), true);
-      }
+//      if (params[0] < FINGERPRINTS_NON_BLOCKING_VESRION) {
+//        TextSecurePreferences.setBlockingIdentityUpdates(getApplicationContext(), true);
+//      }
 
       return null;
     }
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index bdfc8f20ea..fb854374b5 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -115,7 +115,8 @@ public class TextSecurePreferences {
   }
 
   public static boolean isBlockingIdentityUpdates(Context context) {
-    return getBooleanPreference(context, BLOCKING_IDENTITY_CHANGES_PREF, false);
+    return true;
+//    return getBooleanPreference(context, BLOCKING_IDENTITY_CHANGES_PREF, false);
   }
 
   public static void setBlockingIdentityUpdates(Context context, boolean value) {