kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-04 03:06:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

null checking scheme in getLocalFilePathByUri

Browse Source
This commit is contained in:
HissPirat 2020-08-07 12:12:55 +02:00
parent b0b9664cef
commit 28c3318f93
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/kiwix/kiwixmobile/core/utils/files/FileUtils.kt
View File

@ -93,7 +93,6 @@ object FileUtils {
context: 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(context, uri) DocumentsContract.isDocumentUri(context, uri)
) { ) {
@ -110,11 +109,16 @@ object FileUtils {
} catch (ignore: IllegalArgumentException) { } catch (ignore: IllegalArgumentException) {
null null
} }
} else if ("content".equals(uri.scheme!!, ignoreCase = true)) { } else if (uri.scheme != null) {
if ("content".equals(uri.scheme!!, ignoreCase = true)) {
return contentQuery(context, uri) return contentQuery(context, uri)
} else if ("file".equals(uri.scheme!!, ignoreCase = true)) { } else if ("file".equals(uri.scheme!!, ignoreCase = true)) {
return uri.path return uri.path
} }
} else {
return uri.path
}
return null return null
} }