mirror of
https://github.com/FossifyOrg/Gallery.git
synced 2024-12-02 01:07:59 +01:00
Merge pull request #2414 from KryptKode/fix/copy_to_android_folder
handle picking restricted folders in PickDirectoryDialog
This commit is contained in:
commit
983ea153ee
1 changed files with 1 additions and 2 deletions
|
@ -8,7 +8,6 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity
|
||||||
import com.simplemobiletools.commons.dialogs.FilePickerDialog
|
import com.simplemobiletools.commons.dialogs.FilePickerDialog
|
||||||
import com.simplemobiletools.commons.extensions.*
|
import com.simplemobiletools.commons.extensions.*
|
||||||
import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
|
import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
|
||||||
import com.simplemobiletools.commons.helpers.isRPlus
|
|
||||||
import com.simplemobiletools.commons.views.MyGridLayoutManager
|
import com.simplemobiletools.commons.views.MyGridLayoutManager
|
||||||
import com.simplemobiletools.gallery.pro.R
|
import com.simplemobiletools.gallery.pro.R
|
||||||
import com.simplemobiletools.gallery.pro.adapters.DirectoryAdapter
|
import com.simplemobiletools.gallery.pro.adapters.DirectoryAdapter
|
||||||
|
@ -112,7 +111,7 @@ class PickDirectoryDialog(
|
||||||
if (path.trimEnd('/') == sourcePath) {
|
if (path.trimEnd('/') == sourcePath) {
|
||||||
activity.toast(R.string.source_and_destination_same)
|
activity.toast(R.string.source_and_destination_same)
|
||||||
return@DirectoryAdapter
|
return@DirectoryAdapter
|
||||||
} else if (isRPlus() && activity.isAStorageRootFolder(path)) {
|
} else if (activity.isRestrictedWithSAFSdk30(path) && !activity.isInDownloadDir(path)) {
|
||||||
activity.toast(R.string.system_folder_restriction, Toast.LENGTH_LONG)
|
activity.toast(R.string.system_folder_restriction, Toast.LENGTH_LONG)
|
||||||
return@DirectoryAdapter
|
return@DirectoryAdapter
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue