Minor tweaks

celestiamobile · Jul 12, 2024 · 285723e · 285723e
1 parent f519546
commit 285723e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="531"
+    android:versionCode="532"
     android:versionName="1.7.2">
 
     <uses-feature android:name="android.hardware.type.pc" android:required="false" />

diff --git a/app/src/main/java/space/celestia/mobilecelestia/celestia/CelestiaInteraction.kt b/app/src/main/java/space/celestia/mobilecelestia/celestia/CelestiaInteraction.kt
@@ -536,6 +536,10 @@ class CelestiaInteraction(context: Context, private val appCore: AppCore, privat
             return false
         }
 
+        // Ignore Back button action
+        if (event.keyCode == KeyEvent.KEYCODE_BACK)
+            return false
+
         if (event.action == KeyEvent.ACTION_UP)
             return onKeyUp(keyCode, event)
         else if (event.action == KeyEvent.ACTION_DOWN)

diff --git a/app/src/main/java/space/celestia/mobilecelestia/utils/Dialog.kt b/app/src/main/java/space/celestia/mobilecelestia/utils/Dialog.kt
@@ -114,7 +114,7 @@ fun Activity.showLoading(title: String, cancelHandler: (() -> Unit)? = null): Al
     return builder.show()
 }
 
-fun Activity.showAlert(title: String, message: String? = null, handler: (() -> Unit)? = null) {
+fun Activity.showAlert(title: String, message: String? = null, handler: (() -> Unit)? = null, cancelHandler: (() -> Unit)? = null) {
     if (isFinishing || isDestroyed)
         return
 
@@ -126,11 +126,16 @@ fun Activity.showAlert(title: String, message: String? = null, handler: (() -> U
         if (handler != null)
             handler()
     }
-    if (handler != null) {
+    if (handler != null || cancelHandler != null) {
         builder.setNegativeButton(CelestiaString("Cancel", "")) { dialog, _ ->
             dialog.cancel()
         }
     }
+    if (cancelHandler != null) {
+        builder.setOnCancelListener {
+            cancelHandler()
+        }
+    }
     builder.show()
 }