TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-26 08:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update behavior for incoming SMS path.

Browse Source 
1) On KitKat, unencrypted SMS messages are never stored in
   TextSecure unless it is set as the system-wide default.

2) On KitKat, if TextSecure is set as the system-wide default,
   provide an option to change the default to a different app.

3) Don't store the TextSecure challenge on KitKat+ devices.
This commit is contained in:
Moxie Marlinspike
2014-02-28 13:36:47 -08:00
parent a3e900ecbe
commit 81ee9e31c5
4 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
View File

@@ -38,6 +38,7 @@ import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import android.preference.RingtonePreference;
import android.provider.ContactsContract;
import android.provider.Settings;
import android.provider.Telephony;
import android.text.TextUtils;
import android.util.Log;
@@ -101,7 +102,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
addPreferencesFromResource(R.xml.preferences);
initializeIdentitySelection();
initializePlatformSpecificOptions();
initializeSmsFallbackOption();
initializePushMessagingToggle();
@@ -142,6 +142,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
super.onResume();
dynamicTheme.onResume(this);
dynamicLanguage.onResume(this);
initializePlatformSpecificOptions();
}
@Override
@@ -187,21 +189,26 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
private void initializePlatformSpecificOptions() {
PreferenceGroup generalCategory = (PreferenceGroup) findPreference("general_category");
Preference defaultPreference = findPreference(KITKAT_DEFAULT_PREF);
Preference allSmsPreference = findPreference(TextSecurePreferences.ALL_SMS_PREF);
Preference allMmsPreference = findPreference(TextSecurePreferences.ALL_MMS_PREF);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
generalCategory.removePreference(findPreference(TextSecurePreferences.ALL_SMS_PREF));
generalCategory.removePreference(findPreference(TextSecurePreferences.ALL_MMS_PREF));
if (allSmsPreference != null) generalCategory.removePreference(allSmsPreference);
if (allMmsPreference != null) generalCategory.removePreference(allMmsPreference);
if (Util.isDefaultSmsProvider(this)) {
generalCategory.removePreference(defaultPreference);
defaultPreference.setIntent(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
defaultPreference.setTitle(getString(R.string.ApplicationPreferencesActivity_sms_enabled));
defaultPreference.setSummary(getString(R.string.ApplicationPreferencesActivity_touch_to_change_your_default_sms_app));
} else {
Intent intent = new Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT);
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, getPackageName());
defaultPreference.setIntent(intent);
defaultPreference.setTitle(getString(R.string.ApplicationPreferencesActivity_sms_disabled));
defaultPreference.setSummary(getString(R.string.ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app));
}
} else {
generalCategory.removePreference(defaultPreference);
if (defaultPreference != null) generalCategory.removePreference(defaultPreference);
}
}