#1320 - crash fix

inaturalist · Dec 31, 2023 · a5e85ab · a5e85ab
1 parent 4d1ea8b
commit a5e85ab
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/iNaturalist/src/main/java/org/inaturalist/android/ObservationViewerFragment.java b/iNaturalist/src/main/java/org/inaturalist/android/ObservationViewerFragment.java
@@ -482,11 +482,15 @@ public Object instantiateItem(ViewGroup container, final int position) {
 
                     if (mObsJson != null) {
                         try {
-                            BetterJSONObject obsPhoto = new BetterJSONObject(new JSONObject(mObsJson).getJSONArray("observation_photos").getJSONObject(position));
-                            item = new BetterJSONObject(obsPhoto.getJSONObject("photo"));
-                            isHidden = new ObservationPhoto(obsPhoto).hidden;
+                            JSONArray obsPhotos = new JSONObject(mObsJson).getJSONArray("observation_photos");
+
+                            if (position < obsPhotos.length()) {
+                                BetterJSONObject obsPhoto = new BetterJSONObject(obsPhotos.getJSONObject(position));
+                                item = new BetterJSONObject(obsPhoto.getJSONObject("photo"));
+                                isHidden = new ObservationPhoto(obsPhoto).hidden;
+                            }
                         } catch (JSONException e) {
-                            throw new RuntimeException(e);
+                            Logger.error(e);
                         }
                     } else if (mObservation.photos != null && mObservation.photos.size() > position) {
                         isHidden = mObservation.photos.get(position).hidden;