Fix possible crash when Uri doesn't have a display name

tsudoko · Apr 13, 2018 · 06d728b · 06d728b
1 parent 6351352
commit 06d728b
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/app/src/main/java/re/flande/xshare/Util.kt b/app/src/main/java/re/flande/xshare/Util.kt
@@ -16,15 +16,14 @@ fun getFatalDialogBuilder(context: Activity): AlertDialog.Builder =
         AlertDialog.Builder(context).setOnDismissListener { context.finishAffinity() }
 
 fun Uri.getFilename(context: Context): String {
+    var name: String? = null
     context.contentResolver.query(this, null, null, null, null).use { cursor ->
-        if (cursor?.moveToFirst() ?: return@use)
-            return cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+        if (cursor?.moveToFirst() ?: return@use) {
+            name = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+        }
     }
 
-    if (scheme == "file")
-        return lastPathSegment
-
-    throw Exception("don't know how to get file name from $this")
+    return name ?: lastPathSegment ?: throw Exception("don't know how to get file name from $this")
 }
 
 fun View.fade(show: Boolean, duration: Long) {