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