From bcec3816549562f804ff154d958e547dd9636988 Mon Sep 17 00:00:00 2001 From: Next Alone <12210746+NextAlone@users.noreply.github.com> Date: Thu, 14 Jul 2022 23:03:15 +0800 Subject: [PATCH] fix: output devices --- .../telegram/messenger/voip/VoIPService.java | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java b/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java index e2bb25deb..268b099b6 100755 --- a/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java @@ -139,7 +139,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import kotlin.Unit; import tw.nekomimi.nekogram.NekoConfig; +import tw.nekomimi.nekogram.ui.BottomBuilder; @SuppressLint("NewApi") public class VoIPService extends Service implements SensorEventListener, AudioManager.OnAudioFocusChangeListener, VoIPController.ConnectionStateListener, NotificationCenter.NotificationCenterDelegate { @@ -2662,20 +2664,21 @@ public class VoIPService extends Service implements SensorEventListener, AudioMa public void toggleSpeakerphoneOrShowRouteSheet(Context context, boolean fromOverlayWindow) { if (isBluetoothHeadsetConnected() && hasEarpiece()) { - BottomSheet.Builder builder = new BottomSheet.Builder(context) - .setTitle(LocaleController.getString("VoipOutputDevices", R.string.VoipOutputDevices), true) - .setItems(new CharSequence[]{ - LocaleController.getString("VoipAudioRoutingSpeaker", R.string.VoipAudioRoutingSpeaker), - isHeadsetPlugged ? LocaleController.getString("VoipAudioRoutingHeadset", R.string.VoipAudioRoutingHeadset) : LocaleController.getString("VoipAudioRoutingEarpiece", R.string.VoipAudioRoutingEarpiece), - currentBluetoothDeviceName != null ? currentBluetoothDeviceName : LocaleController.getString("VoipAudioRoutingBluetooth", R.string.VoipAudioRoutingBluetooth)}, - new int[]{R.drawable.calls_menu_speaker, - isHeadsetPlugged ? R.drawable.calls_menu_headset : R.drawable.calls_menu_phone, - R.drawable.calls_menu_bluetooth}, (dialog, which) -> { - if (getSharedInstance() == null) { - return; - } - setAudioOutput(which); - }); + BottomBuilder builder = new BottomBuilder(context); + builder.addTitle(LocaleController.getString("VoipOutputDevices", R.string.VoipOutputDevices), true); + builder.addItems(new String[]{ + LocaleController.getString("VoipAudioRoutingSpeaker", R.string.VoipAudioRoutingSpeaker), + isHeadsetPlugged ? LocaleController.getString("VoipAudioRoutingHeadset", R.string.VoipAudioRoutingHeadset) : LocaleController.getString("VoipAudioRoutingEarpiece", R.string.VoipAudioRoutingEarpiece), + currentBluetoothDeviceName != null ? currentBluetoothDeviceName : LocaleController.getString("VoipAudioRoutingBluetooth", R.string.VoipAudioRoutingBluetooth)}, + new int[]{R.drawable.calls_menu_speaker, + isHeadsetPlugged ? R.drawable.calls_menu_headset : R.drawable.calls_menu_phone, + R.drawable.calls_menu_bluetooth}, (which, dialog, __) -> { + if (getSharedInstance() == null) { + return Unit.INSTANCE; + } + setAudioOutput(which); + return Unit.INSTANCE; + }); BottomSheet bottomSheet = builder.create(); if (fromOverlayWindow) {