1 files changed, 21 insertions(+), 1 deletions(-)

M src/cheogram/java/com/cheogram/android/ConnectionService.java

@@ 197,6 197,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
 		protected String sessionId = null;
 		protected Stack<String> postDial = new Stack<>();
 		protected Icon gatewayIcon;
+		protected CallAudioState pendingState = null;
 		protected WeakReference<JingleRtpConnection> rtpConnection = null;
 
 		CheogramConnection(Account account, Jid with, String postDialString) {


@@ 222,7 223,8 @@ public class ConnectionService extends android.telecom.ConnectionService {
 			);
 			setAudioModeIsVoip(true);
 			setConnectionCapabilities(
-				Connection.CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION
+				Connection.CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION |
+				Connection.CAPABILITY_MUTE
 			);
 		}
 


@@ 271,6 273,8 @@ public class ConnectionService extends android.telecom.ConnectionService {
 		public void onAudioDeviceChanged(AppRTCAudioManager.AudioDevice selectedAudioDevice, Set<AppRTCAudioManager.AudioDevice> availableAudioDevices) {
 			if (Build.VERSION.SDK_INT < 26) return;
 
+			if (pendingState != null) onCallAudioStateChanged(pendingState);
+
 			switch(selectedAudioDevice) {
 				case SPEAKER_PHONE:
 					setAudioRoute(CallAudioState.ROUTE_SPEAKER);


@@ 286,6 290,22 @@ public class ConnectionService extends android.telecom.ConnectionService {
 		}
 
 		@Override
+		public void onCallAudioStateChanged(CallAudioState state) {
+			pendingState = null;
+			if (rtpConnection == null || rtpConnection.get() == null) {
+				pendingState = state;
+				return;
+			}
+
+			try {
+				rtpConnection.get().setMicrophoneEnabled(!state.isMuted());
+			} catch (final IllegalStateException e) {
+				pendingState = state;
+				Log.w("com.cheogram.android.CheogramConnection", "Could not set microphone mute to " + (state.isMuted() ? "true" : "false") + ": " + e.toString());
+			}
+		}
+
+		@Override
 		public void onAnswer() {
 			// For incoming calls, a connection update may not have been triggered before answering
 			// so we have to acquire the rtp connection object here