From 02f6f108dd3323c8623512a7816490ff1c21f7ea Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Thu, 5 Mar 2026 22:44:56 +0100 Subject: [PATCH] Catch possible crash in isAlwaysOn() Fixes crash on SM-R860 (Wear OS) Closes #841 --- .../java/com/emanuelef/remote_capture/CaptureService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java b/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java index 67c5df93..63dfce43 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java +++ b/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java @@ -229,10 +229,10 @@ public class CaptureService extends VpnService implements Runnable { // Android does not provide a reliable API to track the always-on VPN state // This function tries to detect but may fail to do so private boolean isAlwaysOnVpnDetected() { - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) - return isAlwaysOn(); - try { + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) + return isAlwaysOn(); + String always_on_vpn_app = Settings.Secure.getString(getContentResolver(), "always_on_vpn_app"); return always_on_vpn_app.equals(getPackageName()); } catch (Exception e) {