From fb3455bebd26bca07da2fce32539349741481ae3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 1 Apr 2022 22:34:22 +0200
Subject: [PATCH] properly handle ActivityNotFoundException at file related
 functions

---
 .../draw/pro/activities/MainActivity.kt       | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
index 78a0279..ffba669 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.simplemobiletools.draw.pro.activities
 
 import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
@@ -14,6 +15,7 @@ import android.view.MenuItem
 import android.view.WindowManager
 import android.webkit.MimeTypeMap
 import android.widget.SeekBar
+import android.widget.Toast
 import androidx.print.PrintHelper
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
@@ -226,7 +228,14 @@ class MainActivity : SimpleActivity(), CanvasListener {
         Intent(Intent.ACTION_GET_CONTENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             type = "image/*"
-            startActivityForResult(this, PICK_IMAGE_INTENT)
+
+            try {
+                startActivityForResult(this, PICK_IMAGE_INTENT)
+            } catch (e: ActivityNotFoundException) {
+                toast(R.string.no_app_found)
+            } catch (e: Exception) {
+                showErrorToast(e)
+            }
         }
     }
 
@@ -443,7 +452,13 @@ class MainActivity : SimpleActivity(), CanvasListener {
                     putExtra(Intent.EXTRA_TITLE, "$filename.$extension")
                     addCategory(Intent.CATEGORY_OPENABLE)
 
-                    startActivityForResult(this, SAVE_IMAGE_INTENT)
+                    try {
+                        startActivityForResult(this, SAVE_IMAGE_INTENT)
+                    } catch (e: ActivityNotFoundException) {
+                        toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
+                    } catch (e: Exception) {
+                        showErrorToast(e)
+                    }
                 }
             }
         } else {