narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

use fake 'tel:0' address on Android 8

Browse source
This commit is contained in:
Daniel Gultsch 2024-03-29 21:22:53 +01:00
parent c415e7d1d5
commit 14fb903522
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/eu/siacs/conversations/services/CallIntegrationConnectionService.java
View file

@ -40,6 +40,7 @@ import eu.siacs.conversations.xmpp.jingle.Media;
import eu.siacs.conversations.xmpp.jingle.RtpEndUserState; import eu.siacs.conversations.xmpp.jingle.RtpEndUserState;
import eu.siacs.conversations.xmpp.jingle.stanzas.Reason; import eu.siacs.conversations.xmpp.jingle.stanzas.Reason;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
@ -52,6 +53,9 @@ import java.util.concurrent.TimeoutException;
public class CallIntegrationConnectionService extends ConnectionService { public class CallIntegrationConnectionService extends ConnectionService {
private static final String EXTRA_ADDRESS = "eu.siacs.conversations.address";
private static final String EXTRA_SESSION_ID = "eu.siacs.conversations.sid";
private static final ExecutorService ACCOUNT_REGISTRATION_EXECUTOR = private static final ExecutorService ACCOUNT_REGISTRATION_EXECUTOR =
Executors.newSingleThreadExecutor(); Executors.newSingleThreadExecutor();
@ -160,8 +164,17 @@ public class CallIntegrationConnectionService extends ConnectionService {
final PhoneAccountHandle phoneAccountHandle, final ConnectionRequest request) { final PhoneAccountHandle phoneAccountHandle, final ConnectionRequest request) {
Log.d(Config.LOGTAG, "onCreateOutgoingConnection(" + request.getAddress() + ")"); Log.d(Config.LOGTAG, "onCreateOutgoingConnection(" + request.getAddress() + ")");
final var uri = request.getAddress(); final var uri = request.getAddress();
final var jid = Jid.ofEscaped(uri.getSchemeSpecificPart());
final var extras = request.getExtras(); final var extras = request.getExtras();
if (uri == null || !Arrays.asList("xmpp", "tel").contains(uri.getScheme())) {
return Connection.createFailedConnection(
new DisconnectCause(DisconnectCause.ERROR, "invalid address"));
}
final Jid jid;
if ("tel".equals(uri.getScheme())) {
jid = Jid.ofEscaped(extras.getString(EXTRA_ADDRESS));
} else {
jid = Jid.ofEscaped(uri.getSchemeSpecificPart());
}
final int videoState = extras.getInt(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE); final int videoState = extras.getInt(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE);
final Set<Media> media = final Set<Media> media =
videoState == VideoProfile.STATE_AUDIO_ONLY videoState == VideoProfile.STATE_AUDIO_ONLY
@ -183,7 +196,7 @@ public class CallIntegrationConnectionService extends ConnectionService {
final Bundle extraExtras = extras.getBundle(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS); final Bundle extraExtras = extras.getBundle(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS);
final String incomingCallAddress = final String incomingCallAddress =
extras.getString(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS); extras.getString(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS);
final String sid = extraExtras == null ? null : extraExtras.getString("sid"); final String sid = extraExtras == null ? null : extraExtras.getString(EXTRA_SESSION_ID);
Log.d(Config.LOGTAG, "sid " + sid); Log.d(Config.LOGTAG, "sid " + sid);
final Uri uri = incomingCallAddress == null ? null : Uri.parse(incomingCallAddress); final Uri uri = incomingCallAddress == null ? null : Uri.parse(incomingCallAddress);
Log.d(Config.LOGTAG, "uri=" + uri); Log.d(Config.LOGTAG, "uri=" + uri);
@ -329,9 +342,19 @@ public class CallIntegrationConnectionService extends ConnectionService {
.show(); .show();
return; return;
} }
final Uri address;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
// Android 9+ supports putting xmpp uris into the address
address = CallIntegration.address(with);
} else {
// for Android 8 we need to put in a fake tel uri
final var outgoingCallExtras = new Bundle();
outgoingCallExtras.putString(EXTRA_ADDRESS, with.toEscapedString());
extras.putBundle(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, outgoingCallExtras);
address = Uri.parse("tel:0");
}
try { try {
service.getSystemService(TelecomManager.class) service.getSystemService(TelecomManager.class).placeCall(address, extras);
.placeCall(CallIntegration.address(with), extras);
} catch (final SecurityException e) { } catch (final SecurityException e) {
Toast.makeText(service, R.string.call_integration_not_available, Toast.LENGTH_LONG) Toast.makeText(service, R.string.call_integration_not_available, Toast.LENGTH_LONG)
.show(); .show();
@ -363,7 +386,7 @@ public class CallIntegrationConnectionService extends ConnectionService {
TelecomManager.EXTRA_INCOMING_CALL_ADDRESS, TelecomManager.EXTRA_INCOMING_CALL_ADDRESS,
CallIntegration.address(id.with).toString()); CallIntegration.address(id.with).toString());
final var extras = new Bundle(); final var extras = new Bundle();
extras.putString("sid", id.sessionId); extras.putString(EXTRA_SESSION_ID, id.sessionId);
bundle.putBundle(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS, extras); bundle.putBundle(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS, extras);
try { try {
context.getSystemService(TelecomManager.class) context.getSystemService(TelecomManager.class)