From db545f43ea1f532149950dd0140144eb5c8f49a6 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 26 Jun 2020 11:50:33 -0400 Subject: [PATCH] Remove profile name reminder megaphone. --- .../ConversationListFragment.java | 13 -------- .../securesms/megaphone/Megaphones.java | 32 ------------------- .../profiles/edit/EditProfileFragment.java | 2 -- .../securesms/util/FeatureFlags.java | 8 ----- app/src/main/res/values/strings.xml | 10 ------ 5 files changed, 65 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java index c8601fa42a..6550813eee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java @@ -142,8 +142,6 @@ public class ConversationListFragment extends MainFragment implements ActionMode MegaphoneActionController { public static final short MESSAGE_REQUESTS_REQUEST_CODE_CREATE_NAME = 32562; - public static final short PROFILE_NAMES_REQUEST_CODE_CREATE_NAME = 18473; - public static final short PROFILE_NAMES_REQUEST_CODE_CONFIRM_NAME = 19563; private static final String TAG = Log.tag(ConversationListFragment.class); @@ -331,20 +329,9 @@ public class ConversationListFragment extends MainFragment implements ActionMode return; } - boolean isProfileCreatedRequestCode = requestCode == MESSAGE_REQUESTS_REQUEST_CODE_CREATE_NAME || - requestCode ==PROFILE_NAMES_REQUEST_CODE_CREATE_NAME; - if (requestCode == CreateKbsPinActivity.REQUEST_NEW_PIN) { Snackbar.make(fab, R.string.ConfirmKbsPinFragment__pin_created, Snackbar.LENGTH_LONG).show(); viewModel.onMegaphoneCompleted(Megaphones.Event.PINS_FOR_ALL); - } else if (isProfileCreatedRequestCode) { - Snackbar.make(fab, R.string.ConversationListFragment__your_profile_name_has_been_created, Snackbar.LENGTH_LONG).show(); - - if (requestCode == MESSAGE_REQUESTS_REQUEST_CODE_CREATE_NAME) { - viewModel.onMegaphoneCompleted(Megaphones.Event.MESSAGE_REQUESTS); - } - } else if (requestCode == PROFILE_NAMES_REQUEST_CODE_CONFIRM_NAME) { - Snackbar.make(fab, R.string.ConversationListFragment__your_profile_name_has_been_saved, Snackbar.LENGTH_LONG).show(); } } 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 01b5bd3d1f..b5ad251eb0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -93,7 +93,6 @@ public final class Megaphones { return new LinkedHashMap() {{ put(Event.REACTIONS, ALWAYS); put(Event.PINS_FOR_ALL, new PinsForAllSchedule()); - put(Event.PROFILE_NAMES_FOR_ALL, FeatureFlags.profileNamesMegaphone() ? EVERY_TWO_DAYS : NEVER); put(Event.PIN_REMINDER, new SignalPinReminderSchedule()); put(Event.MESSAGE_REQUESTS, shouldShowMessageRequestsMegaphone() ? ALWAYS : NEVER); }}; @@ -107,8 +106,6 @@ public final class Megaphones { return buildPinsForAllMegaphone(record); case PIN_REMINDER: return buildPinReminderMegaphone(context); - case PROFILE_NAMES_FOR_ALL: - return buildProfileNamesMegaphone(context); case MESSAGE_REQUESTS: return buildMessageRequestsMegaphone(context); default: @@ -180,34 +177,6 @@ public final class Megaphones { .build(); } - private static @NonNull Megaphone buildProfileNamesMegaphone(@NonNull Context context) { - short requestCode = Recipient.self().getProfileName() != ProfileName.EMPTY - ? ConversationListFragment.PROFILE_NAMES_REQUEST_CODE_CONFIRM_NAME - : ConversationListFragment.PROFILE_NAMES_REQUEST_CODE_CREATE_NAME; - - Megaphone.Builder builder = new Megaphone.Builder(Event.PROFILE_NAMES_FOR_ALL, Megaphone.Style.BASIC) - .enableSnooze(null) - .setImageRequest(AvatarUtil.getSelfAvatarOrFallbackIcon(context, R.drawable.ic_profilename_64)); - - if (Recipient.self().getProfileName() == ProfileName.EMPTY) { - return builder.setTitle(R.string.ProfileNamesMegaphone__add_a_profile_name) - .setBody(R.string.ProfileNamesMegaphone__this_will_be_displayed_when_you_start) - .setActionButton(R.string.ProfileNamesMegaphone__add_profile_name, (megaphone, listener) -> { - listener.onMegaphoneSnooze(Event.PROFILE_NAMES_FOR_ALL); - listener.onMegaphoneNavigationRequested(new Intent(context, EditProfileActivity.class), requestCode); - }) - .build(); - } else { - return builder.setTitle(R.string.ProfileNamesMegaphone__confirm_your_profile_name) - .setBody(R.string.ProfileNamesMegaphone__your_profile_can_now_include) - .setActionButton(R.string.ProfileNamesMegaphone__confirm_name, (megaphone, listener) -> { - listener.onMegaphoneCompleted(Event.PROFILE_NAMES_FOR_ALL); - listener.onMegaphoneNavigationRequested(new Intent(context, EditProfileActivity.class), requestCode); - }) - .build(); - } - } - private static @NonNull Megaphone buildMessageRequestsMegaphone(@NonNull Context context) { return new Megaphone.Builder(Event.MESSAGE_REQUESTS, Megaphone.Style.FULLSCREEN) .disableSnooze() @@ -227,7 +196,6 @@ public final class Megaphones { REACTIONS("reactions"), PINS_FOR_ALL("pins_for_all"), PIN_REMINDER("pin_reminder"), - PROFILE_NAMES_FOR_ALL("profile_names"), MESSAGE_REQUESTS("message_requests"); private final String key; diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java index 33f3479f60..e8d9080b3f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java @@ -338,8 +338,6 @@ public class EditProfileFragment extends LoggingFragment { if (uploadResult == EditProfileRepository.UploadResult.SUCCESS) { RegistrationUtil.markRegistrationPossiblyComplete(); - ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.PROFILE_NAMES_FOR_ALL); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) handleFinishedLollipop(); else handleFinishedLegacy(); } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java index 2928b55a60..b5d0d1da2a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -53,7 +53,6 @@ public final class FeatureFlags { private static final String USERNAMES = "android.usernames"; private static final String PINS_FOR_ALL_MANDATORY = "android.pinsForAllMandatory"; private static final String PINS_MEGAPHONE_KILL_SWITCH = "android.pinsMegaphoneKillSwitch"; - private static final String PROFILE_NAMES_MEGAPHONE = "android.profileNamesMegaphone"; private static final String ATTACHMENTS_V3 = "android.attachmentsV3"; private static final String REMOTE_DELETE = "android.remoteDelete"; private static final String PROFILE_FOR_CALLING = "android.profileForCalling"; @@ -73,7 +72,6 @@ public final class FeatureFlags { private static final Set REMOTE_CAPABLE = Sets.newHashSet( PINS_FOR_ALL_MANDATORY, PINS_MEGAPHONE_KILL_SWITCH, - PROFILE_NAMES_MEGAPHONE, ATTACHMENTS_V3, REMOTE_DELETE, PROFILE_FOR_CALLING, @@ -210,12 +208,6 @@ public final class FeatureFlags { return getBoolean(PINS_MEGAPHONE_KILL_SWITCH, false); } - /** Safety switch for disabling profile names megaphone */ - public static boolean profileNamesMegaphone() { - return getBoolean(PROFILE_NAMES_MEGAPHONE, false) && - TextSecurePreferences.getFirstInstallVersion(ApplicationDependencies.getApplication()) < 600; - } - /** Whether or not we use the attachments v3 form. */ public static boolean attachmentsV3() { return getBoolean(ATTACHMENTS_V3, false); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 96a9a6d54b..733c22e4e2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -346,8 +346,6 @@ Moved conversation to inbox Moved %d conversations to inbox - Your profile name has been created. - Your profile name has been saved. Key exchange message @@ -2198,14 +2196,6 @@ We\'ll remind you later. Creating a PIN will become mandatory in %1$d days. We\'ll remind you later. Confirming your PIN will become mandatory in %1$d days. - - Add a profile name - This will be displayed when you start a new conversation or share it. - Add Profile Name - Confirm your Profile Name - Your profile can now include an optional last name. - Confirm Name - Transport icon Loading…