From 9cb59cc7356685c379a655e7c6e5d745ae582223 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Fri, 11 Mar 2022 16:57:04 -0500
Subject: [PATCH] ConnectionService: miscellaneous fixes

* Fix a few potential errors due to the use of newer APIs (minSDK is
  still only 24)
* Fix one remaining case of raw usage of generic types.
---
 .../java/com/cheogram/android/ConnectionService.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/cheogram/java/com/cheogram/android/ConnectionService.java b/src/cheogram/java/com/cheogram/android/ConnectionService.java
index 6d4c14c80..89d00962a 100644
--- a/src/cheogram/java/com/cheogram/android/ConnectionService.java
+++ b/src/cheogram/java/com/cheogram/android/ConnectionService.java
@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.telecom.CallAudioState;
@@ -19,6 +20,7 @@ import android.telecom.TelecomManager;
 import android.telephony.PhoneNumberUtils;
 import android.util.Log;
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
 import com.intentfilter.androidpermissions.NotificationSettings;
 import com.intentfilter.androidpermissions.PermissionManager;
@@ -29,6 +31,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
+import java.util.Vector;
 
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
@@ -241,6 +244,8 @@ public class ConnectionService extends android.telecom.ConnectionService {
 
         @Override
         public void onAudioDeviceChanged(AppRTCAudioManager.AudioDevice selectedAudioDevice, Set<AppRTCAudioManager.AudioDevice> availableAudioDevices) {
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) return;
+
             switch (selectedAudioDevice) {
                 case SPEAKER_PHONE:
                     setAudioRoute(CallAudioState.ROUTE_SPEAKER);
@@ -324,9 +329,9 @@ public class ConnectionService extends android.telecom.ConnectionService {
             while (!postDial.empty()) {
                 String next = postDial.pop();
                 if (next.equals(";")) {
-                    Stack v = (Stack) postDial.clone();
+                    Vector<String> v = new Vector<>(postDial);
                     Collections.reverse(v);
-                    setPostDialWait(String.join("", v));
+                    setPostDialWait(Joiner.on("").skipNulls().join(v));
                     return;
                 } else if (next.equals(",")) {
                     sleep(2000);