Improve handling of unregistered states in profile screen.

app/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java

@@ -1,25 +0,0 @@
-package org.thoughtcrime.securesms.components.reminder;
-
-import android.content.Context;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
-
-public class PushRegistrationReminder extends Reminder {
-
-  public PushRegistrationReminder(final Context context) {
-    super(R.string.reminder_header_push_title, R.string.reminder_header_push_text);
-
-    setOkListener(v -> context.startActivity(RegistrationNavigationActivity.newIntentForReRegistration(context)));
-  }
-
-  @Override
-  public boolean isDismissable() {
-    return false;
-  }
-
-  public static boolean isEligible() {
-    return !SignalStore.account().isRegistered();
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -26,6 +27,6 @@ public class UnauthorizedReminder extends Reminder {
   }
 
   public static boolean isEligible(Context context) {
-    return TextSecurePreferences.isUnauthorizedReceived(context);
+    return TextSecurePreferences.isUnauthorizedReceived(context) || !SignalStore.account().isRegistered();
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt

@@ -160,7 +160,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_deviceActivity)
         },
-        isEnabled = state.isDeprecatedOrUnregistered()
+        isEnabled = state.isRegisteredAndUpToDate()
       )
 
       if (state.allowUserToGoToDonationManagementScreen) {
@@ -197,7 +197,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_chatsSettingsFragment)
         },
-        isEnabled = state.isDeprecatedOrUnregistered()
+        isEnabled = state.isRegisteredAndUpToDate()
       )
 
       clickPref(
@@ -206,7 +206,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         onClick = {
           findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToStoryPrivacySettings(R.string.preferences__stories))
         },
-        isEnabled = state.isDeprecatedOrUnregistered()
+        isEnabled = state.isRegisteredAndUpToDate()
       )
 
       clickPref(
@@ -215,7 +215,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_notificationsSettingsFragment)
         },
-        isEnabled = state.isDeprecatedOrUnregistered()
+        isEnabled = state.isRegisteredAndUpToDate()
       )
 
       clickPref(
@@ -224,7 +224,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_privacySettingsFragment)
         },
-        isEnabled = state.isDeprecatedOrUnregistered()
+        isEnabled = state.isRegisteredAndUpToDate()
       )
 
       clickPref(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt

@@ -10,7 +10,7 @@ data class AppSettingsState(
   val userUnregistered: Boolean,
   val clientDeprecated: Boolean
 ) {
-  fun isDeprecatedOrUnregistered(): Boolean {
-    return !(userUnregistered || clientDeprecated)
+  fun isRegisteredAndUpToDate(): Boolean {
+    return !userUnregistered && !clientDeprecated
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt

@@ -24,7 +24,7 @@ class AppSettingsViewModel(
       0,
       SignalStore.donationsValues().getExpiredGiftBadge() != null,
       SignalStore.donationsValues().isLikelyASustainer() || InAppDonations.hasAtLeastOnePaymentMethodAvailable(),
-      TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()),
+      TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()) || !SignalStore.account().isRegistered,
       SignalStore.misc().isClientDeprecated
     )
   )
@@ -54,7 +54,12 @@ class AppSettingsViewModel(
   }
 
   fun refreshDeprecatedOrUnregistered() {
-    store.update { it.copy(clientDeprecated = SignalStore.misc().isClientDeprecated, userUnregistered = TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication())) }
+    store.update {
+      it.copy(
+        clientDeprecated = SignalStore.misc().isClientDeprecated,
+        userUnregistered = TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()) || !SignalStore.account().isRegistered
+      )
+    }
   }
 
   fun refreshExpiredGiftBadge() {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt

@@ -12,6 +12,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.signal.core.util.AppUtil
+import org.signal.core.util.ThreadUtil
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.concurrent.SimpleTask
 import org.signal.core.util.logging.Log
@@ -24,6 +25,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.privacy.advanced.AdvancedPrivacySettingsRepository
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.database.JobDatabase
 import org.thoughtcrime.securesms.database.LocalMetricsDatabase
@@ -140,6 +142,14 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         }
       )
 
+      clickPref(
+        title = DSLSettingsText.from("Unregister"),
+        summary = DSLSettingsText.from("This will unregister your account without deleting it."),
+        onClick = {
+          onUnregisterClicked()
+        }
+      )
+
       dividerPref()
 
       sectionHeaderPref(DSLSettingsText.from("Miscellaneous"))
@@ -803,6 +813,32 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
     }
   }
 
