#1358 - crash fix

inaturalist · Sep 16, 2024 · 4bc1bcd · 4bc1bcd
1 parent 5c9287c
commit 4bc1bcd
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/iNaturalist/src/main/java/org/inaturalist/android/ImageUtils.java b/iNaturalist/src/main/java/org/inaturalist/android/ImageUtils.java
@@ -379,8 +379,11 @@ public static String resizeImage(Context context, String path, Uri photoUri, int
                     Logger.tag(TAG).error(exc);
                     return null;
                 }
-            } else {
+            } else if (path != null) {
                 is = new FileInputStream(new File(path));
+            } else {
+                Logger.tag(TAG).error("Both path and URI are null");
+                return null;
             }
 
             // Just read the input image dimensions
@@ -393,8 +396,12 @@ public static String resizeImage(Context context, String path, Uri photoUri, int
             // BitmapFactory.decodeStream moves the reading cursor
             is.close();
 
-            androidx.exifinterface.media.ExifInterface exif = new androidx.exifinterface.media.ExifInterface(path);
-            int rotationDegrees = exif.getRotationDegrees();
+            int rotationDegrees = 0;
+
+            if (path != null) {
+                androidx.exifinterface.media.ExifInterface exif = new androidx.exifinterface.media.ExifInterface(path);
+                rotationDegrees = exif.getRotationDegrees();
+            }
 
             if (photoUri != null) {
                 is = context.getContentResolver().openInputStream(photoUri);