TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-04 22:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable non-blocking safety number changes

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2016-11-11 19:07:35 -08:00
parent 9064c02fa8
commit 0abe56171a
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/xml/preferences_app_protection.xml
View File

@ -28,11 +28,11 @@
android:title="@string/preferences__screen_security" android:title="@string/preferences__screen_security"
android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" /> android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
<!--<org.thoughtcrime.securesms.components.SwitchPreferenceCompat--> <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
<!--android:defaultValue="false"--> android:defaultValue="false"
<!--android:key="pref_blocking_identity_changes"--> android:key="pref_blocking_identity_changes"
<!--android:title="@string/preferences_app_protection__safety_numbers_approval"--> android:title="@string/preferences_app_protection__safety_numbers_approval"
<!--android:summary="@string/preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change"/>--> android:summary="@string/preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change"/>
<Preference android:key="preference_category_blocked" <Preference android:key="preference_category_blocked"
android:title="@string/preferences_app_protection__blocked_contacts" /> android:title="@string/preferences_app_protection__blocked_contacts" />

10
src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
View File

@ -69,7 +69,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
public static final int CONTACTS_ACCOUNT_VERSION = 136; public static final int CONTACTS_ACCOUNT_VERSION = 136;
public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION = 151; public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION = 151;
public static final int REDPHONE_SUPPORT_VERSION = 157; 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 = 212;
private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{ private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION); add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);
@ -83,7 +83,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
add(MIGRATE_SESSION_PLAINTEXT); add(MIGRATE_SESSION_PLAINTEXT);
add(MEDIA_DOWNLOAD_CONTROLS_VERSION); add(MEDIA_DOWNLOAD_CONTROLS_VERSION);
add(REDPHONE_SUPPORT_VERSION); add(REDPHONE_SUPPORT_VERSION);
// add(FINGERPRINTS_NON_BLOCKING_VESRION); add(FINGERPRINTS_NON_BLOCKING_VESRION);
}}; }};
private MasterSecret masterSecret; private MasterSecret masterSecret;
@ -234,9 +234,9 @@ public class DatabaseUpgradeActivity extends BaseActivity {
.add(new DirectoryRefreshJob(getApplicationContext())); .add(new DirectoryRefreshJob(getApplicationContext()));
} }
// if (params[0] < FINGERPRINTS_NON_BLOCKING_VESRION) { if (params[0] < FINGERPRINTS_NON_BLOCKING_VESRION) {
// TextSecurePreferences.setBlockingIdentityUpdates(getApplicationContext(), true); TextSecurePreferences.setBlockingIdentityUpdates(getApplicationContext(), true);
// } }
return null; return null;
} }

2
src/org/thoughtcrime/securesms/jobs/IdentityUpdateJob.java
View File

@ -22,7 +22,7 @@ public class IdentityUpdateJob extends MasterSecretJob {
public IdentityUpdateJob(Context context, long recipientId) { public IdentityUpdateJob(Context context, long recipientId) {
super(context, JobParameters.newBuilder() super(context, JobParameters.newBuilder()
.withGroupId(IdentityUpdateJob.class.getName()) .withGroupId("IdentityUpdateJob")
.withPersistence() .withPersistence()
.create()); .create());
this.recipientId = recipientId; this.recipientId = recipientId;

3
src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@ -115,8 +115,7 @@ public class TextSecurePreferences {
} }
public static boolean isBlockingIdentityUpdates(Context context) { public static boolean isBlockingIdentityUpdates(Context context) {
return true; return getBooleanPreference(context, BLOCKING_IDENTITY_CHANGES_PREF, false);
// return getBooleanPreference(context, BLOCKING_IDENTITY_CHANGES_PREF, false);
} }
public static void setBlockingIdentityUpdates(Context context, boolean value) { public static void setBlockingIdentityUpdates(Context context, boolean value) {