1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-02-23 14:51:06 +00:00

Simplification

This commit is contained in:
M66B 2015-10-31 21:48:09 +01:00
parent 72f2d683ef
commit 16033f0028

View file

@ -79,6 +79,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
private static final String SKU_DONATE = "donation"; // "android.test.purchased";
private static final String ACTION_IAB = "eu.faircode.netguard.IAB";
private static final Intent INTENT_VPN_SETTINGS = new Intent("android.net.vpn.SETTINGS");
@Override
protected void onCreate(Bundle savedInstanceState) {
Log.i(TAG, "Create");
@ -328,6 +330,12 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
MenuItem menuTheme = menu.findItem(R.id.menu_theme);
menuTheme.setChecked(prefs.getBoolean("dark_theme", false));
MenuItem menuVpn = menu.findItem(R.id.menu_vpn_settings);
menuVpn.setEnabled(INTENT_VPN_SETTINGS.resolveActivity(getPackageManager()) != null);
MenuItem menuSupport = menu.findItem(R.id.menu_support);
menuSupport.setEnabled(getIntentSupport().resolveActivity(getPackageManager()) != null);
return super.onPrepareOptionsMenu(menu);
}
@ -366,11 +374,11 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
return true;
case R.id.menu_vpn_settings:
menu_vpn_settings();
startActivity(INTENT_VPN_SETTINGS);
return true;
case R.id.menu_support:
menu_support();
startActivity(getIntentSupport());
return true;
case R.id.menu_about:
@ -429,23 +437,6 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
recreate();
}
private void menu_vpn_settings() {
Intent vpn = new Intent("android.net.vpn.SETTINGS");
if (vpn.resolveActivity(getPackageManager()) != null)
startActivity(vpn);
else
Log.w(TAG, vpn + " not available");
}
private void menu_support() {
Intent xda = new Intent(Intent.ACTION_VIEW);
xda.setData(Uri.parse("http://forum.xda-developers.com/showthread.php?t=3233012"));
if (xda.resolveActivity(getPackageManager()) != null)
startActivity(xda);
else
Log.w(TAG, xda + " not available");
}
private void menu_about() {
final boolean valid = Util.hasValidFingerprint(TAG, this);
@ -624,6 +615,12 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
}
}
private Intent getIntentSupport() {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("http://forum.xda-developers.com/showthread.php?t=3233012"));
return intent;
}
private boolean IABvalidate() {
try {
// Get available SKUs