mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed dependency on subscription manager

This commit is contained in:
M66B 2017-07-22 14:51:32 +02:00
parent 95c905a1ef
commit a1bb7c0358
5 changed files with 0 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -916,7 +916,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
pref_technical_info.setSummary(Util.getGeneralInfo(this));
pref_technical_network.setSummary(Util.getNetworkInfo(this));
pref_technical_subscription.setSummary(Util.getSubscriptionInfo(this));
}
@Override

28
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View File

@ -60,7 +60,6 @@ import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.Spannable;
import android.text.SpannableString;
@ -122,7 +121,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
private boolean last_interactive = false;
private boolean powersaving = false;
private boolean phone_state = false;
private Object subscriptionsChangedListener = null;
private ServiceSinkhole.Builder last_builder = null;
private ParcelFileDescriptor vpn = null;
@ -325,25 +323,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
phone_state = true;
}
// Listen for data SIM changes
if (subscriptionsChangedListener == null &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1 &&
Util.hasPhoneStatePermission(ServiceSinkhole.this)) {
SubscriptionManager sm = SubscriptionManager.from(ServiceSinkhole.this);
if (sm != null) {
Log.i(TAG, "Starting listening to subscription changes");
subscriptionsChangedListener = new SubscriptionManager.OnSubscriptionsChangedListener() {
@Override
public void onSubscriptionsChanged() {
Log.i(TAG, "Subscriptions changed");
if (prefs.getBoolean("national_roaming", false) || prefs.getBoolean("eu_roaming", false))
ServiceSinkhole.reload("Subscriptions changed", ServiceSinkhole.this, false);
}
};
sm.addOnSubscriptionsChangedListener((SubscriptionManager.OnSubscriptionsChangedListener) subscriptionsChangedListener);
}
}
// Watchdog
if (cmd == Command.start || cmd == Command.reload) {
Intent watchdogIntent = new Intent(ServiceSinkhole.this, ServiceSinkhole.class);
@ -2358,13 +2337,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
}
}
if (subscriptionsChangedListener != null &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
SubscriptionManager sm = SubscriptionManager.from(this);
sm.removeOnSubscriptionsChangedListener((SubscriptionManager.OnSubscriptionsChangedListener) subscriptionsChangedListener);
subscriptionsChangedListener = null;
}
try {
if (vpn != null) {
stopNative(vpn, true);

52
app/src/main/java/eu/faircode/netguard/Util.java
View File

@ -46,8 +46,6 @@ import android.os.PowerManager;
import android.preference.PreferenceManager;
import android.support.v4.net.ConnectivityManagerCompat;
import android.support.v7.app.AlertDialog;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
@ -735,54 +733,6 @@ public class Util {
return (cm.getRestrictBackgroundStatus() == ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
public static String getSubscriptionInfo(Context context) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1)
return "Not supported";
if (!hasPhoneStatePermission(context))
return "No permission";
StringBuilder sb = new StringBuilder();
SubscriptionManager sm = SubscriptionManager.from(context);
sb.append("Slots ")
.append(sm.getActiveSubscriptionInfoCount())
.append('/')
.append(sm.getActiveSubscriptionInfoCountMax())
.append("\r\n");
int dataid = -1;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
dataid = sm.getDefaultDataSubscriptionId();
int voiceid = -1;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
voiceid = sm.getDefaultVoiceSubscriptionId();
List<SubscriptionInfo> subscriptions = sm.getActiveSubscriptionInfoList();
if (subscriptions != null)
for (SubscriptionInfo si : subscriptions)
sb.append("SIM ")
.append(si.getSimSlotIndex() + 1)
.append('/')
.append(si.getSubscriptionId())
.append(' ')
.append(si.getCountryIso())
.append('/')
.append(si.getMcc()).append(si.getMnc())
.append(' ')
.append(si.getCarrierName())
.append(si.getSubscriptionId() == dataid ? " D" : "")
.append(si.getSubscriptionId() == voiceid ? " V" : "")
.append(si.getDataRoaming() == SubscriptionManager.DATA_ROAMING_ENABLE ? " R" : "")
.append("\r\n");
if (sb.length() > 2)
sb.setLength(sb.length() - 2);
return sb.toString();
}
public static void sendLogcat(final Uri uri, final Context context) {
AsyncTask task = new AsyncTask<Object, Object, Intent>() {
@Override
@ -830,8 +780,6 @@ public class Util {
sb.append("\r\n\r\n");
sb.append(getNetworkInfo(context));
sb.append("\r\n\r\n");
sb.append(getSubscriptionInfo(context));
sb.append("\r\n\r\n");
// Get DNS
sb.append("DNS system:\r\n");

3
app/src/main/res/xml-v14/preferences.xml
View File

@ -358,9 +358,6 @@
<Preference
android:key="technical_network"
android:title="@string/setting_technical_networks" />
<Preference
android:key="technical_subscription"
android:title="@string/setting_technical_subscription" />
</PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>

3
app/src/main/res/xml-v21/preferences.xml
View File

@ -358,9 +358,6 @@
<Preference
android:key="technical_network"
android:title="@string/setting_technical_networks" />
<Preference
android:key="technical_subscription"
android:title="@string/setting_technical_subscription" />
</PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>