android: Replace deprecated onBackPressed() and enable predictive back gestures

Doesn't really make a difference it seems.

diff --git a/src/frontends/android/app/src/main/AndroidManifest.xml b/src/frontends/android/app/src/main/AndroidManifest.xml
index a5e6aabc2c11fd623459cfd2e8638b6f1bedcd33..51c6ff89e3d3af7b0d9e74db7575add1b50632b2 100644 (file)
--- a/src/frontends/android/app/src/main/AndroidManifest.xml
+++ b/src/frontends/android/app/src/main/AndroidManifest.xml
@@ -37,6 +37,7 @@
         android:label="@string/app_name"
         android:theme="@style/ApplicationTheme"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:enableOnBackInvokedCallback="true"
         android:allowBackup="false" >
         <activity
             android:name=".ui.MainActivity"

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/SelectedApplicationsActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/SelectedApplicationsActivity.java
index d437e3aa3c3ab848323d2cecf7fc6a095ca3224d..d1b66e4eea5d5b1c8eaca3ab66a5b85a1d3a46e7 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/SelectedApplicationsActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/SelectedApplicationsActivity.java
@@ -22,6 +22,7 @@ import android.view.MenuItem;
 
 import org.strongswan.android.data.VpnProfileDataSource;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -40,6 +41,16 @@ public class SelectedApplicationsActivity extends AppCompatActivity
                ActionBar actionBar = getSupportActionBar();
                actionBar.setDisplayHomeAsUpEnabled(true);
 
+               getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true)
+               {
+                       @Override
+                       public void handleOnBackPressed()
+                       {
+                               prepareResult();
+                               finish();
+                       }
+               });
+
                FragmentManager fm = getSupportFragmentManager();
                mApps = (SelectedApplicationsListFragment)fm.findFragmentByTag(LIST_TAG);
                if (mApps == null)
@@ -62,13 +73,6 @@ public class SelectedApplicationsActivity extends AppCompatActivity
                return super.onOptionsItemSelected(item);
        }
 
-       @Override
-       public void onBackPressed()
-       {
-               prepareResult();
-               super.onBackPressed();
-       }
-
        private void prepareResult()
        {
                Intent data = new Intent();