Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-11-22 06:37:30 +00:00
Code Issues Releases Wiki Activity

show documentprovider error details

Browse Source
This commit is contained in:
Austin Huang 2021-06-26 13:56:47 -04:00
parent bdad254f5d
commit 9c811a6291
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/awais/instagrabber/activities/DirectorySelectActivity.java
View File

@ -82,7 +82,7 @@ public class DirectorySelectActivity extends BaseLanguageActivity {
return; return;
} }
if (!"com.android.externalstorage.documents".equals(data.getData().getAuthority())) { if (!"com.android.externalstorage.documents".equals(data.getData().getAuthority())) {
showErrorDialog(getString(R.string.dir_select_no_download_folder)); showErrorDialog(getString(R.string.dir_select_no_download_folder, data.getData().getAuthority()));
return; return;
} }
AppExecutors.INSTANCE.getMainThread().execute(() -> { AppExecutors.INSTANCE.getMainThread().execute(() -> {

2
app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java
View File

@ -111,7 +111,7 @@ public class DownloadsPreferencesFragment extends BasePreferencesFragment {
R.string.error, R.string.error,
"com.android.externalstorage.documents".equals(data.getData().getAuthority()) "com.android.externalstorage.documents".equals(data.getData().getAuthority())
? "Please report this error to the developers:\n\n" + sw.toString() ? "Please report this error to the developers:\n\n" + sw.toString()
: getString(R.string.dir_select_no_download_folder), : getString(R.string.dir_select_no_download_folder, data.getData().getAuthority()),
R.string.ok, R.string.ok,
0, 0,
0 0

12
app/src/main/java/awais/instagrabber/utils/DownloadUtils.kt
View File

@ -38,8 +38,6 @@ object DownloadUtils {
private const val DIR_TEMP = "Temp" private const val DIR_TEMP = "Temp"
private const val DIR_BACKUPS = "Backups" private const val DIR_BACKUPS = "Backups"
private var root: DocumentFile? = null private var root: DocumentFile? = null
const val WRITE_PERMISSION = Manifest.permission.WRITE_EXTERNAL_STORAGE
val PERMS = arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
@JvmStatic @JvmStatic
@Throws(ReselectDocumentTreeException::class) @Throws(ReselectDocumentTreeException::class)
fun init( fun init(
@ -49,11 +47,11 @@ object DownloadUtils {
if (isEmpty(barinstaDirUri)) { if (isEmpty(barinstaDirUri)) {
throw ReselectDocumentTreeException("folder path is null or empty") throw ReselectDocumentTreeException("folder path is null or empty")
} }
val uri = Uri.parse(barinstaDirUri)
if (!barinstaDirUri!!.startsWith("content://com.android.externalstorage.documents")) { if (!barinstaDirUri!!.startsWith("content://com.android.externalstorage.documents")) {
// reselect the folder in selector view // reselect the folder in selector view
throw ReselectDocumentTreeException(Uri.parse(barinstaDirUri)) throw ReselectDocumentTreeException(uri)
} }
val uri = Uri.parse(barinstaDirUri)
val existingPermissions = context.contentResolver.persistedUriPermissions val existingPermissions = context.contentResolver.persistedUriPermissions
if (existingPermissions.isEmpty()) { if (existingPermissions.isEmpty()) {
// reselect the folder in selector view // reselect the folder in selector view
@ -150,7 +148,7 @@ object DownloadUtils {
list.add(DIR_DOWNLOADS) list.add(DIR_DOWNLOADS)
return list return list
} }
val finalUsername = if (username!!.startsWith("@")) username.substring(1) else username val finalUsername = if (username.startsWith("@")) username.substring(1) else username
list.add(DIR_DOWNLOADS) list.add(DIR_DOWNLOADS)
list.add(finalUsername) list.add(finalUsername)
return list return list
@ -337,7 +335,7 @@ object DownloadUtils {
private fun checkPathExists(paths: List<String>, context: Context): Boolean { private fun checkPathExists(paths: List<String>, context: Context): Boolean {
if (root == null) return false if (root == null) return false
val uri = root!!.getUri() val uri = root!!.uri
var found = false var found = false
var docId = DocumentsContract.getTreeDocumentId(uri) var docId = DocumentsContract.getTreeDocumentId(uri)
for (path in paths) { for (path in paths) {
@ -349,7 +347,7 @@ object DownloadUtils {
), null, null, null ), null, null, null
) )
if (docCursor == null) return false if (docCursor == null) return false
while (docCursor!!.moveToNext() && !found) { while (docCursor.moveToNext() && !found) {
if (path.equals(docCursor.getString(0))) { if (path.equals(docCursor.getString(0))) {
docId = docCursor.getString(1) docId = docCursor.getString(1)
found = true found = true

2
app/src/main/res/values/strings.xml
View File

@ -512,7 +512,7 @@
<string name="dir_select_folder_not_exist">The previously selected folder does not exist now:</string> <string name="dir_select_folder_not_exist">The previously selected folder does not exist now:</string>
<string name="dir_select_message2">Re-select the directory or select a new directory by clicking the button below.</string> <string name="dir_select_message2">Re-select the directory or select a new directory by clicking the button below.</string>
<string name="select_a_folder">No folder selected!</string> <string name="select_a_folder">No folder selected!</string>
<string name="dir_select_no_download_folder">Please choose a directory from your storage, not a category on the sidebar.</string> <string name="dir_select_no_download_folder">Please choose a directory from your storage, not a category on the sidebar.\n(%s)</string>
<string name="dir_select_success_message">Success! Please wait. Starting app…</string> <string name="dir_select_success_message">Success! Please wait. Starting app…</string>
<string name="barinsta_folder">Barinsta folder</string> <string name="barinsta_folder">Barinsta folder</string>
<string name="top">Top</string> <string name="top">Top</string>