Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ class IdeSetupConfigurationFragment : OnboardingFragment(), SlidePolicy {
private var networkStateChangeCallback: NetworkCallback? = null

companion object {


private const val MAX_DENIAL_COUNT = 3
private var permissionDenyCount = 1
private val isToSkipPermission: Boolean
get() = permissionDenyCount >= MAX_DENIAL_COUNT

@JvmStatic
fun newInstance(context: Context): IdeSetupConfigurationFragment {
return IdeSetupConfigurationFragment().also {
Expand Down Expand Up @@ -226,9 +231,17 @@ class IdeSetupConfigurationFragment : OnboardingFragment(), SlidePolicy {
}

override val isPolicyRespected: Boolean
get() = getConnectionInfo(requireContext()).isConnected
get() {
if (isToSkipPermission) {
return true
} else {
return getConnectionInfo(requireContext()).isConnected
}
}
//getConnectionInfo(requireContext()).isConnected

override fun onUserIllegallyRequestedNextPage() {
if (!isToSkipPermission) permissionDenyCount += 1
flashError(string.msg_no_internet)
}

Expand Down Expand Up @@ -288,5 +301,4 @@ class IdeSetupConfigurationFragment : OnboardingFragment(), SlidePolicy {
backgroundDataRestrictionReceiver = null
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,12 @@ class PermissionsFragment : OnboardingMultiActionFragment(), SlidePolicy {
}

companion object {

private var permissionDenyCount = 0

private const val MAX_DENIAL_COUNT = 3

private var permissionDenyCount = 1
private val isToSkipPermission: Boolean
get() = permissionDenyCount >= MAX_DENIAL_COUNT

@JvmStatic
fun newInstance(context: Context): PermissionsFragment {
return PermissionsFragment().apply {
Expand Down Expand Up @@ -91,7 +93,7 @@ class PermissionsFragment : OnboardingMultiActionFragment(), SlidePolicy {

@JvmStatic
fun areAllPermissionsGranted(context: Context) : Boolean {
if (permissionDenyCount < MAX_DENIAL_COUNT) {
if (!isToSkipPermission) {
return getRequiredPermissions(context).all { it.isGranted }
} else {
return true
Expand All @@ -117,7 +119,7 @@ class PermissionsFragment : OnboardingMultiActionFragment(), SlidePolicy {
@JvmStatic
fun isPermissionGranted(context: Context, permission: String): Boolean {

if (permissionDenyCount < MAX_DENIAL_COUNT) {
if (!isToSkipPermission) {
return when (permission) {
Manifest.permission_group.STORAGE -> isStoragePermissionGranted(context)
Manifest.permission.REQUEST_INSTALL_PACKAGES -> context.packageManager.canRequestPackageInstalls()
Expand Down Expand Up @@ -171,15 +173,15 @@ class PermissionsFragment : OnboardingMultiActionFragment(), SlidePolicy {

override val isPolicyRespected: Boolean
get() {
if (permissionDenyCount < MAX_DENIAL_COUNT) {
if (!isToSkipPermission) {
return permissions.all { it.isGranted }
} else {
return true
}
}

override fun onUserIllegallyRequestedNextPage() {
permissionDenyCount+=1
if (!isToSkipPermission) permissionDenyCount += 1
activity?.flashError(R.string.msg_grant_permissions)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ class StatisticsFragment : OnboardingFragment() {

override fun createContentView(parent: ViewGroup, attachToParent: Boolean) {
_content = LayoutOnboardingStatisticsBinding.inflate(layoutInflater, parent, attachToParent)
content.statOptIn.isChecked = true
// content.statOptIn.isChecked = true
content.statOptIn.isChecked = false
}

override fun onDestroy() {
Expand Down