TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-07 20:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SES-2694] Incorrect back press warning message (#1657)

Browse Source
This commit is contained in:
Fanchao Liu 2024-09-09 11:06:50 +10:00 committed by GitHub
parent cef47df0e4
commit a6886f1375
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.jsonnet
View File

@ -38,7 +38,8 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
pull: 'always', pull: 'always',
environment: { ANDROID_HOME: '/usr/lib/android-sdk' }, environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
commands: [ commands: [
'apt-get install -y ninja-build', 'apt-get install -y ninja-build openjdk-17-jdk',
'update-java-alternatives -s java-1.17.0-openjdk-amd64',
'./gradlew testPlayDebugUnitTestCoverageReport' './gradlew testPlayDebugUnitTestCoverageReport'
], ],
} }
@ -78,7 +79,8 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
pull: 'always', pull: 'always',
environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' }, environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
commands: [ commands: [
'apt-get install -y ninja-build', 'apt-get install -y ninja-build openjdk-17-jdk',
'update-java-alternatives -s java-1.17.0-openjdk-amd64',
'./gradlew assemblePlayDebug', './gradlew assemblePlayDebug',
'./scripts/drone-static-upload.sh' './scripts/drone-static-upload.sh'
], ],

2
app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt
View File

@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.ui.theme.LocalColors
@Composable @Composable
fun OnboardingBackPressAlertDialog( fun OnboardingBackPressAlertDialog(
dismissDialog: () -> Unit, dismissDialog: () -> Unit,
@StringRes textId: Int = R.string.onboardingBackAccountCreation, @StringRes textId: Int,
quit: () -> Unit quit: () -> Unit
) { ) {
val c = LocalContext.current val c = LocalContext.current

7
app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
View File

@ -53,7 +53,12 @@ internal fun MessageNotificationsScreen(
return return
} }
if (state.showDialog) OnboardingBackPressAlertDialog(dismissDialog, quit = quit) if (state.showingBackWarningDialogText != null) {
OnboardingBackPressAlertDialog(dismissDialog,
textId = state.showingBackWarningDialogText,
quit = quit
)
}
Column { Column {
Spacer(Modifier.weight(1f)) Spacer(Modifier.weight(1f))

9
app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsViewModel.kt
View File

@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import network.loki.messenger.R
import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.TextSecurePreferences
import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.notifications.PushRegistry import org.thoughtcrime.securesms.notifications.PushRegistry
@ -58,14 +59,16 @@ internal class MessageNotificationsViewModel(
fun onBackPressed(): Boolean = when (state) { fun onBackPressed(): Boolean = when (state) {
is State.CreateAccount -> false is State.CreateAccount -> false
is State.LoadAccount -> { is State.LoadAccount -> {
_uiStates.update { it.copy(showDialog = true) } _uiStates.update { it.copy(showingBackWarningDialogText = R.string.onboardingBackLoadAccount) }
true true
} }
} }
fun dismissDialog() { fun dismissDialog() {
_uiStates.update { it.copy(showDialog = false) } _uiStates.update {
it.copy(showingBackWarningDialogText = null)
}
} }
fun quit() { fun quit() {
@ -78,7 +81,7 @@ internal class MessageNotificationsViewModel(
data class UiState( data class UiState(
val pushEnabled: Boolean = true, val pushEnabled: Boolean = true,
val showDialog: Boolean = false, val showingBackWarningDialogText: Int? = null,
val clearData: Boolean = false val clearData: Boolean = false
) { ) {
val pushDisabled get() = !pushEnabled val pushDisabled get() = !pushEnabled