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 0000000..76129ee Binary files /dev/null and b/app/src/main/res/raw/smpte_color_bars.png differ