Skip to content

fix(permission): auto upload overview #17236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −3
Open

fix(permission): auto upload overview #17236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,25 @@ class SyncedFoldersActivity :
mDrawerToggle.isDrawerIndicatorEnabled = false
}

PermissionUtil.requestStoragePermissionIfNeeded(this)
setupContent()
if (themeUtils.themingEnabled(this)) {
setTheme(R.style.FallbackThemingTheme)
}
binding.emptyList.emptyListViewAction.setOnClickListener { showHiddenItems() }
setupStoragePermissionWarningBanner()
}

override fun getMenuItemId(): Int = R.id.nav_settings

override fun onResume() {
super.onResume()
highlightNavigationViewItem(menuItemId)

setupStoragePermissionWarningBanner()
PermissionUtil.dismissStoragePermissionDialogFragment(this)
if (PermissionUtil.checkStoragePermission(this)) {
load(getItemsDisplayedPerFolder(), false)
}
uploadWarningCard?.bind(binding.autoUploadBatterySaverWarningCard)
}

Expand Down Expand Up @@ -271,7 +277,6 @@ class SyncedFoldersActivity :
binding.list.addItemDecoration(MediaGridItemDecoration(spacing))
binding.list.layoutManager = lm
binding.list.adapter = adapter
load(getItemsDisplayedPerFolder(), false)
}

private fun showHiddenItems() {
Expand Down Expand Up @@ -860,7 +865,6 @@ class SyncedFoldersActivity :
PermissionUtil.PERMISSIONS_EXTERNAL_STORAGE -> {
// If request is cancelled, result arrays are empty.
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
// permission was granted
load(getItemsDisplayedPerFolder(), true)
}
}
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,19 @@ object PermissionUtil {
}
}

fun dismissStoragePermissionDialogFragment(activity: AppCompatActivity) {
if (!checkStoragePermission(activity)) {
Log_OC.d(TAG, "Storage permissions are not granted, cannot dismiss")
return
}

(
activity.supportFragmentManager
.findFragmentByTag(PERMISSION_CHOICE_DIALOG_TAG) as? StoragePermissionDialogFragment
)
?.dismissAllowingStateLoss()
}

@RequiresApi(Build.VERSION_CODES.R)
fun getManageAllFilesIntent(context: Context) = Intent().apply {
action = Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
Expand Down
Loading