diff --git a/app/src/main/java/eu/faircode/email/ActivityBilling.java b/app/src/main/java/eu/faircode/email/ActivityBilling.java index a9306d8739..6240393182 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBilling.java +++ b/app/src/main/java/eu/faircode/email/ActivityBilling.java @@ -102,7 +102,7 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis getSupportFragmentManager().addOnBackStackChangedListener(this); } - if (Helper.isPlayStoreInstall(this)) { + if (Helper.isPlayStoreInstall()) { Log.i("IAB start"); billingClient = BillingClient.newBuilder(this) .enablePendingPurchases() @@ -219,7 +219,7 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis }; private void onPurchase(Intent intent) { - if (Helper.isPlayStoreInstall(this)) { + if (Helper.isPlayStoreInstall()) { BillingFlowParams.Builder flowParams = BillingFlowParams.newBuilder(); if (skuDetails.containsKey(getSkuPro())) { Log.i("IAB purchase SKU=" + skuDetails.get(getSkuPro())); diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java index 95e818c15b..c468502100 100644 --- a/app/src/main/java/eu/faircode/email/ActivityMain.java +++ b/app/src/main/java/eu/faircode/email/ActivityMain.java @@ -39,7 +39,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack protected void onCreate(Bundle savedInstanceState) { getSupportFragmentManager().addOnBackStackChangedListener(this); - if (!Log.isSupportedDevice() && Helper.isPlayStoreInstall(this)) { + if (!Log.isSupportedDevice() && Helper.isPlayStoreInstall()) { setTheme(R.style.AppThemeLight); super.onCreate(savedInstanceState); setContentView(R.layout.activity_unsupported); diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 8dd68f8437..cc00349372 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -336,7 +336,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB }, new Runnable() { @Override public void run() { - if (!Helper.isPlayStoreInstall(ActivityView.this)) { + if (!Helper.isPlayStoreInstall()) { drawerLayout.closeDrawer(drawerContainer); checkUpdate(true); } @@ -360,7 +360,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB } }).setExternal(true)); - if ((Helper.isPlayStoreInstall(this) || BuildConfig.DEBUG) && + if ((Helper.isPlayStoreInstall() || BuildConfig.DEBUG) && getIntentRate(this).resolveActivity(pm) != null) extra.add(new NavMenuItem(R.drawable.baseline_star_24, R.string.menu_rate, new Runnable() { @Override @@ -687,7 +687,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB } private void checkUpdate(boolean always) { - if (Helper.isPlayStoreInstall(this) || !Helper.hasValidFingerprint(this)) + if (Helper.isPlayStoreInstall() || !Helper.hasValidFingerprint(this)) return; long now = new Date().getTime(); @@ -813,7 +813,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB private Intent getIntentOtherApps() { Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse(Helper.isPlayStoreInstall(this) + intent.setData(Uri.parse(Helper.isPlayStoreInstall() ? Helper.PLAY_APPS_URI : Helper.XDA_APPS_URI)); return intent; } diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 7fcf60bc0c..f865ada467 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -61,7 +61,7 @@ public class ApplicationEx extends Application { Log.e(ex); if (BuildConfig.BETA_RELEASE || - !Helper.isPlayStoreInstall(ApplicationEx.this)) + !Helper.isPlayStoreInstall()) Log.writeCrashLog(ApplicationEx.this, ex); if (prev != null) @@ -190,7 +190,7 @@ public class ApplicationEx extends Application { nm.createNotificationChannel(notification); // Update - if (!Helper.isPlayStoreInstall(this)) { + if (!Helper.isPlayStoreInstall()) { NotificationChannel update = new NotificationChannel( "update", getString(R.string.channel_update), NotificationManager.IMPORTANCE_HIGH); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 1b1429727e..c78955c4bb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -303,7 +303,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc swWatchdog.setChecked(prefs.getBoolean("watchdog", true)); swUpdates.setChecked(prefs.getBoolean("updates", true)); swUpdates.setVisibility( - Helper.isPlayStoreInstall(getContext()) || !Helper.hasValidFingerprint(getContext()) + Helper.isPlayStoreInstall() || !Helper.hasValidFingerprint(getContext()) ? View.GONE : View.VISIBLE); swExperiments.setChecked(prefs.getBoolean("experiments", false)); swCrashReports.setChecked(prefs.getBoolean("crash_reports", false)); diff --git a/app/src/main/java/eu/faircode/email/FragmentPro.java b/app/src/main/java/eu/faircode/email/FragmentPro.java index 19aa1eaa10..f69c729190 100644 --- a/app/src/main/java/eu/faircode/email/FragmentPro.java +++ b/app/src/main/java/eu/faircode/email/FragmentPro.java @@ -101,7 +101,7 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha btnPurchase.setEnabled(false); tvPrice.setText(null); btnCheck.setEnabled(false); - btnCheck.setVisibility(Helper.isPlayStoreInstall(getContext()) && debug ? View.VISIBLE : View.GONE); + btnCheck.setVisibility(Helper.isPlayStoreInstall() && debug ? View.VISIBLE : View.GONE); return view; } @@ -182,7 +182,7 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha boolean pro = prefs.getBoolean(key, false); tvActivated.setVisibility(pro ? View.VISIBLE : View.GONE); - if (!Helper.isPlayStoreInstall(getContext())) + if (!Helper.isPlayStoreInstall()) btnPurchase.setEnabled(!pro || BuildConfig.DEBUG); } } diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 356a33b8fa..f85a87cb95 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -813,7 +813,7 @@ public class Helper { return sb.toString(); } - static boolean isPlayStoreInstall(Context context) { + static boolean isPlayStoreInstall() { return BuildConfig.PLAY_STORE_RELEASE; }