Merge pull request #3554 from deltachat/adb/issue-3542

avoid crash in MediaPreviewActivity.onPageUnselected
deltachat · Jan 21, 2025 · d30e141 · d30e141
2 parents a9c488f + 3059403
commit d30e141
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -472,9 +472,12 @@ public void onPageUnselected(int position) {
       MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
 
       if (adapter != null) {
-        MediaItem item = adapter.getMediaItemFor(position);
-        if (item.recipient != null) item.recipient.removeListener(MediaPreviewActivity.this);
-
+        try {
+          MediaItem item = adapter.getMediaItemFor(position);
+          if (item.recipient != null) item.recipient.removeListener(MediaPreviewActivity.this);
+        } catch (IllegalArgumentException e) {
+          Log.w(TAG, "Ignoring invalid position index");
+        }
         adapter.pause(position);
       }
     }