Do not crash if no gallery app is installed.

pr0gramm-com · Nov 26, 2017 · 93f9f09 · 93f9f09
1 parent d8eae34
commit 93f9f09
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/app/src/main/java/com/pr0gramm/app/ui/upload/UploadActivity.kt b/app/src/main/java/com/pr0gramm/app/ui/upload/UploadActivity.kt
@@ -74,8 +74,6 @@ class UploadActivity : BaseAppCompatActivity("UploadActivity"), ChooseMediaTypeF
     }
 
     internal fun showUploadFragment(type: String?, addToBackstack: Boolean) {
-        val arguments = Bundle()
-
         val fragment = if (intent?.action == Intent.ACTION_SEND) {
             val url = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
             UploadFragment.forLocalUri(url)

diff --git a/app/src/main/java/com/pr0gramm/app/ui/upload/UploadFragment.kt b/app/src/main/java/com/pr0gramm/app/ui/upload/UploadFragment.kt
@@ -88,9 +88,7 @@ class UploadFragment : BaseFragment("UploadFragment") {
             handleImageUri(uri)
 
         } else if (savedInstanceState == null) {
-            val intent = Intent(Intent.ACTION_PICK)
-            intent.type = mediaTypeArgument
-            startActivityForResult(intent, RequestCodes.SELECT_MEDIA)
+            handleImagePickRequest()
         }
 
         // enable auto-complete
@@ -108,12 +106,29 @@ class UploadFragment : BaseFragment("UploadFragment") {
         }
     }
 
+    private fun handleImagePickRequest() {
+        val intent = Intent(Intent.ACTION_PICK)
+        intent.type = mediaTypeArgument
+
+        // check if someone can handle this intent
+        if (!context.canStartIntent(intent)) {
+            showDialog(this) {
+                content(R.string.error_no_gallery_app)
+                positive { activity?.finish() }
+            }
+
+            return
+        }
+
+        startActivityForResult(intent, RequestCodes.SELECT_MEDIA)
+    }
+
     private fun onUploadClicked() {
         val file = file
         if (file == null) {
             showDialog(this) {
                 content(R.string.hint_upload_something_happen_try_again)
-                positive(R.string.okay, { activity?.finish() })
+                positive(R.string.okay) { activity?.finish() }
             }
             return
         }

diff --git a/app/src/main/java/com/pr0gramm/app/util/Extensions.kt b/app/src/main/java/com/pr0gramm/app/util/Extensions.kt
@@ -2,6 +2,7 @@ package com.pr0gramm.app.util
 
 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.TypedArray
 import android.database.Cursor
@@ -383,3 +384,7 @@ val <T : Result> PendingResult<T>.rx: Observable<T>
             emitter.onCompleted()
         }
     }
+
+fun Context.canStartIntent(intent: Intent): Boolean {
+    return packageManager.resolveActivity(intent, 0) != null
+}
diff --git a/app/src/main/res/raw/changelog.json b/app/src/main/res/raw/changelog.json
@@ -17,6 +17,10 @@
       {
         "type": "Fix",
         "change": "Hintergrund auf der Login Seite ist nun wieder da."
+      },
+      {
+        "type": "Fix",
+        "change": "Ist keine Galerie App installiert, ist die App beim Versuch einen Upload zu machen, abgestürzt. Dies ist nun nicht mehr der Fall."
       }
     ]
   },

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -501,4 +501,5 @@
     <string name="cast">Cast</string>
     <string name="error_feed_not_found">Der angefragte Post existiert nicht mehr.</string>
     <string name="menu_new_badge">NEU</string>
+    <string name="error_no_gallery_app">Es ist keine App zum Auswählen von Bildern und Videos installiert. Bitte installiere eine Galerie App wie \'Google Photos\' oder \'Simple Gallery\'</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -521,5 +521,6 @@
     <string name="cast">Cast</string>
     <string name="error_feed_not_found">The requested post does not exist.</string>
     <string name="menu_new_badge">NEW</string>
+    <string name="error_no_gallery_app">There is no app installed on your device that can handle an image picking request. Please install a gallery app like \'Simple Gallery\' or \'Google Photos\'.</string>
 </resources>