Fix logout dialog

babybuddy · Sep 2, 2024 · 8da39e2 · 8da39e2
1 parent 3e02837
commit 8da39e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
@@ -368,6 +368,7 @@ class MainActivity : AppCompatActivity() {
 
     fun logout() {
         credStore.clearLoginData()
+        timerControls.clear()
         internalClient = null
         // Storage gets cleaned in the resume function of the login fragment
         // because otherwise the cleanup functions of the LoggedIn fragment

diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt
@@ -38,4 +38,4 @@ class GlobalDebugObject {
             return result
         }
     }
-}
+}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt
@@ -4,11 +4,12 @@ import android.app.ProgressDialog
 import android.content.DialogInterface
 import androidx.fragment.app.Fragment
 import androidx.navigation.Navigation.findNavController
+import eu.pkgsoftware.babybuddywidgets.BaseFragment
 import eu.pkgsoftware.babybuddywidgets.CredStore
 import eu.pkgsoftware.babybuddywidgets.R
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.ConnectingDialogInterface
 
-class CoordinatedDisconnectDialog(val fragment: Fragment, val credStore: CredStore) {
+class CoordinatedDisconnectDialog(val fragment: BaseFragment, val credStore: CredStore) {
     private val dialog = ProgressDialog(fragment.requireContext())
     private var uniqueCounter = 1
     private val progressTrackers = mutableMapOf<String, Long>()
@@ -21,7 +22,7 @@ class CoordinatedDisconnectDialog(val fragment: Fragment, val credStore: CredSto
             ProgressDialog.BUTTON_NEGATIVE,
             fragment.resources.getString(R.string.disconnect_dialog_logout)
         ) { dialogInterface: DialogInterface, i: Int ->
-            credStore.clearLoginData()
+            fragment.mainActivity.logout()
             findNavController(fragment.requireView()).navigate(R.id.logoutOperation)
         }
     }

diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt
@@ -279,4 +279,4 @@ class Client(val credStore: ServerAccessProviderInterface) {
             }
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,4 +38,4 @@ class GlobalDebugObject { @@
                 return result
             }
         }
-    }
+    }