Merge pull request #17003 from nextcloud/fix/settings-activity-dialogs

fix(settings-activity): dialogs

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/ui/dialog/AppPassCodeDialog.kt

@@ -145,6 +145,11 @@ class AppPassCodeDialog :
         )
     }
 
+    override fun onDismiss(dialog: android.content.DialogInterface) {
+        super.onDismiss(dialog)
+        activity?.finish()
+    }
+
     companion object {
         private const val ARG_DISMISSABLE = "dismissable"
 

app/src/main/java/com/owncloud/android/ui/dialog/ThemeSelectionDialog.kt

@@ -98,4 +98,9 @@ class ThemeSelectionDialog :
             bundleOf(ExtendedSettingsActivityDialog.ThemeSelection.key to mode.name)
         )
     }
+
+    override fun onDismiss(dialog: android.content.DialogInterface) {
+        super.onDismiss(dialog)
+        activity?.finish()
+    }
 }