Don't show empty OAuth setting

bitfireAT · May 16, 2024 · c9528d5 · c9528d5
1 parent 86cad50
commit c9528d5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountSettingsModel.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountSettingsModel.kt
@@ -114,8 +114,8 @@ class AccountSettingsModel @AssistedInject constructor(
     }
 
     fun updateTasksSyncInterval(syncInterval: Long) {
-        tasksProvider?.authority?.let { tasksAuthority ->
-            CoroutineScope(Dispatchers.Default).launch {
+        CoroutineScope(Dispatchers.Default).launch {
+            tasksProvider?.authority?.let { tasksAuthority ->
                 accountSettings.setSyncInterval(tasksAuthority, syncInterval)
                 reload()
             }

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountSettingsScreen.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountSettingsScreen.kt
@@ -464,23 +464,13 @@ fun AuthenticationSettings(
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 
-    Column(Modifier.padding(8.dp)) {
-        SettingsHeader(false) {
-            Text(stringResource(R.string.settings_authentication))
-        }
-
-        if (credentials.authState != null) {       // OAuth
-            Setting(
-                icon = Icons.Default.Password,
-                name = stringResource(R.string.settings_oauth),
-                summary = stringResource(R.string.settings_oauth_summary),
-                onClick = {
-                    // GoogleLoginFragment replacement
-                }
-            )
+    if (credentials.authState != null || credentials.username != null || credentials.password != null || credentials.certificateAlias != null)
+        Column {
+            SettingsHeader(false) {
+                Text(stringResource(R.string.settings_authentication))
+            }
 
-        } else { // username/password
-            if (credentials.username != null) {
+            if (credentials.username != null || credentials.password != null) {
                 var showUsernameDialog by remember { mutableStateOf(false) }
                 Setting(
                     icon = Icons.Default.AccountCircle,
@@ -499,9 +489,7 @@ fun AuthenticationSettings(
                         },
                         onDismiss = { showUsernameDialog = false }
                     )
-            }
 
-            if (credentials.password != null) {
                 var showPasswordDialog by remember { mutableStateOf(false) }
                 Setting(
                     icon = Icons.Default.Password,
@@ -548,7 +536,6 @@ fun AuthenticationSettings(
                     }, null, null, null, -1, credentials.certificateAlias)
                 }
             )
-        }
     }
 }
 
@@ -706,7 +693,7 @@ fun AccountSettingsScreen_Preview() {
             onUpdateIgnoreVpns = {},
 
             // Authentication Settings
-            credentials = Credentials(),
+            credentials = Credentials(username = "test", password = "test"),
             onUpdateCredentials = {},
 
             // CalDav Settings

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -336,8 +336,6 @@
     <string name="settings_ignore_vpns_on">VPN without underlying validated Internet connection is not enough to run synchronization (recommended)</string>
     <string name="settings_ignore_vpns_off">VPN without underlying validated Internet connection is enough to run synchronization</string>
     <string name="settings_authentication">Authentication</string>
-    <string name="settings_oauth">Re-authenticate</string>
-    <string name="settings_oauth_summary">Perform OAuth login again</string>
     <string name="settings_username">User name</string>
     <string name="settings_password">Password</string>
     <string name="settings_new_password">New password</string>