Show confirmation prompt before signing out. Closes #153.

Fixing crash happening during immediate Login after Sign Out. Upping versionCode to 96
zotero · Aug 29, 2024 · b25c77a · b25c77a
1 parent 5f41d81
commit b25c77a
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 29 deletions.
diff --git a/app/src/main/java/org/zotero/android/database/Database.kt b/app/src/main/java/org/zotero/android/database/Database.kt
@@ -3,6 +3,7 @@ package org.zotero.android.database
 import io.realm.DynamicRealm
 import io.realm.FieldAttribute
 import io.realm.RealmConfiguration
+import io.realm.RealmMigration
 import io.realm.annotations.RealmModule
 import org.zotero.android.database.objects.AllItemsDbRow
 import org.zotero.android.database.objects.FieldKeys
@@ -29,7 +30,6 @@ import org.zotero.android.database.objects.RUser
 import org.zotero.android.database.objects.RVersions
 import org.zotero.android.database.objects.RWebDavDeletion
 import org.zotero.android.database.requests.key
-import org.zotero.android.files.FileStore
 import java.io.File
 
 class Database {
@@ -43,15 +43,33 @@ class Database {
                 .modules(MainConfigurationDbModule())
                 .schemaVersion(schemaVersion)
                 .allowWritesOnUiThread(true)
-                .migration { dynamicRealm, oldVersion, newVersion ->
-                    if (oldVersion < 2) {
-                        migrateAllItemsDbRowTypeIconNameTypeChange(dynamicRealm)
-                    }
-                }
+                .migration(MainDbMigration(fileName = dbFile.name))
 
             return builder.build()
         }
 
+        internal class MainDbMigration(private val fileName: String): RealmMigration {
+            override fun migrate(dynamicRealm: DynamicRealm, oldVersion: Long, newVersion: Long) {
+                if (oldVersion < 2) {
+                    migrateAllItemsDbRowTypeIconNameTypeChange(dynamicRealm)
+                }
+            }
+
+            override fun equals(other: Any?): Boolean {
+                if (this === other) return true
+                if (javaClass != other?.javaClass) return false
+
+                other as MainDbMigration
+
+                return fileName == other.fileName
+            }
+
+            override fun hashCode(): Int {
+                return fileName.hashCode()
+            }
+
+        }
+
         private fun migrateAllItemsDbRowTypeIconNameTypeChange(dynamicRealm: DynamicRealm) {
             val realmSchema = dynamicRealm.schema
 

diff --git a/app/src/main/java/org/zotero/android/screens/settings/account/SettingsAccountScreen.kt b/app/src/main/java/org/zotero/android/screens/settings/account/SettingsAccountScreen.kt
@@ -91,6 +91,14 @@ internal fun SettingsAccountScreen(
                 )
             }
 
+            val shouldShowSignOutDialog = viewState.shouldShowSignOutDialog
+            if (shouldShowSignOutDialog) {
+                SignOutDialog(
+                    onCancel = viewModel::onDismissSignOutDialog,
+                    onSignOut = viewModel::onSignOut
+                )
+            }
+
         }
     }
 }
@@ -118,3 +126,25 @@ private fun DirectoryNotFoundDialog (
         onDismiss = onCancel
     )
 }
+
+@Composable
+private fun SignOutDialog (
+    onSignOut: () -> Unit,
+    onCancel: () -> Unit,
+) {
+    CustomAlertDialog(
+        title = stringResource(id = Strings.warning),
+        description = stringResource(
+            id = Strings.settings_logout_warning
+        ),
+        descriptionTextColor = CustomTheme.colors.primaryContent,
+        primaryAction = CustomAlertDialog.ActionConfig(
+            text = stringResource(id = Strings.no),
+        ),
+        secondaryAction = CustomAlertDialog.ActionConfig(
+            text = stringResource(id = Strings.yes),
+            onClick = onSignOut
+        ),
+        onDismiss = onCancel
+    )
+}
diff --git a/app/src/main/java/org/zotero/android/screens/settings/account/SettingsAccountSections.kt b/app/src/main/java/org/zotero/android/screens/settings/account/SettingsAccountSections.kt
@@ -1,35 +1,14 @@
 package org.zotero.android.screens.settings.account
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Icon
-import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import org.zotero.android.screens.settings.SettingsDivider
 import org.zotero.android.screens.settings.SettingsItem
 import org.zotero.android.screens.settings.SettingsSection
 import org.zotero.android.screens.settings.SettingsSectionTitle
-import org.zotero.android.uicomponents.Drawables
 import org.zotero.android.uicomponents.Strings
-import org.zotero.android.uicomponents.foundation.safeClickable
 import org.zotero.android.uicomponents.theme.CustomPalette
 import org.zotero.android.uicomponents.theme.CustomTheme
-import org.zotero.android.webdav.data.FileSyncType
-
-
 
 
 @Composable
@@ -47,7 +26,7 @@ internal fun SettingsAccountDataSyncSection(
         SettingsItem(
             textColor = CustomPalette.ErrorRed,
             title = stringResource(id = Strings.settings_logout),
-            onItemTapped = viewModel::onSignOut
+            onItemTapped = viewModel::onShowSignOutDialog
         )
     }
 }

diff --git a/app/src/main/java/org/zotero/android/screens/settings/account/SettingsAccountViewModel.kt b/app/src/main/java/org/zotero/android/screens/settings/account/SettingsAccountViewModel.kt
@@ -441,6 +441,22 @@ internal class SettingsAccountViewModel @Inject constructor(
         }
     }
 
+    fun onShowSignOutDialog() {
+        updateState {
+            copy(
+                shouldShowSignOutDialog = true,
+            )
+        }
+    }
+
+    fun onDismissSignOutDialog() {
+        updateState {
+            copy(
+                shouldShowSignOutDialog = false,
+            )
+        }
+    }
+
     fun onCreateWebDavDirectory() {
         verify(tryCreatingZoteroDir = true)
     }
@@ -458,6 +474,7 @@ internal data class SettingsAccountViewState(
     val isVerifyingWebDav: Boolean = false,
     val webDavVerificationResult: CustomResult<Unit>? = null,
     val createWebDavDirectoryDialogData: CreateWebDavDirectoryDialogData? = null,
+    val shouldShowSignOutDialog: Boolean = false
 ) : ViewState {
     val canVerifyServer: Boolean get() {
         return !url.isEmpty() && !username.isEmpty() && !password.isEmpty()

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,7 +4,7 @@ object BuildConfig {
     const val compileSdkVersion = 34
     const val targetSdk = 34
 
-    val versionCode = 95 // Must be updated on every build
+    val versionCode = 96 // Must be updated on every build
     val version = Version(
         major = 1,
         minor = 0,