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:
@@ -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
|
||||
|
||||
@@ -143,12 +143,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 {
|
||||
|
||||
@@ -119,15 +119,6 @@ class PermissionsFragment : BaseFragment() {
|
||||
) == PackageManager.PERMISSION_GRANTED else true
|
||||
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(
|
||||
@@ -212,10 +203,4 @@ class PermissionsFragment : BaseFragment() {
|
||||
}
|
||||
}
|
||||
|
||||
private var canGoForward = false
|
||||
private var canGoForwardInitial: Boolean? = null
|
||||
|
||||
fun canGoForward(): Boolean {
|
||||
return canGoForward
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user