From 26eef1f095e99bfdb9b4cf8c9974346fc1af2a07 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 5 Feb 2025 16:13:13 +0100
Subject: [PATCH] android: Replace deprecated onBackPressed() and enable
 predictive back gestures

Doesn't really make a difference it seems.
---
 .../android/app/src/main/AndroidManifest.xml   |  1 +
 .../ui/SelectedApplicationsActivity.java       | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/frontends/android/app/src/main/AndroidManifest.xml b/src/frontends/android/app/src/main/AndroidManifest.xml
index a5e6aabc2..51c6ff89e 100644
--- 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 d437e3aa3..d1b66e4ee 100644
--- 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();