From 81655d6863ec90edcb91e4eb8f20a1c425bde252 Mon Sep 17 00:00:00 2001 From: DrDisagree Date: Fri, 8 Sep 2023 21:40:50 +0600 Subject: [PATCH] Avoid accidental "Skip to Homepage" in release build --- app/src/main/java/com/drdisagree/iconify/SplashActivity.java | 2 +- .../java/com/drdisagree/iconify/ui/activities/HomePage.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/drdisagree/iconify/SplashActivity.java b/app/src/main/java/com/drdisagree/iconify/SplashActivity.java index 7b1482e64..75c1fe62a 100644 --- a/app/src/main/java/com/drdisagree/iconify/SplashActivity.java +++ b/app/src/main/java/com/drdisagree/iconify/SplashActivity.java @@ -31,7 +31,7 @@ public class SplashActivity extends AppCompatActivity { private final Runnable runner = () -> Shell.getShell(shell -> { Intent intent; - if (SKIP_TO_HOMEPAGE_FOR_TESTING_PURPOSES || (RootUtil.deviceProperlyRooted() && ModuleUtil.moduleProperlyInstalled() && BuildConfig.VERSION_CODE == SystemUtil.getSavedVersionCode())) { + if ((SKIP_TO_HOMEPAGE_FOR_TESTING_PURPOSES && BuildConfig.DEBUG) || (RootUtil.deviceProperlyRooted() && ModuleUtil.moduleProperlyInstalled() && BuildConfig.VERSION_CODE == SystemUtil.getSavedVersionCode())) { keepShowing = false; intent = new Intent(SplashActivity.this, HomePage.class); } else { diff --git a/app/src/main/java/com/drdisagree/iconify/ui/activities/HomePage.java b/app/src/main/java/com/drdisagree/iconify/ui/activities/HomePage.java index da7e0e4ac..ecc5ee829 100644 --- a/app/src/main/java/com/drdisagree/iconify/ui/activities/HomePage.java +++ b/app/src/main/java/com/drdisagree/iconify/ui/activities/HomePage.java @@ -22,6 +22,7 @@ import androidx.fragment.app.FragmentTransaction; import com.airbnb.lottie.LottieCompositionFactory; +import com.drdisagree.iconify.BuildConfig; import com.drdisagree.iconify.R; import com.drdisagree.iconify.config.Prefs; import com.drdisagree.iconify.databinding.ActivityHomePageBinding; @@ -87,7 +88,7 @@ else if (Objects.equals(FragmentHelper.getTopFragment(fragmentManager), FRAGMENT Thread thread1 = new Thread(runnable1); thread1.start(); - if (!SKIP_TO_HOMEPAGE_FOR_TESTING_PURPOSES && Build.VERSION.SDK_INT >= 33 && ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) { + if (!(SKIP_TO_HOMEPAGE_FOR_TESTING_PURPOSES && BuildConfig.DEBUG) && Build.VERSION.SDK_INT >= 33 && ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) { new Handler(Looper.getMainLooper()).postDelayed(() -> { requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, 0); }, 2000);