diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt index 440b2d233d..28625493d2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt @@ -113,7 +113,7 @@ class LandingActivity : BaseActionBarActivity() { modifier = Modifier .width(262.dp) .align(Alignment.CenterHorizontally) - .contentDescription(R.string.AccessibilityId_privacy_policy_link), + .contentDescription(R.string.AccessibilityId_open_url), fontSize = 11.sp, lineHeight = 13.sp, onClick = ::openDialog diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt index b37cdc16d7..af1b551631 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt @@ -28,7 +28,8 @@ import org.session.libsession.utilities.TextSecurePreferences import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.dependencies.ConfigFactory -import org.thoughtcrime.securesms.onboarding.messagenotifications.startPNModeActivity +import org.thoughtcrime.securesms.onboarding.messagenotifications.MessageNotificationsActivity +import org.thoughtcrime.securesms.onboarding.messagenotifications.startMessageNotificationsActivity import org.thoughtcrime.securesms.onboarding.pickname.startPickDisplayNameActivity import org.thoughtcrime.securesms.ui.AppTheme import org.thoughtcrime.securesms.ui.ProgressArc @@ -61,7 +62,7 @@ class LoadingActivity: BaseActionBarActivity() { when { skipped -> startPickDisplayNameActivity(true, flags) - else -> startPNModeActivity(flags) + else -> startMessageNotificationsActivity(flags) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt index c13f881654..0fdc5a630b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt @@ -165,7 +165,7 @@ fun NotificationRadioButton( } } -fun Context.startPNModeActivity(flags: Int = 0) { +fun Context.startMessageNotificationsActivity(flags: Int = 0) { Intent(this, MessageNotificationsActivity::class.java) .also { it.flags = flags } .also(::startActivity) diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt index e2620bdd2c..96ca97f334 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt @@ -34,7 +34,8 @@ import network.loki.messenger.R import org.session.libsession.utilities.AppTextSecurePreferences import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.BaseActionBarActivity -import org.thoughtcrime.securesms.onboarding.messagenotifications.startPNModeActivity +import org.thoughtcrime.securesms.onboarding.messagenotifications.MessageNotificationsActivity +import org.thoughtcrime.securesms.onboarding.messagenotifications.startMessageNotificationsActivity import org.thoughtcrime.securesms.ui.AppTheme import org.thoughtcrime.securesms.ui.PreviewTheme import org.thoughtcrime.securesms.ui.base @@ -68,7 +69,7 @@ class PickDisplayNameActivity : BaseActionBarActivity() { lifecycleScope.launch { viewModel.eventFlow.collect { - startPNModeActivity() + startMessageNotificationsActivity() } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0a4dc9a11c..e0d2a8dde0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1117,6 +1117,7 @@ Error message Hide recovery password button Confirm button + Open URL This Account ID is invalid. Please check and try again. Enter Account ID Enter account ID or ONS