From e710e231ada731a19a445a6764bff30e304934eb Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 29 Apr 2022 16:43:19 -0400 Subject: [PATCH] Remove notification profile megaphone. --- .../EditNotificationProfileFragment.kt | 7 ------- .../profiles/NotificationProfilesFragment.kt | 7 ------- .../megaphone/MegaphoneRepository.java | 1 - .../securesms/megaphone/Megaphones.java | 19 ------------------- .../ic_notification_profiles_megaphone.xml | 9 --------- app/src/main/res/values/strings.xml | 9 --------- 6 files changed, 52 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_notification_profiles_megaphone.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt index 5f1c72b3f..fc6ef2d6c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt @@ -22,8 +22,6 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.EditNotificationProfileViewModel.SaveNotificationProfileResult import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.models.NotificationProfileNamePreset -import org.thoughtcrime.securesms.dependencies.ApplicationDependencies -import org.thoughtcrime.securesms.megaphone.Megaphones import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment import org.thoughtcrime.securesms.util.BottomSheetUtil import org.thoughtcrime.securesms.util.CircularProgressButtonUtil @@ -49,11 +47,6 @@ class EditNotificationProfileFragment : DSLSettingsFragment(layoutId = R.layout. return EditNotificationProfileViewModel.Factory(profileId) } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.NOTIFICATION_PROFILES) - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesFragment.kt index 91eca4ea4..8860dea67 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesFragment.kt @@ -17,8 +17,6 @@ import org.thoughtcrime.securesms.components.settings.app.notifications.profiles import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.models.NotificationProfilePreference import org.thoughtcrime.securesms.components.settings.configure import org.thoughtcrime.securesms.components.settings.conversation.preferences.LargeIconClickPreference -import org.thoughtcrime.securesms.dependencies.ApplicationDependencies -import org.thoughtcrime.securesms.megaphone.Megaphones import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile import org.thoughtcrime.securesms.notifications.profiles.NotificationProfiles import org.thoughtcrime.securesms.util.LifecycleDisposable @@ -37,11 +35,6 @@ class NotificationProfilesFragment : DSLSettingsFragment() { private val lifecycleDisposable = LifecycleDisposable() private var toolbar: Toolbar? = null - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.NOTIFICATION_PROFILES) - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java index 8d547f623..da83a816d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java @@ -51,7 +51,6 @@ public class MegaphoneRepository { executor.execute(() -> { database.markFinished(Event.CHAT_COLORS); database.markFinished(Event.ADD_A_PROFILE_PHOTO); - database.markFinished(Event.NOTIFICATION_PROFILES); resetDatabaseCache(); }); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java index a527ae95c..2da720511 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -111,7 +111,6 @@ public final class Megaphones { // Feature-introduction megaphones should *probably* be added below this divider put(Event.CHAT_COLORS, ALWAYS); put(Event.ADD_A_PROFILE_PHOTO, shouldShowAddAProfilePhotoMegaphone(context) ? ALWAYS : NEVER); - put(Event.NOTIFICATION_PROFILES, ShowForDurationSchedule.showForDays(7)); }}; } @@ -133,8 +132,6 @@ public final class Megaphones { return buildAddAProfilePhotoMegaphone(context); case BECOME_A_SUSTAINER: return buildBecomeASustainerMegaphone(context); - case NOTIFICATION_PROFILES: - return buildNotificationProfilesMegaphone(context); case TURN_OFF_CENSORSHIP_CIRCUMVENTION: return buildTurnOffCircumventionMegaphone(context); default: @@ -281,21 +278,6 @@ public final class Megaphones { .build(); } - private static @NonNull Megaphone buildNotificationProfilesMegaphone(@NonNull Context context) { - return new Megaphone.Builder(Event.NOTIFICATION_PROFILES, Megaphone.Style.BASIC) - .setTitle(R.string.NotificationProfilesMegaphone__notification_profiles) - .setImage(R.drawable.ic_notification_profiles_megaphone) - .setBody(R.string.NotificationProfilesMegaphone__only_get_notifications_from_the_people_and_groups_you_choose) - .setActionButton(R.string.NotificationProfilesMegaphone__create_a_profile, (megaphone, listener) -> { - listener.onMegaphoneNavigationRequested(AppSettingsActivity.notificationProfiles(context)); - listener.onMegaphoneCompleted(Event.NOTIFICATION_PROFILES); - }) - .setSecondaryButton(R.string.NotificationProfilesMegaphone__not_now, (megaphone, listener) -> { - listener.onMegaphoneCompleted(Event.NOTIFICATION_PROFILES); - }) - .build(); - } - private static @NonNull Megaphone buildTurnOffCircumventionMegaphone(@NonNull Context context) { return new Megaphone.Builder(Event.TURN_OFF_CENSORSHIP_CIRCUMVENTION, Megaphone.Style.BASIC) .setTitle(R.string.CensorshipCircumventionMegaphone_turn_off_censorship_circumvention) @@ -395,7 +377,6 @@ public final class Megaphones { ADD_A_PROFILE_PHOTO("add_a_profile_photo"), BECOME_A_SUSTAINER("become_a_sustainer"), VALENTINES_DONATIONS_2022("valentines_donations_2022"), - NOTIFICATION_PROFILES("notification_profiles"), TURN_OFF_CENSORSHIP_CIRCUMVENTION("turn_off_censorship_circumvention"); private final String key; diff --git a/app/src/main/res/drawable/ic_notification_profiles_megaphone.xml b/app/src/main/res/drawable/ic_notification_profiles_megaphone.xml deleted file mode 100644 index d3817ffef..000000000 --- a/app/src/main/res/drawable/ic_notification_profiles_megaphone.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 67a657d7c..69e0d3deb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4377,15 +4377,6 @@ On until %1$s - - Notification profiles - - Only get notifications from the people and groups you choose. - - Create a profile - - Not now - Failed to open picker.