(hopefully) fixed a crash that occurred on orientation change right b…

…efore calling the image picker
y20k · Dec 26, 2015 · 4ec3c1b · 4ec3c1b
1 parent 4db2171
commit 4ec3c1b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 28 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.y20k.transistor"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 11
-        versionName "1.1.2 (Running Gun Blues)"
+        versionCode 12
+        versionName "1.1.3 (Running Gun Blues)"
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.y20k.transistor"
-    android:versionCode="11"
-    android:versionName="1.1.2 (Running Gun Blues)">
+    android:versionCode="12"
+    android:versionName="1.1.3 (Running Gun Blues)">
 
     <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
 
@@ -23,7 +23,8 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:configChanges="keyboardHidden|orientation|screenSize">
 
             <!-- Launcher -->
             <intent-filter>
@@ -59,9 +60,10 @@
         <activity
             android:name=".InfosheetActivity"
             android:label="@string/title_activity_infosheet"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize">
 
-            <meta-data
+        <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.y20k.transistor.MainActivity" />
 
@@ -72,9 +74,10 @@
         <activity
             android:name=".PlayerActivity"
             android:label="@string/title_activity_player"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize">
 
-            <meta-data
+        <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.y20k.transistor.MainActivity" />
 

diff --git a/app/src/main/java/org/y20k/transistor/MainActivityFragment.java b/app/src/main/java/org/y20k/transistor/MainActivityFragment.java
@@ -191,6 +191,9 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
     public void onResume() {
         super.onResume();
 
+//        // get activity that this fragment is currently attached to
+//        mActivity = getActivity();
+
         // handle incoming intent
         handleNewStationIntent();
     }
@@ -431,7 +434,6 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
                 } else {
                     // permission denied
                 }
-                return;
             }
         }
     }
@@ -462,7 +464,7 @@ private void processNewImage(Uri newImageUri) {
                 Log.e(LOG_TAG, "Unable to save: " + newImage.toString());
             }
         } else {
-            Log.e(LOG_TAG, "Unable to get image from media picker: " + newImage.toString());
+            Log.e(LOG_TAG, "Unable to get image from media picker: " + newImageUri.toString());
             // TODO handle error here
         }
     }

diff --git a/app/src/main/java/org/y20k/transistor/PlayerActivityFragment.java b/app/src/main/java/org/y20k/transistor/PlayerActivityFragment.java
@@ -309,7 +309,6 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
                 } else {
                     // permission denied
                 }
-                return;
             }
         }
     }
@@ -344,7 +343,7 @@ private void processNewImage(Uri newImageUri) {
             Bitmap stationImage = imageHelper.createCircularFramedImage(192);
             mStationImageView.setImageBitmap(stationImage);
         } else {
-            Log.e(LOG_TAG, "Unable to get image from media picker: " + newImage.toString());
+            Log.e(LOG_TAG, "Unable to get image from media picker: " + newImageUri.toString());
             // TODO handle error here
         }
     }

diff --git a/app/src/main/java/org/y20k/transistor/helpers/ImageHelper.java b/app/src/main/java/org/y20k/transistor/helpers/ImageHelper.java
@@ -137,7 +137,7 @@ else if (inputImageHeight > inputImageWidth) {
     /* Return sampled down image for given Uri */
     private Bitmap decodeSampledBitmapFromUri(Uri imageUri, int reqWidth, int reqHeight) {
 
-        Bitmap bitmap = null;
+        Bitmap bitmap;
         ParcelFileDescriptor parcelFileDescriptor =  null;
 
         try {
@@ -147,21 +147,27 @@ private Bitmap decodeSampledBitmapFromUri(Uri imageUri, int reqWidth, int reqHei
             e.printStackTrace();
         }
 
-        FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
+        if (parcelFileDescriptor != null) {
+            FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
 
-        // decode with inJustDecodeBounds=true to check dimensions
-        final BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = true;
-        BitmapFactory.decodeFileDescriptor(fileDescriptor, null, options);
+            // decode with inJustDecodeBounds=true to check dimensions
+            final BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFileDescriptor(fileDescriptor, null, options);
 
-        // calculate inSampleSize
-        options.inSampleSize = calculateSampleParameter(options, reqWidth, reqHeight);
+            // calculate inSampleSize
+            options.inSampleSize = calculateSampleParameter(options, reqWidth, reqHeight);
 
-        // decode bitmap with inSampleSize set
-        options.inJustDecodeBounds = false;
-        bitmap = BitmapFactory.decodeFileDescriptor(fileDescriptor, null, options);
+            // decode bitmap with inSampleSize set
+            options.inJustDecodeBounds = false;
+            bitmap = BitmapFactory.decodeFileDescriptor(fileDescriptor, null, options);
+
+            return bitmap;
+
+        } else {
+            return null;
+        }
 
-        return bitmap;
     }
 
 

diff --git a/app/src/main/java/org/y20k/transistor/helpers/StationContextMenu.java b/app/src/main/java/org/y20k/transistor/helpers/StationContextMenu.java
@@ -31,9 +31,6 @@
  */
 public class StationContextMenu extends DialogFragment {
 
-    /* Define log tag */
-    private static final String LOG_TAG = StationContextMenu.class.getSimpleName();
-
 
     /* Keys */
     private static final String ACTION_IMAGE_CHANGE_REQUESTED = "org.y20k.transistor.action.IMAGE_CHANGE_REQUESTED";