Merge pull request #62 from GetStream/fix/reapply-autio-config

fix: reapply android audio config after audio changes to ensure custom configuration is maintained

Author: renefloor

android/src/main/java/io/getstream/webrtc/flutter/FlutterWebRTCPlugin.java

@@ -121,7 +121,10 @@ public void onDetachedFromActivity() {
 
     private void startListening(final Context context, BinaryMessenger messenger,
                                 TextureRegistry textureRegistry) {
-        AudioSwitchManager.instance = new AudioSwitchManager(context);
+        if (AudioSwitchManager.instance == null) {
+            AudioSwitchManager.instance = new AudioSwitchManager(context);
+        } 
+
         methodCallHandler = new MethodCallHandlerImpl(context, messenger, textureRegistry);
         methodChannel = new MethodChannel(messenger, "FlutterWebRTC.Method");
         methodChannel.setMethodCallHandler(methodCallHandler);

android/src/main/java/io/getstream/webrtc/flutter/audio/AudioSwitchManager.java

@@ -159,9 +159,13 @@ public void start() {
             handler.removeCallbacksAndMessages(null);
             handler.postAtFrontOfQueue(() -> {
                 if (!isActive) {
+                    applyAudioConfiguration();
+                    
                     audioSwitch.activate();
                     isActive = true;
-                }
+
+                    applyAudioManagerSettings();
+                } 
             });
         }
     }
@@ -204,7 +208,9 @@ public void selectAudioOutput(@NonNull Class<? extends AudioDevice> audioDeviceC
             }
             if (audioDevice != null) {
                 Objects.requireNonNull(audioSwitch).selectDevice(audioDevice);
-            }
+                applyAudioConfiguration();
+                applyAudioManagerSettings();
+            } 
         });
     }
 
@@ -248,6 +254,8 @@ public void enableSpeakerphone(boolean enable) {
             } else {
                 handler.post(() -> {
                     Objects.requireNonNull(audioSwitch).selectDevice(null);
+                    applyAudioConfiguration();
+                    applyAudioManagerSettings();
                 });
             }
         }
@@ -407,6 +415,24 @@ private void applyAudioManagerSettings() {
         audioManager.setMode(audioMode);
     }
 
+    private void applyAudioConfiguration() {
+        if (audioSwitch == null) {
+            return;
+        }
+
+        handler.post(() -> {
+            Objects.requireNonNull(audioSwitch).setManageAudioFocus(manageAudioFocus);
+            Objects.requireNonNull(audioSwitch).setFocusMode(focusMode);
+            Objects.requireNonNull(audioSwitch).setAudioMode(audioMode);
+            Objects.requireNonNull(audioSwitch).setAudioStreamType(audioStreamType);
+            Objects.requireNonNull(audioSwitch).setAudioAttributeContentType(audioAttributeContentType);
+            Objects.requireNonNull(audioSwitch).setAudioAttributeUsageType(audioAttributeUsageType);
+            Objects.requireNonNull(audioSwitch).setForceHandleAudioRouting(forceHandleAudioRouting);
+            
+            applyAudioManagerSettings();
+        });
+    }
+
     public void clearCommunicationDevice() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             audioManager.clearCommunicationDevice();
@@ -420,12 +446,16 @@ public void setAudioFocusChangeListener(@Nullable AudioManager.OnAudioFocusChang
     public void requestAudioFocus() {
         handler.post(() -> {
             if (audioSwitch != null) {
+                applyAudioConfiguration();
+                
                 Objects.requireNonNull(audioSwitch).activate();
+                
+                applyAudioManagerSettings();
             }
         });
     }
 
-    private static final class ForwardingAudioFocusChangeListener implements AudioManager.OnAudioFocusChangeListener {
+    private final class ForwardingAudioFocusChangeListener implements AudioManager.OnAudioFocusChangeListener {
         @Nullable
         private volatile AudioManager.OnAudioFocusChangeListener delegate;
 
@@ -435,6 +465,13 @@ public void onAudioFocusChange(int focusChange) {
             if (current != null) {
                 current.onAudioFocusChange(focusChange);
             }
+            
+            if (focusChange == AudioManager.AUDIOFOCUS_GAIN || 
+                focusChange == AudioManager.AUDIOFOCUS_GAIN_TRANSIENT ||
+                focusChange == AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK) {
+                applyAudioConfiguration();
+                applyAudioManagerSettings();
+            }
         }
 
         void setDelegate(@Nullable AudioManager.OnAudioFocusChangeListener delegate) {