From f0324038e369edaca5e0058537ba8c5cccda5ccf Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Thu, 14 Dec 2023 10:56:09 +0100
Subject: [PATCH] Fix issue #990 #421 - Crash during transitions

---
 app/build.gradle                                            | 6 +++---
 .../fedilab/android/mastodon/activities/MediaActivity.java  | 4 +++-
 .../android/mastodon/ui/fragment/media/FragmentMedia.java   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9f2c11c8c..e51d121d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -146,9 +146,9 @@ dependencies {
     implementation "androidx.work:work-runtime:2.9.0"
     implementation 'app.futured.hauler:hauler:5.0.0'
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
-    implementation "ch.acra:acra-mail:5.9.6"
-    implementation "ch.acra:acra-limiter:5.9.3"
-    implementation "ch.acra:acra-dialog:5.9.6"
+    implementation "ch.acra:acra-mail:5.11.3"
+    implementation "ch.acra:acra-limiter:5.11.3"
+    implementation "ch.acra:acra-dialog:5.11.3"
     implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"
     implementation 'com.github.UnifiedPush:android-connector:2.2.0'
    // implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1'
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java
index 249230f52..ca082b023 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java
@@ -253,7 +253,9 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             finish();
-            ActivityCompat.finishAfterTransition(MediaActivity.this);
+            try {
+                ActivityCompat.finishAfterTransition(MediaActivity.this);
+            }catch (Exception ignored){}
             return true;
         } else if (item.getItemId() == R.id.action_save) {
             int position = binding.mediaViewpager.getCurrentItem();
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java
index 476c2644f..b1649b326 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java
@@ -361,9 +361,10 @@ public class FragmentMedia extends Fragment {
                             if (percent < 0.70) {
                                 binding.videoViewContainer.setVisibility(View.GONE);
                                 binding.videoLayout.setVisibility(View.GONE);
-                                ActivityCompat.finishAfterTransition(requireActivity());
+                                try {
+                                    ActivityCompat.finishAfterTransition(requireActivity());
+                                }catch (Exception ignored){}
                             }
-
                         }
 
                         @Override