From 9e5738f80798f8c91dbd55f41b13e0c83240d86b Mon Sep 17 00:00:00 2001
From: Olga Miller <olga.rgb@gmail.com>
Date: Wed, 1 Mar 2017 21:14:57 +0100
Subject: [PATCH] Added smpte_color_bars.png as default image, removed loading
 image from Uri stored in Settings,

because of SecurityException in loadImage for Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
---
 NOTICE                                        |   3 +++
 .../java/om/sstvencoder/MainActivity.java     |  21 ++++++++++++------
 app/src/main/res/raw/smpte_color_bars.png     | Bin 0 -> 2624 bytes
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/raw/smpte_color_bars.png

diff --git a/NOTICE b/NOTICE
index 37de3c6..f197108 100644
--- a/NOTICE
+++ b/NOTICE
@@ -9,3 +9,6 @@ android.googlesource.com
 
 ic_launcher.png were created using GIMP:
 http://www.gimp.org/
+
+SMPTE Color Bars image (CC BY-SA 3.0) was taken from Wikipedia:
+http://en.wikipedia.org/wiki/SMPTE_color_bars#mediaviewer/File:SMPTE_Color_Bars.svg
diff --git a/app/src/main/java/om/sstvencoder/MainActivity.java b/app/src/main/java/om/sstvencoder/MainActivity.java
index 404f3d0..427584d 100644
--- a/app/src/main/java/om/sstvencoder/MainActivity.java
+++ b/app/src/main/java/om/sstvencoder/MainActivity.java
@@ -100,7 +100,8 @@ public class MainActivity extends AppCompatActivity {
         Uri uri = getImageUriFromIntent(intent);
         boolean verbose = true;
         if (uri == null) {
-            uri = mSettings.getImageUri();
+            // SecurityException in loadImage for Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+            // uri = mSettings.getImageUri();
             verbose = false;
         }
         loadImage(uri, verbose);
@@ -137,8 +138,7 @@ public class MainActivity extends AppCompatActivity {
             }
         }
         if (stream == null || !loadImage(stream, resolver, uri)) {
-            mCropView.setNoBitmap();
-            mSettings.setImageUri(null);
+            setDefaultBitmap();
             return false;
         }
         return true;
@@ -159,6 +159,15 @@ public class MainActivity extends AppCompatActivity {
         return true;
     }
 
+    private void setDefaultBitmap() {
+        try {
+            mCropView.setBitmap(getResources().openRawResource(R.raw.smpte_color_bars));
+        } catch (Exception ignore) {
+            mCropView.setNoBitmap();
+        }
+        mSettings.setImageUri(null);
+    }
+
     private boolean isIntentActionValid(String action) {
         return Intent.ACTION_SEND.equals(action);
     }
@@ -209,10 +218,8 @@ public class MainActivity extends AppCompatActivity {
             case REQUEST_LOAD_IMAGE_PERMISSION:
                 if (permissionGranted(grantResults))
                     loadImage(mSettings.getImageUri(), false);
-                else {
-                    mCropView.setNoBitmap();
-                    mSettings.setImageUri(null);
-                }
+                else
+                    setDefaultBitmap();
                 break;
             case REQUEST_IMAGE_CAPTURE_PERMISSION:
                 if (permissionGranted(grantResults))
diff --git a/app/src/main/res/raw/smpte_color_bars.png b/app/src/main/res/raw/smpte_color_bars.png
new file mode 100644
index 0000000000000000000000000000000000000000..76129ee5866a8671b54da775b20ceacc0e385253
GIT binary patch
literal 2624
zcmeAS@N?(olHy`uVBq!ia0y~yU|PVy!1#lM4Ja~|GyV{eVoUONcVYMsf(!O8pUl9(
z`PI|KF{EP7+Z!8mr5#0F11|*}DbX(A%}d}8SY{M6li58lK}+xf(-fnnt8V;mwp`v=
z8NnkaUL2pjH;>0^IeX6AJ!@Zb&b9`!a_44O9eQ@|C1dpG|MR~lR{^c776iIr35x~;
zgC-*vgM(KC6T<|dQK8Y07)=wSSz)wL7%dAiYlW5DKhK%BVf$l?W$HP(wZ8f{Znyuo
ze-(3?`&(Jfj{lRd-G9ki{h4XVS0=COe*gS8OYUH4-2DH`)C(5If4_fOc*lkRkI#Q$
z(fd+k=YGE4MlO23{olXk&sjwn8m2I?GAO7zFfw>>1~4!LF^vk1h6LGZ;)=P3m+abS
T)(fWr+h`1)u6{1-oD!M<1f=;p

literal 0
HcmV?d00001