From 66b30cf7ec4de43d29dc9e61c6f9dfb01bc86bc5 Mon Sep 17 00:00:00 2001 From: "daniel.boehrs" Date: Fri, 31 Aug 2018 11:44:46 +0200 Subject: [PATCH] Remove SMS reminder and settings --- res/xml/preferences.xml | 4 ---- .../securesms/ApplicationPreferencesActivity.java | 10 ---------- .../components/reminder/DefaultSmsReminder.java | 5 ++++- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index af3044451..0ab848f8c 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -5,10 +5,6 @@ - - diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index 199b32560..aba06b0d7 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -40,7 +40,6 @@ import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment; import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment; import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment; import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment; -import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment; import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference; import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.util.DynamicLanguage; @@ -61,7 +60,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName(); private static final String PREFERENCE_CATEGORY_PROFILE = "preference_category_profile"; - private static final String PREFERENCE_CATEGORY_SMS_MMS = "preference_category_sms_mms"; private static final String PREFERENCE_CATEGORY_NOTIFICATIONS = "preference_category_notifications"; private static final String PREFERENCE_CATEGORY_APP_PROTECTION = "preference_category_app_protection"; private static final String PREFERENCE_CATEGORY_APPEARANCE = "preference_category_appearance"; @@ -138,8 +136,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA this.findPreference(PREFERENCE_CATEGORY_PROFILE) .setOnPreferenceClickListener(new ProfileClickListener()); - this.findPreference(PREFERENCE_CATEGORY_SMS_MMS) - .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_SMS_MMS)); this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_NOTIFICATIONS)); this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION) @@ -175,8 +171,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA private void setCategorySummaries() { ((ProfilePreference)this.findPreference(PREFERENCE_CATEGORY_PROFILE)).refresh(); - this.findPreference(PREFERENCE_CATEGORY_SMS_MMS) - .setSummary(SmsMmsPreferenceFragment.getSummary(getActivity())); this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS) .setSummary(NotificationsPreferenceFragment.getSummary(getActivity())); this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION) @@ -217,7 +211,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA DrawableCompat.setTint(devices, color); DrawableCompat.setTint(advanced, color); - this.findPreference(PREFERENCE_CATEGORY_SMS_MMS).setIcon(sms); this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS).setIcon(notifications); this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION).setIcon(privacy); this.findPreference(PREFERENCE_CATEGORY_APPEARANCE).setIcon(appearance); @@ -238,9 +231,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA Fragment fragment = null; switch (category) { - case PREFERENCE_CATEGORY_SMS_MMS: - fragment = new SmsMmsPreferenceFragment(); - break; case PREFERENCE_CATEGORY_NOTIFICATIONS: fragment = new NotificationsPreferenceFragment(); break; diff --git a/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java index eb7888221..33cd79b32 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java @@ -14,6 +14,9 @@ import org.thoughtcrime.securesms.util.Util; public class DefaultSmsReminder extends Reminder { + @SuppressWarnings("FieldCanBeLocal") + private static final boolean SUPPORTED = false; + @TargetApi(VERSION_CODES.KITKAT) public DefaultSmsReminder(final Context context) { super(context.getString(R.string.reminder_header_sms_default_title), @@ -44,6 +47,6 @@ public class DefaultSmsReminder extends Reminder { TextSecurePreferences.setPromptedDefaultSmsProvider(context, false); } - return !isDefault && !TextSecurePreferences.hasPromptedDefaultSmsProvider(context); + return SUPPORTED && !isDefault && !TextSecurePreferences.hasPromptedDefaultSmsProvider(context); } }