Merge pull request #2539 from quran/fix_some_crashes

Fix and catch some crashes
quran · Jan 12, 2024 · df9308e · df9308e
2 parents d067daa + 63cd8ff
commit df9308e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/app/src/main/java/com/quran/labs/androidquran/service/AudioService.kt b/app/src/main/java/com/quran/labs/androidquran/service/AudioService.kt
@@ -682,9 +682,15 @@ class AudioService : Service(), OnCompletionListener, OnPreparedListener,
 
   private fun processUpdatePlaybackSpeed(speed: Float) {
     if (State.Playing === state && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      player?.playbackParams?.let { params ->
-        params.setSpeed(speed)
-        player?.playbackParams = params
+      try {
+        player?.playbackParams?.let { params ->
+          params.setSpeed(speed)
+          player?.playbackParams = params
+        }
+      } catch (e: Exception) {
+        // catch an Android 6 crash [IllegalStateException], and report the speed since some
+        // non-Android 6 devices also crash here, but with [IllegalArgumentException]
+        Timber.e(e, "Failed to set speed to $speed")
       }
     }
   }

diff --git a/app/src/main/java/com/quran/labs/androidquran/service/QuranDownloadService.java b/app/src/main/java/com/quran/labs/androidquran/service/QuranDownloadService.java
@@ -239,13 +239,15 @@ private void sendNoOpMessage(int id) {
 
   @Override
   public int onStartCommand(Intent intent, int flags, int startId) {
-    // if it's a download, it wants to be a foreground service.
-    // quickly start as foreground before actually enqueueing the request.
-    if (ACTION_DOWNLOAD_URL.equals(intent.getAction())) {
-      notifier.notifyDownloadStarting();
-    }
+    if (intent != null) {
+      // if it's a download, it wants to be a foreground service.
+      // quickly start as foreground before actually enqueueing the request.
+      if (ACTION_DOWNLOAD_URL.equals(intent.getAction())) {
+        notifier.notifyDownloadStarting();
+      }
 
-    handleOnStartCommand(intent, startId);
+      handleOnStartCommand(intent, startId);
+    }
     return START_NOT_STICKY;
   }
 

diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/QuranActivity.kt b/app/src/main/java/com/quran/labs/androidquran/ui/QuranActivity.kt
@@ -1,5 +1,6 @@
 package com.quran.labs.androidquran.ui
 
+import android.app.BackgroundServiceStartNotAllowedException
 import android.app.SearchManager
 import android.content.ComponentName
 import android.content.Context
@@ -160,9 +161,14 @@ class QuranActivity : AppCompatActivity(),
           Completable.timer(500, MILLISECONDS)
               .observeOn(AndroidSchedulers.mainThread())
               .subscribe {
-                startService(
+                try {
+                  startService(
                     audioUtils.getAudioIntent(this@QuranActivity, AudioService.ACTION_STOP)
-                )
+                  )
+                } catch (illegalStateException: IllegalStateException) {
+                  // do nothing, we might be in the background
+                  // onPause should have stopped us from needing this, but it sometimes happens
+                }
               }
       )
     }