kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-17 11:25:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1522 from kiwix/feature/macgills/#1520-illegal-argument-content-query

Browse Source 
#1520 Catch IllegalArgumentException
This commit is contained in:
Seán Mac Gillicuddy 2019-09-27 15:30:05 +01:00 committed by GitHub
commit 14d7fdf111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/org/kiwix/kiwixmobile/utils/files/FileUtils.kt
View File

@ -17,10 +17,12 @@
*/ */
package org.kiwix.kiwixmobile.utils.files package org.kiwix.kiwixmobile.utils.files
import android.annotation.TargetApi
import android.content.ContentUris import android.content.ContentUris
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Build.VERSION_CODES
import android.os.Environment import android.os.Environment
import android.provider.DocumentsContract import android.provider.DocumentsContract
import android.util.Log import android.util.Log
@ -146,12 +148,12 @@ object FileUtils {
} }
@JvmStatic fun getLocalFilePathByUri( @JvmStatic fun getLocalFilePathByUri(
ctx: Context, context: Context,
uri: Uri uri: Uri
): String? { ): String? {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT &&
DocumentsContract.isDocumentUri(ctx, uri) DocumentsContract.isDocumentUri(context, uri)
) { ) {
if ("com.android.externalstorage.documents" == uri.authority) { if ("com.android.externalstorage.documents" == uri.authority) {
val documentId = DocumentsContract.getDocumentId(uri) val documentId = DocumentsContract.getDocumentId(uri)
@ -160,10 +162,24 @@ object FileUtils {
if (documentId[0] == "primary") { if (documentId[0] == "primary") {
return "${Environment.getExternalStorageDirectory()}/${documentId[1]}" return "${Environment.getExternalStorageDirectory()}/${documentId[1]}"
} }
} else if ("com.android.providers.downloads.documents" == uri.authority } else if ("com.android.providers.downloads.documents" == uri.authority)
) return try {
return contentQuery( documentProviderContentQuery(context, uri)
ctx, } catch (ignore: IllegalArgumentException) {
null
}
} else if ("content".equals(uri.scheme!!, ignoreCase = true)) {
return contentQuery(context, uri)
} else if ("file".equals(uri.scheme!!, ignoreCase = true)) {
return uri.path
}
return null
}
@TargetApi(VERSION_CODES.KITKAT)
private fun documentProviderContentQuery(context: Context, uri: Uri) =
contentQuery(
context,
ContentUris.withAppendedId( ContentUris.withAppendedId(
Uri.parse("content://downloads/public_downloads"), Uri.parse("content://downloads/public_downloads"),
try { try {
@ -173,13 +189,6 @@ object FileUtils {
} }
) )
) )
} else if ("content".equals(uri.scheme!!, ignoreCase = true)) {
return contentQuery(ctx, uri)
} else if ("file".equals(uri.scheme!!, ignoreCase = true)) {
return uri.path
}
return null
}
private fun contentQuery( private fun contentQuery(
context: Context, context: Context,