From 2def492c1e4d310ecc7a6c8e79c7b21e65ee698a Mon Sep 17 00:00:00 2001 From: Oliver Scott Date: Thu, 2 Sep 2021 22:05:58 -0400 Subject: [PATCH 1/2] Show Terms of Service prompt on launch --- .../java/com/aurora/store/view/ui/commons/BaseActivity.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt index 05f847b43..40d62e088 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt @@ -141,9 +141,7 @@ abstract class BaseActivity : AppCompatActivity(), NetworkProvider.NetworkListen } fun askToReadTOS() { - task { - TimeUnit.SECONDS.sleep(5) - } successUi { + runOnUiThread { if (!supportFragmentManager.isDestroyed) { val sheet = TOSSheet.newInstance() sheet.isCancelable = false From 9a94e81bc01b3c85ae06a8cf4e2479089cfb5025 Mon Sep 17 00:00:00 2001 From: Oliver Scott Date: Thu, 2 Sep 2021 22:58:26 -0400 Subject: [PATCH 2/2] PermissionsFragment: allow to go forward without granting permissions --- .../view/ui/onboarding/OnboardingActivity.kt | 6 ------ .../view/ui/onboarding/PermissionsFragment.kt | 15 --------------- 2 files changed, 21 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt index 974fbc853..4cc14f87d 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt @@ -142,12 +142,6 @@ class OnboardingActivity : BaseActivity() { save(PREFERENCE_INTRO, true) open(SplashActivity::class.java, true) } - for (fragment in supportFragmentManager.fragments) { - if (fragment is PermissionsFragment) { - B.btnForward.isEnabled = fragment.canGoForward() - break - } - } } else { B.btnForward.text = getString(R.string.action_next) B.btnForward.setOnClickListener { diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt index d302b4034..93c99758f 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt @@ -97,15 +97,6 @@ class PermissionsFragment : BaseFragment() { ) == PackageManager.PERMISSION_GRANTED val storageManager = if (isRAndAbove()) Environment.isExternalStorageManager() else true val canInstallPackages = if (isOAndAbove()) requireContext().packageManager.canRequestPackageInstalls() else true - canGoForward = writeExternalStorage && storageManager && canInstallPackages - if (canGoForwardInitial == null) { - canGoForwardInitial = canGoForward - } - if (canGoForward && canGoForwardInitial == false) { - if (activity is OnboardingActivity) { - (activity!! as OnboardingActivity).refreshButtonState() - } - } setFilterDuplicates(true) installerList.forEach { add( @@ -177,10 +168,4 @@ class PermissionsFragment : BaseFragment() { } } - private var canGoForward = false - private var canGoForwardInitial: Boolean? = null - - fun canGoForward(): Boolean { - return canGoForward - } } \ No newline at end of file