From 6d24714030a066f8f1a738a173f607155259b991 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 29 Aug 2017 11:04:35 +0200
Subject: [PATCH] catch exceptions thrown at loading bitmap

---
 .../com/simplemobiletools/draw/MyCanvas.kt    | 23 ++++++++++++-------
 app/src/main/res/values-de/strings.xml        |  1 +
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values-it/strings.xml        |  1 +
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values-pl/strings.xml        |  1 +
 app/src/main/res/values-pt/strings.xml        |  1 +
 app/src/main/res/values-ru/strings.xml        |  1 +
 app/src/main/res/values-sv/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 11 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt b/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt
index 60d21ee..833ede1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt
@@ -12,7 +12,9 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DecodeFormat
 import com.bumptech.glide.request.RequestOptions
 import com.simplemobiletools.commons.extensions.getContrastColor
+import com.simplemobiletools.commons.extensions.toast
 import java.util.*
+import java.util.concurrent.ExecutionException
 
 class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
     var mPaths = LinkedHashMap<MyPath, PaintOptions>()
@@ -94,15 +96,20 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
                     .format(DecodeFormat.PREFER_ARGB_8888)
                     .fitCenter()
 
-            val builder = Glide.with(context)
-                    .asBitmap()
-                    .load(path)
-                    .apply(options)
-                    .into(size.x, size.y)
+            try {
+                val builder = Glide.with(context)
+                        .asBitmap()
+                        .load(path)
+                        .apply(options)
+                        .into(size.x, size.y)
 
-            mBackgroundBitmap = builder.get()
-            activity.runOnUiThread {
-                invalidate()
+                mBackgroundBitmap = builder.get()
+                activity.runOnUiThread {
+                    invalidate()
+                }
+            } catch (e: ExecutionException) {
+                val errorMsg = String.format(activity.getString(R.string.failed_to_load_image), path)
+                activity.toast(errorMsg)
             }
         }).start()
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 047ffc2..5d42979 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Zeichenblock</string>
     <string name="open_file">Open file</string>
     <string name="eraser">Eraser</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Show brush size tool</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6f082fe..ed135c6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Draw</string>
     <string name="open_file">Open file</string>
     <string name="eraser">Eraser</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Show brush size tool</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 795382f..98726b3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Dessiner</string>
     <string name="open_file">Open file</string>
     <string name="eraser">Eraser</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Show brush size tool</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b7575f0..aed8447 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Draw</string>
     <string name="open_file">Open file</string>
     <string name="eraser">Eraser</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Show brush size tool</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9b6b4c5..d6a4c3a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">ドロー</string>
     <string name="open_file">Open file</string>
     <string name="eraser">Eraser</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Show brush size tool</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 41c930d..6afbc62 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Simple Draw</string>
     <string name="open_file">Otwórz plik</string>
     <string name="eraser">Gumka</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Pokaż narzędzie rozmiaru pędzla</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d49e20d..6c3a755 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Desenho</string>
     <string name="open_file">Abrir ficheiro</string>
     <string name="eraser">Borracha</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Mostrar ferramenta Tamanho do pincel</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9bf1578..529374c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Рисунки</string>
     <string name="open_file">Открыть файл</string>
     <string name="eraser">Eraser</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Позволить изменять размер кисти</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 805eec4..5cb42e0 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Rita</string>
     <string name="open_file">Öppna fil</string>
     <string name="eraser">Radergummi</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Visa penselstorleksverktyg</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7575f0..aed8447 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Draw</string>
     <string name="open_file">Open file</string>
     <string name="eraser">Eraser</string>
+    <string name="failed_to_load_image">Failed to load image %s</string>
 
     <!-- Settings -->
     <string name="show_brush_size">Show brush size tool</string>