Merge branch 'skip-setup' into 'master'

Show TOS on launch and allow skipping permissions fragment

See merge request AuroraOSS/AuroraStore!147
This commit is contained in:
Aayush Gupta
2023-04-08 12:38:53 +00:00
3 changed files with 1 additions and 24 deletions

View File

@@ -141,9 +141,7 @@ abstract class BaseActivity : AppCompatActivity(), NetworkProvider.NetworkListen
} }
fun askToReadTOS() { fun askToReadTOS() {
task { runOnUiThread {
TimeUnit.SECONDS.sleep(5)
} successUi {
if (!supportFragmentManager.isDestroyed) { if (!supportFragmentManager.isDestroyed) {
val sheet = TOSSheet.newInstance() val sheet = TOSSheet.newInstance()
sheet.isCancelable = false sheet.isCancelable = false

View File

@@ -143,12 +143,6 @@ class OnboardingActivity : BaseActivity() {
save(PREFERENCE_INTRO, true) save(PREFERENCE_INTRO, true)
open(SplashActivity::class.java, true) open(SplashActivity::class.java, true)
} }
for (fragment in supportFragmentManager.fragments) {
if (fragment is PermissionsFragment) {
B.btnForward.isEnabled = fragment.canGoForward()
break
}
}
} else { } else {
B.btnForward.text = getString(R.string.action_next) B.btnForward.text = getString(R.string.action_next)
B.btnForward.setOnClickListener { B.btnForward.setOnClickListener {

View File

@@ -119,15 +119,6 @@ class PermissionsFragment : BaseFragment() {
) == PackageManager.PERMISSION_GRANTED else true ) == PackageManager.PERMISSION_GRANTED else true
val storageManager = if (isRAndAbove()) Environment.isExternalStorageManager() else true val storageManager = if (isRAndAbove()) Environment.isExternalStorageManager() else true
val canInstallPackages = if (isOAndAbove()) requireContext().packageManager.canRequestPackageInstalls() 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) setFilterDuplicates(true)
installerList.forEach { installerList.forEach {
add( add(
@@ -212,10 +203,4 @@ class PermissionsFragment : BaseFragment() {
} }
} }
private var canGoForward = false
private var canGoForwardInitial: Boolean? = null
fun canGoForward(): Boolean {
return canGoForward
}
} }