PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

handle mange media for renaming

Browse source 
- move the launchMediaManagementIntent method to commons module
This commit is contained in:
darthpaul 2022-04-28 01:09:11 +01:00
parent 27107fef63
commit aca71be5d8
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
View file

@ -245,7 +245,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
R.id.menu_unhide -> toggleFileVisibility(false) R.id.menu_unhide -> toggleFileVisibility(false)
R.id.menu_share -> shareMediumPath(getCurrentPath()) R.id.menu_share -> shareMediumPath(getCurrentPath())
R.id.menu_delete -> checkDeleteConfirmation() R.id.menu_delete -> checkDeleteConfirmation()
R.id.menu_rename -> renameFile() R.id.menu_rename -> checkMediaManagementAndRename()
R.id.menu_print -> printFile() R.id.menu_print -> printFile()
R.id.menu_edit -> openEditor(getCurrentPath()) R.id.menu_edit -> openEditor(getCurrentPath())
R.id.menu_properties -> showProperties() R.id.menu_properties -> showProperties()
@ -900,7 +900,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
bottom_rename.beVisibleIf(visibleBottomActions and BOTTOM_ACTION_RENAME != 0 && currentMedium?.getIsInRecycleBin() == false) bottom_rename.beVisibleIf(visibleBottomActions and BOTTOM_ACTION_RENAME != 0 && currentMedium?.getIsInRecycleBin() == false)
bottom_rename.setOnLongClickListener { toast(R.string.rename); true } bottom_rename.setOnLongClickListener { toast(R.string.rename); true }
bottom_rename.setOnClickListener { bottom_rename.setOnClickListener {
renameFile() checkMediaManagementAndRename()
} }
bottom_set_as.beVisibleIf(visibleBottomActions and BOTTOM_ACTION_SET_AS != 0) bottom_set_as.beVisibleIf(visibleBottomActions and BOTTOM_ACTION_SET_AS != 0)
@ -1178,6 +1178,12 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
} }
} }
private fun checkMediaManagementAndRename() {
handleMediaManagementPrompt {
renameFile()
}
}
private fun renameFile() { private fun renameFile() {
val oldPath = getCurrentPath() val oldPath = getCurrentPath()

8
app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt
View file

@ -161,7 +161,7 @@ class MediaAdapter(
when (id) { when (id) {
R.id.cab_confirm_selection -> confirmSelection() R.id.cab_confirm_selection -> confirmSelection()
R.id.cab_properties -> showProperties() R.id.cab_properties -> showProperties()
R.id.cab_rename -> renameFile() R.id.cab_rename -> checkMediaManagementAndRename()
R.id.cab_edit -> editFile() R.id.cab_edit -> editFile()
R.id.cab_hide -> toggleFileVisibility(true) R.id.cab_hide -> toggleFileVisibility(true)
R.id.cab_unhide -> toggleFileVisibility(false) R.id.cab_unhide -> toggleFileVisibility(false)
@ -234,6 +234,12 @@ class MediaAdapter(
} }
} }
private fun checkMediaManagementAndRename() {
activity.handleMediaManagementPrompt {
renameFile()
}
}
private fun renameFile() { private fun renameFile() {
val firstPath = getFirstSelectedItemPath() ?: return val firstPath = getFirstSelectedItemPath() ?: return

11
app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt
View file

@ -125,18 +125,11 @@ fun SimpleActivity.launchAbout() {
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
} }
@RequiresApi(Build.VERSION_CODES.S)
fun AppCompatActivity.launchMediaManagementIntent() {
Intent(Settings.ACTION_REQUEST_MANAGE_MEDIA).apply {
data = Uri.parse("package:$packageName")
startActivity(this)
}
}
fun AppCompatActivity.handleMediaManagementPrompt(callback: () -> Unit) { fun BaseSimpleActivity.handleMediaManagementPrompt(callback: () -> Unit) {
if (isSPlus() && !MediaStore.canManageMedia(this)) { if (isSPlus() && !MediaStore.canManageMedia(this)) {
ConfirmationDialog(this, "", R.string.media_management_prompt, R.string.ok, 0) { ConfirmationDialog(this, "", R.string.media_management_prompt, R.string.ok, 0) {
launchMediaManagementIntent() launchMediaManagementIntent(callback)
} }
} else { } else {
callback() callback()