Properly set volume control stream for handset mode, fixes #115.

2 files changed, 9 insertions, 0 deletions

diff --git a/app/src/main/java/com/morlunk/mumbleclient/Settings.java b/app/src/main/java/com/morlunk/mumbleclient/Settings.java
index 122c025..15aac3f 100644
--- a/app/src/main/java/com/morlunk/mumbleclient/Settings.java
+++ b/app/src/main/java/com/morlunk/mumbleclient/Settings.java
@@ -20,6 +20,7 @@ package com.morlunk.mumbleclient;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.media.AudioManager;
 import android.preference.PreferenceManager;
 import android.view.Gravity;
 
diff --git a/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java b/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java
index f6cef03..20a4466 100644
--- a/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java
+++ b/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java
@@ -27,6 +27,7 @@ import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -335,6 +336,10 @@ public class PlumbleActivity extends ActionBarActivity implements ListView.OnIte
                 e.printStackTrace();
             }
         }
+
+        setVolumeControlStream(mSettings.isHandsetMode() ?
+                AudioManager.STREAM_VOICE_CALL : AudioManager.STREAM_MUSIC);
+
         if(mSettings.isFirstRun()) showSetupWizard();
     }
 
@@ -751,6 +756,9 @@ public class PlumbleActivity extends ActionBarActivity implements ListView.OnIte
             }
         } else if (Settings.PREF_STAY_AWAKE.equals(key)) {
             setStayAwake(mSettings.shouldStayAwake());
+        } else if (Settings.PREF_HANDSET_MODE.equals(key)) {
+            setVolumeControlStream(mSettings.isHandsetMode() ?
+                    AudioManager.STREAM_VOICE_CALL : AudioManager.STREAM_MUSIC);
         }
     }