+  private fun onUnregisterClicked() {
+    MaterialAlertDialogBuilder(requireContext())
+      .setTitle("Unregister?")
+      .setMessage("Are you sure? You'll have to re-register to use Signal again -- no promises that the process will go smoothly.")
+      .setPositiveButton(android.R.string.ok) { _, _ ->
+        AdvancedPrivacySettingsRepository(requireContext()).disablePushMessages {
+          ThreadUtil.runOnMain {
+            when (it) {
+              AdvancedPrivacySettingsRepository.DisablePushMessagesResult.SUCCESS -> {
+                SignalStore.account().setRegistered(false)
+                SignalStore.registrationValues().clearRegistrationComplete()
+                SignalStore.registrationValues().clearHasUploadedProfile()
+                Toast.makeText(context, "Unregistered!", Toast.LENGTH_SHORT).show()
+              }
+
+              AdvancedPrivacySettingsRepository.DisablePushMessagesResult.NETWORK_ERROR -> {
+                Toast.makeText(context, "Network error!", Toast.LENGTH_SHORT).show()
+              }
+            }
+          }
+        }
+      }
+      .setNegativeButton(android.R.string.cancel, null)
+      .show()
+  }
+
   private fun copyPaymentsDataToClipboard() {
     MaterialAlertDialogBuilder(requireContext())
       .setMessage(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt

@@ -6,16 +6,12 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
-import android.graphics.drawable.Drawable
 import android.net.ConnectivityManager
 import android.text.SpannableStringBuilder
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
-import androidx.core.widget.TextViewCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.SignalProgressDialog
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
@@ -24,7 +20,6 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.ViewUtil
@@ -107,40 +102,6 @@ class AdvancedPrivacySettingsFragment : DSLSettingsFragment(R.string.preferences
 
   private fun getConfiguration(state: AdvancedPrivacySettingsState): DSLConfiguration {
     return configure {
-      switchPref(
-        title = DSLSettingsText.from(R.string.preferences__signal_messages_and_calls),
-        summary = DSLSettingsText.from(getPushToggleSummary(state.isPushEnabled)),
-        isChecked = state.isPushEnabled
-      ) {
-        if (state.isPushEnabled) {
-          val builder = MaterialAlertDialogBuilder(requireContext()).apply {
-            setMessage(R.string.ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering)
-            setNegativeButton(android.R.string.cancel, null)
-            setPositiveButton(
-              android.R.string.ok
-            ) { _, _ -> viewModel.disablePushMessages() }
-          }
-
-          val icon: Drawable = requireNotNull(ContextCompat.getDrawable(builder.context, R.drawable.symbol_info_24))
-          icon.setBounds(0, 0, ViewUtil.dpToPx(32), ViewUtil.dpToPx(32))
-
-          val title = TextView(builder.context)
-          val padding = ViewUtil.dpToPx(16)
-          title.setText(R.string.ApplicationPreferencesActivity_disable_signal_messages_and_calls)
-          title.setPadding(padding, padding, padding, padding)
-          title.compoundDrawablePadding = padding / 2
-          TextViewCompat.setTextAppearance(title, R.style.TextAppearance_Signal_Title2_MaterialDialog)
-          TextViewCompat.setCompoundDrawablesRelative(title, icon, null, null, null)
-
-          builder
-            .setCustomTitle(title)
-            .setOnDismissListener { viewModel.refresh() }
-            .show()
-        } else {
-          startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()))
-        }
-      }
-
       switchPref(
         title = DSLSettingsText.from(R.string.preferences_advanced__always_relay_calls),
         summary = DSLSettingsText.from(R.string.preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address),

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt

@@ -38,25 +38,6 @@ class AdvancedPrivacySettingsViewModel(
     )
   }
 
-  fun disablePushMessages() {
-    store.update { getState().copy(showProgressSpinner = true) }
-
-    repository.disablePushMessages {
-      when (it) {
-        AdvancedPrivacySettingsRepository.DisablePushMessagesResult.SUCCESS -> {
-          SignalStore.account().setRegistered(false)
-          SignalStore.registrationValues().clearRegistrationComplete()
-          SignalStore.registrationValues().clearHasUploadedProfile()
-        }
-        AdvancedPrivacySettingsRepository.DisablePushMessagesResult.NETWORK_ERROR -> {
-          singleEvents.postValue(Event.DISABLE_PUSH_FAILED)
-        }
-      }
-
-      store.update { getState().copy(showProgressSpinner = false) }
-    }
-  }
-
   fun setAlwaysRelayCalls(enabled: Boolean) {
     sharedPreferences.edit().putBoolean(TextSecurePreferences.ALWAYS_RELAY_CALLS_PREF, enabled).apply()
     refresh()