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

Refactoring

This commit is contained in:
M66B 2016-07-02 10:14:34 +02:00
parent f4ddd779bf
commit 47deeba343
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -32,7 +32,6 @@ import android.net.Uri;
import android.net.VpnService;
import android.os.AsyncTask;
import android.os.Build;
import android.os.PowerManager;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.support.annotation.NonNull;
@ -692,9 +691,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
private void checkDoze() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
final Intent doze = new Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS);
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
if (!pm.isIgnoringBatteryOptimizations(getPackageName()) &&
getPackageManager().resolveActivity(doze, 0) != null) {
if (Util.batteryOptimizing(this) && getPackageManager().resolveActivity(doze, 0) != null) {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
if (!prefs.getBoolean("nodoze", false)) {
LayoutInflater inflater = LayoutInflater.from(this);
@ -727,6 +724,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
}
}
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
}
}
@Override

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

@ -669,6 +669,12 @@ public class Util {
return sb.toString();
}
@TargetApi(Build.VERSION_CODES.M)
public static boolean batteryOptimizing(Context context) {
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
return !pm.isIgnoringBatteryOptimizations(context.getPackageName());
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
public static String getSubscriptionInfo(Context context) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1)