Try fixing ANR when releasing ExoPlayer.

5 files changed, 14 insertions, 6 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 25cbdf73..4f141794 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,12 +52,12 @@ dependencies {
     implementation "androidx.room:room-runtime:$roomVersion"
     annotationProcessor "androidx.room:room-compiler:$roomVersion"
     implementation 'androidx.work:work-runtime:2.4.0'
-    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation 'com.google.android.material:material:1.3.0-alpha04'
 
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.10.4'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.10.4'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.10.4'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.10.4'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.10.8'
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.10.8'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.10.8'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.10.8'
     implementation 'com.alexvasilkov:gesture-views:2.6.0'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
@@ -95,7 +95,7 @@ dependencies {
     implementation 'me.zhanghai.android.fastscroll:library:1.1.2'
     implementation "com.thefuntasty.hauler:core:3.1.0"
     implementation 'com.github.Piasy:BigImageViewer:1.6.5'
-    implementation 'androidx.biometric:biometric:1.1.0-beta01'
+    implementation 'androidx.biometric:biometric:1.1.0-rc01'
     implementation 'com.airbnb.android:lottie:3.4.4'
     //implementation 'com.melegy.redscreenofdeath:red-screen-of-death:0.1.2'
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
index fb9bca66..b2b28948 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
@@ -635,6 +635,8 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
     protected void onDestroy() {
         EventBus.getDefault().unregister(this);
         super.onDestroy();
+        player.seekToDefaultPosition();
+        player.stop(true);
         player.release();
     }
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
index 66bd7b73..df48ab26 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
@@ -397,6 +397,8 @@ public class ViewVideoActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        player.seekToDefaultPosition();
+        player.stop(true);
         player.release();
     }
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewImgurVideoFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewImgurVideoFragment.java
index e95306bb..3af97f85 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewImgurVideoFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewImgurVideoFragment.java
@@ -278,6 +278,8 @@ public class ViewImgurVideoFragment extends Fragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        player.seekToDefaultPosition();
+        player.stop(true);
         player.release();
     }
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java
index e2d16f22..9530823d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java
@@ -282,6 +282,8 @@ public class ViewRedditGalleryVideoFragment extends Fragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        player.seekToDefaultPosition();
+        player.stop(true);
         player.release();
     }