From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 5 Feb 2025 16:02:42 +0000 (+0100)
Subject: android: Suppress deprecation warning because of stopForeground()
X-Git-Tag: android-2.5.3^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b021406f6b3372de9eb444a84594bb4176f34206;p=thirdparty%2Fstrongswan.git

android: Suppress deprecation warning because of stopForeground()
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
index 03e59f7ee2..314678eded 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
@@ -399,11 +399,24 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 			public void run()
 			{
 				mShowNotification = false;
-				stopForeground(true);
+				if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
+				{
+					stopForegroundCompat();
+				}
+				else
+				{
+					stopForeground(STOP_FOREGROUND_REMOVE);
+				}
 			}
 		});
 	}
 
+	@SuppressWarnings("deprecation")
+	private void stopForegroundCompat()
+	{
+		stopForeground(true);
+	}
+
 	/**
 	 * Create a notification channel for Android 8+
 	 */