From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 12 Jul 2021 13:38:22 +0000 (+0200)
Subject: android: Replace usage of deprecated Handler() constructor
X-Git-Tag: android-2.3.3^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc351a30e1692a73b4c331917fd7c529a39f6bc5;p=thirdparty%2Fstrongswan.git

android: Replace usage of deprecated Handler() constructor
---

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 5a37955d3f..bba5a427fa 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
@@ -192,7 +192,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 		mAppDir = getFilesDir().getAbsolutePath();
 
 		/* handler used to do changes in the main UI thread */
-		mHandler = new Handler();
+		mHandler = new Handler(getMainLooper());
 
 		mDataSource = new VpnProfileDataSource(this);
 		mDataSource.open();
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
index 551aff60bf..a10a0993f4 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
@@ -22,6 +22,7 @@ import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.Message;
 import android.os.SystemClock;
 
@@ -107,7 +108,7 @@ public class VpnStateService extends Service
 	{
 		/* this handler allows us to notify listeners from the UI thread and
 		 * not from the threads that actually report any state changes */
-		mHandler = new RetryHandler(this);
+		mHandler = new RetryHandler(getMainLooper(), this);
 	}
 
 	@Override
@@ -536,8 +537,9 @@ public class VpnStateService extends Service
 	private static class RetryHandler extends Handler {
 		WeakReference<VpnStateService> mService;
 
-		public RetryHandler(VpnStateService service)
+		public RetryHandler(Looper looper, VpnStateService service)
 		{
+			super(looper);
 			mService = new WeakReference<>(service);
 		}
 
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogFragment.java
index 2882740d52..f6052f62fb 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogFragment.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogFragment.java
@@ -19,6 +19,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.FileObserver;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -55,7 +56,7 @@ public class LogFragment extends Fragment
 
 		mLogFilePath = getActivity().getFilesDir() + File.separator + CharonVpnService.LOG_FILE;
 
-		mLogHandler = new Handler();
+		mLogHandler = new Handler(Looper.getMainLooper());
 
 		mDirectoryObserver = new LogDirectoryObserver(getActivity().getFilesDir().getAbsolutePath());
 	}