Remove outdated account setting subheading.

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

@@ -31,9 +31,6 @@ class AccountSettingsViewModel(
 
   companion object {
     private val TAG = Log.tag(AccountSettingsViewModel::class)
-
-    /** Stand-in for the real key count, which we have nowhere to read from yet. */
-    private const val MOCK_SIGNAL_LOGIN_KEY_COUNT = 2
   }
 
   private val _state = MutableStateFlow(AccountSettingsState())
@@ -164,7 +161,6 @@ class AccountSettingsViewModel(
         isPhoneNumberless = isPhoneNumberless,
         signalLogin = if (isPhoneNumberless) {
           AccountSettingsState.SignalLogin(
-            keyCount = MOCK_SIGNAL_LOGIN_KEY_COUNT,
             authenticatorAppCount = repository.getAuthenticatorAppCount(),
             passkeyCount = repository.getPasskeyCount()
           )

feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt

@@ -107,7 +107,6 @@ fun AccountSettingsScreen(
 
         item {
           SignalLoginCard(
-            keyCount = state.signalLogin.keyCount,
             onClick = { onEvent(AccountSettingsEvent.AccountAndRecoveryClicked) }
           )
         }
@@ -333,7 +332,6 @@ fun AccountSettingsScreen(
  */
 @Composable
 private fun SignalLoginCard(
-  keyCount: Int,
   onClick: () -> Unit,
   modifier: Modifier = Modifier
 ) {
@@ -357,22 +355,13 @@ private fun SignalLoginCard(
         .clip(RoundedCornerShape(8.dp))
     )
 
-    Column(
+    Text(
+      text = stringResource(R.string.AccountSettingsFragment__account_and_recovery),
+      style = MaterialTheme.typography.bodyLarge,
       modifier = Modifier
         .weight(1f)
         .padding(horizontal = 20.dp)
-    ) {
-      Text(
-        text = stringResource(R.string.AccountSettingsFragment__account_and_recovery),
-        style = MaterialTheme.typography.bodyLarge
-      )
-
-      Text(
-        text = pluralStringResource(R.plurals.AccountSettingsFragment__d_keys, keyCount, keyCount),
-        style = MaterialTheme.typography.bodyMedium,
-        color = MaterialTheme.colorScheme.onSurfaceVariant
-      )
-    }
+    )
 
     Icon(
       imageVector = SignalIcons.ChevronRight.imageVector,
@@ -576,7 +565,7 @@ private fun AccountSettingsScreenSignalLoginPreview() {
     AccountSettingsScreen(
       state = AccountSettingsState(
         isPhoneNumberless = true,
-        signalLogin = AccountSettingsState.SignalLogin(keyCount = 2, authenticatorAppCount = 2, passkeyCount = 8)
+        signalLogin = AccountSettingsState.SignalLogin(authenticatorAppCount = 2, passkeyCount = 8)
       ),
       onEvent = {}
     )

feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsState.kt

@@ -26,7 +26,6 @@ data class AccountSettingsState(
    * the sections aren't shown at all.
    */
   data class SignalLogin(
-    val keyCount: Int,
     val authenticatorAppCount: Int,
     val passkeyCount: Int
   )

feature/app-settings/src/main/res/values/strings.xml

@@ -48,11 +48,6 @@
     <string name="AccountSettingsFragment__signal_login">Signal Login</string>
     <!-- Title of the card that opens the user\'s Signal Login account and recovery keys -->
     <string name="AccountSettingsFragment__account_and_recovery">Account &amp; recovery</string>
-    <!-- Subtitle of the Signal Login card describing how many keys make up the login -->
-    <plurals name="AccountSettingsFragment__d_keys">
-        <item quantity="one">%1$d key</item>
-        <item quantity="other">%1$d keys</item>
-    </plurals>
     <!-- Description of what a Signal Login is, shown below the Signal Login card -->
     <string name="AccountSettingsFragment__your_signal_login_is_used_to_recover">Your Signal Login is used to recover and restore your account. Keep these keys stored safely in a password manager you trust.</string>
     <!-- Section header for the two-factor authentication section of account settings -->

feature/app-settings/src/test/java/org/signal/appsettings/account/AccountSettingsScreenTest.kt

@@ -299,7 +299,7 @@ class AccountSettingsScreenTest {
 
   @Test
   fun givenASignalLogin_whenIClickTheSignalLoginCard_thenIExpectAccountAndRecoveryEvent() {
-    setContent(createState(signalLogin = AccountSettingsState.SignalLogin(keyCount = 2, authenticatorAppCount = 0, passkeyCount = 0)))
+    setContent(createState(signalLogin = AccountSettingsState.SignalLogin(authenticatorAppCount = 0, passkeyCount = 0)))
 
     composeTestRule.onNodeWithTag(AccountSettingsTestTags.CARD_SIGNAL_LOGIN).performClick()
 
@@ -308,7 +308,7 @@ class AccountSettingsScreenTest {
 
   @Test
   fun givenASignalLogin_whenIClickAuthenticatorApp_thenIExpectAuthenticatorAppEvent() {
-    setContent(createState(signalLogin = AccountSettingsState.SignalLogin(keyCount = 2, authenticatorAppCount = 0, passkeyCount = 0)))
+    setContent(createState(signalLogin = AccountSettingsState.SignalLogin(authenticatorAppCount = 0, passkeyCount = 0)))
 
     composeTestRule.onNodeWithTag(AccountSettingsTestTags.CARD_SIGNAL_LOGIN).assertIsDisplayed()
 
@@ -319,7 +319,7 @@ class AccountSettingsScreenTest {
 
   @Test
   fun givenASignalLogin_whenIClickPasskeys_thenIExpectPasskeysEvent() {
-    setContent(createState(signalLogin = AccountSettingsState.SignalLogin(keyCount = 2, authenticatorAppCount = 0, passkeyCount = 0)))
+    setContent(createState(signalLogin = AccountSettingsState.SignalLogin(authenticatorAppCount = 0, passkeyCount = 0)))
 
     scrollTo(AccountSettingsTestTags.ROW_PASSKEYS)