From 31e6a812b6031855da5695f94532096747d20ae6 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 1 Nov 2015 10:52:07 +0100 Subject: [PATCH] Revert "Listen to service state changes (roaming)" This reverts commit 372bb6fc1115df0494cd8f6b5145283c571d9e65. --- .../eu/faircode/netguard/SinkholeService.java | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java index c05a54e8..0f003eff 100644 --- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java +++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java @@ -13,9 +13,6 @@ import android.net.VpnService; import android.os.ParcelFileDescriptor; import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; -import android.telephony.PhoneStateListener; -import android.telephony.ServiceState; -import android.telephony.TelephonyManager; import android.util.Log; import android.widget.Toast; @@ -100,10 +97,6 @@ public class SinkholeService extends VpnService { boolean interactive = Util.isInteractive(this); Log.i(TAG, "interactive=" + interactive); - // Check roaming - TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); - Log.i(TAG, "roaming=" + tm.isNetworkRoaming()); - // Build VPN service final Builder builder = new Builder(); builder.setSession(getString(R.string.app_name)); @@ -250,14 +243,6 @@ public class SinkholeService extends VpnService { } }; - private PhoneStateListener phoneStateListener = new PhoneStateListener() { - @Override - public void onServiceStateChanged(ServiceState serviceState) { - super.onServiceStateChanged(serviceState); - Log.i(TAG, "Service state changed roaming=" + serviceState.getRoaming()); - } - }; - @Override public void onCreate() { super.onCreate(); @@ -279,10 +264,6 @@ public class SinkholeService extends VpnService { ifInteractive.addAction(Intent.ACTION_SCREEN_ON); ifInteractive.addAction(Intent.ACTION_SCREEN_OFF); registerReceiver(interactiveStateReceiver, ifInteractive); - - // Listen for service state changes - TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); - tm.listen(phoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE); } @Override @@ -299,10 +280,6 @@ public class SinkholeService extends VpnService { unregisterReceiver(connectivityChangedReceiver); unregisterReceiver(interactiveStateReceiver); - // Listen for service state changes - TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); - tm.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE); - super.onDestroy(); }