frontend/android: back poc

BitBoxSwiss · May 6, 2024 · 20ca1f2 · 20ca1f2
1 parent 575843b
commit 20ca1f2
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/MainActivity.java b/frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/MainActivity.java
@@ -75,6 +75,8 @@ public class MainActivity extends AppCompatActivity {
 
     GoService goService;
 
+    private WebView vw;
+
     private String location = "";
 
     // This is for the file picker dialog invoked by file upload forms in the WebView.
@@ -634,20 +636,25 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
     // https://developer.android.com/guide/components/activities/tasks-and-back-stack
     @Override
     public void onBackPressed() {
-        new AlertDialog.Builder(MainActivity.this)
-            .setTitle("Close BitBoxApp")
-            .setMessage("Do you really want to exit?")
-            .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    Util.quit(MainActivity.this);
-                }
-            })
-            .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    dialog.dismiss();
-                }
-            })
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .show();
+
+        if (vw.canGoBack()) {
+            vw.evaluateJavascript("history.back();", null);
+        } else {
+            new AlertDialog.Builder(MainActivity.this)
+                .setTitle("Close BitBoxApp")
+                .setMessage("Do you really want to exit?")
+                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        Util.quit(MainActivity.this);
+                    }
+                })
+                .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                    }
+                })
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .show();
+        }
     }
 }