Do not crash when LoudnessEnhancer is not initialized for some reason

Author: moneytoo

app/build.gradle

@@ -11,7 +11,7 @@ android {
         applicationId "com.brouken.player"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 167
+        versionCode 168
         versionName "0.${versionCode}"
         archivesBaseName = "Just.Player.v${versionName}"
     }

app/src/main/java/com/brouken/player/PlayerActivity.java

@@ -1293,12 +1293,12 @@ public void initializePlayer() {
             }
             player.setMediaItem(mediaItemBuilder.build(), mPrefs.getPosition());
 
-            if (loudnessEnhancer != null) {
-                loudnessEnhancer.release();
-            }
             try {
+                if (loudnessEnhancer != null) {
+                    loudnessEnhancer.release();
+                }
                 loudnessEnhancer = new LoudnessEnhancer(player.getAudioSessionId());
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
 
@@ -1407,12 +1407,12 @@ public void releasePlayer(boolean save) {
     private class PlayerListener implements Player.Listener {
         @Override
         public void onAudioSessionIdChanged(int audioSessionId) {
-            if (loudnessEnhancer != null) {
-                loudnessEnhancer.release();
-            }
             try {
+                if (loudnessEnhancer != null) {
+                    loudnessEnhancer.release();
+                }
                 loudnessEnhancer = new LoudnessEnhancer(audioSessionId);
-            } catch (RuntimeException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
             notifyAudioSessionUpdate(true);

app/src/main/java/com/brouken/player/Utils.java

@@ -190,12 +190,23 @@ public static void adjustVolume(final Context context, final AudioManager audioM
             PlayerActivity.boostLevel = 0;
         }
 
-        if (PlayerActivity.loudnessEnhancer == null)
+        try {
+            if (PlayerActivity.loudnessEnhancer == null || !PlayerActivity.loudnessEnhancer.hasControl()) {
+                canBoost = false;
+            }
+        } catch (Exception e) {
             canBoost = false;
+            e.printStackTrace();
+        }
 
         if (volume != volumeMax || (PlayerActivity.boostLevel == 0 && !raise)) {
-            if (PlayerActivity.loudnessEnhancer != null)
-                PlayerActivity.loudnessEnhancer.setEnabled(false);
+            if (PlayerActivity.loudnessEnhancer != null) {
+                try {
+                    PlayerActivity.loudnessEnhancer.setEnabled(false);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
             audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, raise ? AudioManager.ADJUST_RAISE : AudioManager.ADJUST_LOWER, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
             final int volumeNew = getVolume(context, false, audioManager);
             // Custom volume step on Samsung devices (Sound Assistant)
@@ -219,16 +230,21 @@ else if (!raise && PlayerActivity.boostLevel > 0)
             if (PlayerActivity.loudnessEnhancer != null) {
                 try {
                     PlayerActivity.loudnessEnhancer.setTargetGain(PlayerActivity.boostLevel * 200);
-                } catch (RuntimeException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
             playerView.setCustomErrorMessage(" " + (volumeMax + PlayerActivity.boostLevel));
         }
 
         playerView.setIconVolume(volumeActive);
-        if (PlayerActivity.loudnessEnhancer != null)
-            PlayerActivity.loudnessEnhancer.setEnabled(PlayerActivity.boostLevel > 0);
+        if (PlayerActivity.loudnessEnhancer != null) {
+            try {
+                PlayerActivity.loudnessEnhancer.setEnabled(PlayerActivity.boostLevel > 0);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         playerView.setHighlight(PlayerActivity.boostLevel > 0);
 
         if (clear) {