From 93aa4dd280541fd1946b5801577f1a39f5e0f291 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Sat, 11 Jan 2025 02:48:14 +0100
Subject: [PATCH] Attempt to get back button working

---
 app/src/main/AndroidManifest.xml                  | 1 +
 app/src/main/java/org/mapcomplete/Databridge.java | 4 ++++
 variables.gradle                                  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff64244b..0412042c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:enableOnBackInvokedCallback="true"
         android:theme="@style/AppTheme">
         <activity
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
diff --git a/app/src/main/java/org/mapcomplete/Databridge.java b/app/src/main/java/org/mapcomplete/Databridge.java
index 36c26465..d0a9af1f 100644
--- a/app/src/main/java/org/mapcomplete/Databridge.java
+++ b/app/src/main/java/org/mapcomplete/Databridge.java
@@ -26,6 +26,10 @@ public class Databridge extends Plugin {
     }
 
     public static void sendAnswerTo(PluginCall call, String answer) {
+        if(call == null) {
+            System.err.println("Could not send an answer to a plugincall, is null");
+            return;
+        }
         JSObject ret = new JSObject();
         ret.put("value", answer);
         Log.i("databridge", "Resolving call");
diff --git a/variables.gradle b/variables.gradle
index 7785a4ee..41fc24a6 100644
--- a/variables.gradle
+++ b/variables.gradle
@@ -1,5 +1,5 @@
 ext {
-    minSdkVersion = 24
+    minSdkVersion = 33
     compileSdkVersion = 34
     targetSdkVersion = 34
     androidxActivityVersion = '1.8.0'