PeterCxy/cheogram
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: PeterCxy:0f581f889a654f5af4fd54f857c402e4a40ad3bf
Branches Tags
PeterCxy:peter-dev
PeterCxy:for-singpolyma
PeterCxy:peter-dev-bak
..
compare: PeterCxy:f092430c845bc2bae498acd7f2ab47a579e3ccdc
Branches Tags
PeterCxy:peter-dev
PeterCxy:for-singpolyma
PeterCxy:peter-dev-bak

4 commits
0f581f889a ... f092430c84

Author SHA1 Message Date
Peter Cai
f092430c84 do not use Dialer UI for incoming calls if audio permission is not granted 
We cannot request new permissions when Dialer UI is shown. For incoming
calls, if the Dialer UI is displayed over keyguard, then the user may
not even be able to see the permission notifications that we use for
outgoing calls.

If we just do not use the Dialer UI when the permission is not granted,
it is at most a minor annoyance for the first time. After the user has
accepted an incoming call even just once, the permission will be
granted, and the Dialer integration will start to work just fine.
 2022-03-11 21:54:59 -05:00
Peter Cai
3ba7f3e207 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.
 2022-03-11 21:52:49 -05:00
Peter Cai
d8d9571476 ConnectionService: Dialer UI integration for incoming calls 2022-03-11 21:51:08 -05:00
Peter Cai
b7b2bb0cdd ConnectionService: fix unchecked type assignments 2022-03-11 21:44:57 -05:00
2 changed files with 274 additions and 266 deletions
Show stats Expand all files Collapse all files

535
src/cheogram/java/com/cheogram/android/ConnectionService.java
View file

@ -1,31 +1,5 @@
package com.cheogram.android; package com.cheogram.android;
import android.Manifest;
import android.content.ComponentName;
import android.content.Context;
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;
import android.telecom.Connection;
import android.telecom.ConnectionRequest;
import android.telecom.DisconnectCause;
import android.telecom.PhoneAccountHandle;
import android.telecom.StatusHints;
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;
import com.intentfilter.androidpermissions.models.DeniedPermissions;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
@ -33,296 +7,329 @@ import java.util.Set;
import java.util.Stack; import java.util.Stack;
import java.util.Vector; import java.util.Vector;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableSet;
import android.os.Build;
import android.telecom.CallAudioState;
import android.telecom.Connection;
import android.telecom.ConnectionRequest;
import android.telecom.DisconnectCause;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.StatusHints;
import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
import android.Manifest;
import androidx.core.content.ContextCompat;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.ServiceConnection;
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.os.Bundle;
import android.os.IBinder;
import android.os.Parcel;
import android.util.Log;
import com.intentfilter.androidpermissions.PermissionManager;
import com.intentfilter.androidpermissions.NotificationSettings;
import com.intentfilter.androidpermissions.models.DeniedPermissions;
import io.michaelrocks.libphonenumber.android.NumberParseException;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.services.AppRTCAudioManager; import eu.siacs.conversations.services.AppRTCAudioManager;
import eu.siacs.conversations.services.AvatarService; import eu.siacs.conversations.services.AvatarService;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder; import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.ui.RtpSessionActivity; import eu.siacs.conversations.ui.RtpSessionActivity;
import eu.siacs.conversations.utils.PhoneNumberUtilWrapper; import eu.siacs.conversations.utils.PhoneNumberUtilWrapper;
import eu.siacs.conversations.xmpp.Jid; import eu.siacs.conversations.xmpp.Jid;
import eu.siacs.conversations.xmpp.jingle.JingleRtpConnection; import eu.siacs.conversations.xmpp.jingle.JingleRtpConnection;
import eu.siacs.conversations.xmpp.jingle.Media; import eu.siacs.conversations.xmpp.jingle.Media;
import eu.siacs.conversations.xmpp.jingle.RtpEndUserState; import eu.siacs.conversations.xmpp.jingle.RtpEndUserState;
import io.michaelrocks.libphonenumber.android.NumberParseException;
public class ConnectionService extends android.telecom.ConnectionService { public class ConnectionService extends android.telecom.ConnectionService {
public XmppConnectionService xmppConnectionService = null; public XmppConnectionService xmppConnectionService = null;
protected ServiceConnection mConnection = new ServiceConnection() { protected ServiceConnection mConnection = new ServiceConnection() {
@Override @Override
public void onServiceConnected(ComponentName className, IBinder service) { public void onServiceConnected(ComponentName className, IBinder service) {
XmppConnectionBinder binder = (XmppConnectionBinder) service; XmppConnectionBinder binder = (XmppConnectionBinder) service;
xmppConnectionService = binder.getService(); xmppConnectionService = binder.getService();
} }
@Override @Override
public void onServiceDisconnected(ComponentName arg0) { public void onServiceDisconnected(ComponentName arg0) {
xmppConnectionService = null; xmppConnectionService = null;
} }
}; };
private PermissionManager mPermissionManager;
@Override private PermissionManager mPermissionManager;
public void onCreate() {
mPermissionManager = PermissionManager.getInstance(this);
mPermissionManager.setNotificationSettings(
new NotificationSettings.Builder()
.withMessage(R.string.microphone_permission_for_call)
.withSmallIcon(R.drawable.ic_notification).build()
);
// From XmppActivity.connectToBackend @Override
Intent intent = new Intent(this, XmppConnectionService.class); public void onCreate() {
intent.setAction("ui"); mPermissionManager = PermissionManager.getInstance(this);
try { mPermissionManager.setNotificationSettings(
startService(intent); new NotificationSettings.Builder()
} catch (IllegalStateException e) { .withMessage(R.string.microphone_permission_for_call)
Log.w("com.cheogram.android.ConnectionService", "unable to start service from " + getClass().getSimpleName()); .withSmallIcon(R.drawable.ic_notification).build()
} );
bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
}
@Override // From XmppActivity.connectToBackend
public void onDestroy() { Intent intent = new Intent(this, XmppConnectionService.class);
unbindService(mConnection); intent.setAction("ui");
} try {
startService(intent);
} catch (IllegalStateException e) {
Log.w("com.cheogram.android.ConnectionService", "unable to start service from " + getClass().getSimpleName());
}
bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
}
@Override @Override
public Connection onCreateOutgoingConnection( public void onDestroy() {
PhoneAccountHandle phoneAccountHandle, unbindService(mConnection);
ConnectionRequest request }
) {
String[] gateway = phoneAccountHandle.getId().split("/", 2);
String rawTel = request.getAddress().getSchemeSpecificPart(); @Override
String postDial = PhoneNumberUtils.extractPostDialPortion(rawTel); public Connection onCreateOutgoingConnection(
PhoneAccountHandle phoneAccountHandle,
ConnectionRequest request
) {
String[] gateway = phoneAccountHandle.getId().split("/", 2);
String tel = PhoneNumberUtils.extractNetworkPortion(rawTel); String rawTel = request.getAddress().getSchemeSpecificPart();
try { String postDial = PhoneNumberUtils.extractPostDialPortion(rawTel);
tel = PhoneNumberUtilWrapper.normalize(this, tel);
} catch (NumberParseException e) {
return Connection.createFailedConnection(
new DisconnectCause(DisconnectCause.ERROR)
);
}
if (xmppConnectionService.getJingleConnectionManager().isBusy() != null) { String tel = PhoneNumberUtils.extractNetworkPortion(rawTel);
return Connection.createFailedConnection( try {
new DisconnectCause(DisconnectCause.BUSY) tel = PhoneNumberUtilWrapper.normalize(this, tel);
); } catch (NumberParseException e) {
} return Connection.createFailedConnection(
new DisconnectCause(DisconnectCause.ERROR)
);
}
Account account = xmppConnectionService.findAccountByJid(Jid.of(gateway[0])); if (xmppConnectionService.getJingleConnectionManager().isBusy() != null) {
Jid with = Jid.ofLocalAndDomain(tel, gateway[1]); return Connection.createFailedConnection(
CheogramConnection connection = new CheogramConnection(account, with, postDial); new DisconnectCause(DisconnectCause.BUSY)
);
}
Set<String> permissions = new HashSet<>(); Account account = xmppConnectionService.findAccountByJid(Jid.of(gateway[0]));
permissions.add(Manifest.permission.RECORD_AUDIO); Jid with = Jid.ofLocalAndDomain(tel, gateway[1]);
mPermissionManager.checkPermissions(permissions, new PermissionManager.PermissionRequestListener() { CheogramConnection connection = new CheogramConnection(account, with, postDial);
@Override
public void onPermissionGranted() {
connection.setSessionId(xmppConnectionService.getJingleConnectionManager().proposeJingleRtpSession(
account,
with,
ImmutableSet.of(Media.AUDIO)
));
}
@Override Set<String> permissions = new HashSet<>();
public void onPermissionDenied(DeniedPermissions deniedPermissions) { permissions.add(Manifest.permission.RECORD_AUDIO);
connection.setDisconnected(new DisconnectCause(DisconnectCause.ERROR)); mPermissionManager.checkPermissions(permissions, new PermissionManager.PermissionRequestListener() {
} @Override
}); public void onPermissionGranted() {
connection.setSessionId(xmppConnectionService.getJingleConnectionManager().proposeJingleRtpSession(
account,
with,
ImmutableSet.of(Media.AUDIO)
));
}
connection.setInitializing(); @Override
connection.setAddress( public void onPermissionDenied(DeniedPermissions deniedPermissions) {
Uri.fromParts("tel", tel, null), // Normalized tel as tel: URI connection.setDisconnected(new DisconnectCause(DisconnectCause.ERROR));
TelecomManager.PRESENTATION_ALLOWED }
); });
xmppConnectionService.setOnRtpConnectionUpdateListener( connection.setInitializing();
(XmppConnectionService.OnJingleRtpConnectionUpdate) connection connection.setAddress(
); Uri.fromParts("tel", tel, null), // Normalized tel as tel: URI
TelecomManager.PRESENTATION_ALLOWED
);
return connection; xmppConnectionService.setOnRtpConnectionUpdateListener(
} (XmppConnectionService.OnJingleRtpConnectionUpdate) connection
);
@Override return connection;
public Connection onCreateIncomingConnection(PhoneAccountHandle handle, ConnectionRequest request) { }
Bundle extras = request.getExtras();
String accountJid = extras.getString("account");
String withJid = extras.getString("with");
String sessionId = extras.getString("sessionId");
Account account = xmppConnectionService.findAccountByJid(Jid.of(accountJid)); @Override
Jid with = Jid.of(withJid); public Connection onCreateIncomingConnection(PhoneAccountHandle handle, ConnectionRequest request) {
Bundle extras = request.getExtras();
String accountJid = extras.getString("account");
String withJid = extras.getString("with");
String sessionId = extras.getString("sessionId");
CheogramConnection connection = new CheogramConnection(account, with, null); Account account = xmppConnectionService.findAccountByJid(Jid.of(accountJid));
connection.setSessionId(sessionId); Jid with = Jid.of(withJid);
connection.setAddress(
Uri.fromParts("tel", with.getLocal(), null),
TelecomManager.PRESENTATION_ALLOWED
);
connection.setRinging();
xmppConnectionService.setOnRtpConnectionUpdateListener(connection); CheogramConnection connection = new CheogramConnection(account, with, null);
connection.setSessionId(sessionId);
connection.setAddress(
Uri.fromParts("tel", with.getLocal(), null),
TelecomManager.PRESENTATION_ALLOWED
);
connection.setRinging();
return connection; xmppConnectionService.setOnRtpConnectionUpdateListener(connection);
}
public class CheogramConnection extends Connection implements XmppConnectionService.OnJingleRtpConnectionUpdate { return connection;
protected Account account; }
protected Jid with;
protected String sessionId = null;
protected Stack<String> postDial = new Stack<>();
protected Icon gatewayIcon;
protected WeakReference<JingleRtpConnection> rtpConnection = null;
CheogramConnection(Account account, Jid with, String postDialString) { public class CheogramConnection extends Connection implements XmppConnectionService.OnJingleRtpConnectionUpdate {
super(); protected Account account;
this.account = account; protected Jid with;
this.with = with; protected String sessionId = null;
protected Stack<String> postDial = new Stack<>();
protected Icon gatewayIcon;
protected WeakReference<JingleRtpConnection> rtpConnection = null;
gatewayIcon = Icon.createWithBitmap(xmppConnectionService.getAvatarService().get( CheogramConnection(Account account, Jid with, String postDialString) {
account.getRoster().getContact(Jid.of(with.getDomain())), super();
AvatarService.getSystemUiAvatarSize(xmppConnectionService), this.account = account;
false this.with = with;
));
if (postDialString != null) { gatewayIcon = Icon.createWithBitmap(xmppConnectionService.getAvatarService().get(
for (int i = postDialString.length() - 1; i >= 0; i--) { account.getRoster().getContact(Jid.of(with.getDomain())),
postDial.push("" + postDialString.charAt(i)); AvatarService.getSystemUiAvatarSize(xmppConnectionService),
} false
} ));
setCallerDisplayName( if (postDialString != null) {
account.getDisplayName(), for (int i = postDialString.length() - 1; i >= 0; i--) {
TelecomManager.PRESENTATION_ALLOWED postDial.push("" + postDialString.charAt(i));
); }
setAudioModeIsVoip(true); }
setConnectionCapabilities(
Connection.CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION
);
}
public void setSessionId(final String sessionId) { setCallerDisplayName(
this.sessionId = sessionId; account.getDisplayName(),
} TelecomManager.PRESENTATION_ALLOWED
);
setAudioModeIsVoip(true);
setConnectionCapabilities(
Connection.CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION
);
}
@Override public void setSessionId(final String sessionId) {
public void onJingleRtpConnectionUpdate(final Account account, final Jid with, final String sessionId, final RtpEndUserState state) { this.sessionId = sessionId;
if (sessionId == null || !sessionId.equals(this.sessionId)) return; }
if (rtpConnection == null) {
this.with = with; // Store full JID of connection
rtpConnection = xmppConnectionService.getJingleConnectionManager().findJingleRtpConnection(account, with, sessionId);
}
setStatusHints(new StatusHints(null, gatewayIcon, null)); @Override
public void onJingleRtpConnectionUpdate(final Account account, final Jid with, final String sessionId, final RtpEndUserState state) {
if (sessionId == null || !sessionId.equals(this.sessionId)) return;
if (rtpConnection == null) {
this.with = with; // Store full JID of connection
rtpConnection = xmppConnectionService.getJingleConnectionManager().findJingleRtpConnection(account, with, sessionId);
}
if (state == RtpEndUserState.FINDING_DEVICE) { setStatusHints(new StatusHints(null, gatewayIcon, null));
setInitialized();
} else if (state == RtpEndUserState.RINGING) {
setDialing();
} else if (state == RtpEndUserState.INCOMING_CALL) {
setRinging();
} else if (state == RtpEndUserState.CONNECTED) {
xmppConnectionService.setDiallerIntegrationActive(true);
setActive();
postDial(); if (state == RtpEndUserState.FINDING_DEVICE) {
} else if (state == RtpEndUserState.DECLINED_OR_BUSY) { setInitialized();
setDisconnected(new DisconnectCause(DisconnectCause.BUSY)); } else if (state == RtpEndUserState.RINGING) {
} else if (state == RtpEndUserState.ENDED) { setDialing();
setDisconnected(new DisconnectCause(DisconnectCause.LOCAL)); } else if (state == RtpEndUserState.INCOMING_CALL) {
} else if (state == RtpEndUserState.RETRACTED) { setRinging();
setDisconnected(new DisconnectCause(DisconnectCause.CANCELED)); } else if (state == RtpEndUserState.CONNECTED) {
} else if (RtpSessionActivity.END_CARD.contains(state)) { xmppConnectionService.setDiallerIntegrationActive(true);
setDisconnected(new DisconnectCause(DisconnectCause.ERROR)); setActive();
}
}
@Override postDial();
public void onAudioDeviceChanged(AppRTCAudioManager.AudioDevice selectedAudioDevice, Set<AppRTCAudioManager.AudioDevice> availableAudioDevices) { } else if (state == RtpEndUserState.DECLINED_OR_BUSY) {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) return; setDisconnected(new DisconnectCause(DisconnectCause.BUSY));
} else if (state == RtpEndUserState.ENDED) {
setDisconnected(new DisconnectCause(DisconnectCause.LOCAL));
} else if (state == RtpEndUserState.RETRACTED) {
setDisconnected(new DisconnectCause(DisconnectCause.CANCELED));
} else if (RtpSessionActivity.END_CARD.contains(state)) {
setDisconnected(new DisconnectCause(DisconnectCause.ERROR));
}
}
switch (selectedAudioDevice) { @Override
case SPEAKER_PHONE: public void onAudioDeviceChanged(AppRTCAudioManager.AudioDevice selectedAudioDevice, Set<AppRTCAudioManager.AudioDevice> availableAudioDevices) {
setAudioRoute(CallAudioState.ROUTE_SPEAKER); if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) return;
case WIRED_HEADSET:
setAudioRoute(CallAudioState.ROUTE_WIRED_HEADSET);
case EARPIECE:
setAudioRoute(CallAudioState.ROUTE_EARPIECE);
case BLUETOOTH:
setAudioRoute(CallAudioState.ROUTE_BLUETOOTH);
default:
setAudioRoute(CallAudioState.ROUTE_WIRED_OR_EARPIECE);
}
}
@Override switch(selectedAudioDevice) {
public void onAnswer() { case SPEAKER_PHONE:
// For incoming calls, a connection update may not have been triggered before answering setAudioRoute(CallAudioState.ROUTE_SPEAKER);
// so we have to acquire the rtp connection object here case WIRED_HEADSET:
this.rtpConnection = setAudioRoute(CallAudioState.ROUTE_WIRED_HEADSET);
xmppConnectionService.getJingleConnectionManager() case EARPIECE:
.findJingleRtpConnection(account, with, sessionId); setAudioRoute(CallAudioState.ROUTE_EARPIECE);
case BLUETOOTH:
setAudioRoute(CallAudioState.ROUTE_BLUETOOTH);
default:
setAudioRoute(CallAudioState.ROUTE_WIRED_OR_EARPIECE);
}
}
@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
this.rtpConnection =
xmppConnectionService.getJingleConnectionManager()
.findJingleRtpConnection(account, with, sessionId);
rtpConnection.get().acceptCall(); rtpConnection.get().acceptCall();
} }
@Override @Override
public void onDisconnect() { public void onDisconnect() {
if (rtpConnection == null || rtpConnection.get() == null) { if (rtpConnection == null || rtpConnection.get() == null) {
xmppConnectionService.getJingleConnectionManager().retractSessionProposal(account, with.asBareJid()); xmppConnectionService.getJingleConnectionManager().retractSessionProposal(account, with.asBareJid());
} else { } else {
rtpConnection.get().endCall(); rtpConnection.get().endCall();
} }
destroy(); destroy();
xmppConnectionService.setDiallerIntegrationActive(false); xmppConnectionService.setDiallerIntegrationActive(false);
xmppConnectionService.removeRtpConnectionUpdateListener( xmppConnectionService.removeRtpConnectionUpdateListener(
(XmppConnectionService.OnJingleRtpConnectionUpdate) this (XmppConnectionService.OnJingleRtpConnectionUpdate) this
); );
} }
@Override @Override
public void onAbort() { public void onAbort() {
onDisconnect(); onDisconnect();
} }
@Override @Override
public void onPlayDtmfTone(char c) { public void onPlayDtmfTone(char c) {
rtpConnection.get().applyDtmfTone("" + c); rtpConnection.get().applyDtmfTone("" + c);
} }
@Override @Override
public void onPostDialContinue(boolean c) { public void onPostDialContinue(boolean c) {
if (c) postDial(); if (c) postDial();
} }
protected void sleep(int ms) { protected void sleep(int ms) {
try { try {
Thread.sleep(ms); Thread.sleep(ms);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
} }
protected void postDial() { protected void postDial() {
while (!postDial.empty()) { while (!postDial.empty()) {
String next = postDial.pop(); String next = postDial.pop();
if (next.equals(";")) { if (next.equals(";")) {
Vector<String> v = new Vector<>(postDial); Vector<String> v = new Vector<>(postDial);
Collections.reverse(v); Collections.reverse(v);
setPostDialWait(Joiner.on("").skipNulls().join(v)); setPostDialWait(Joiner.on("").join(v));
return; return;
} else if (next.equals(",")) { } else if (next.equals(",")) {
sleep(2000); sleep(2000);
} else { } else {
rtpConnection.get().applyDtmfTone(next); rtpConnection.get().applyDtmfTone(next);
sleep(100); sleep(100);
} }
} }
} }
} }
} }

5
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -430,8 +430,9 @@ public class NotificationService {
private synchronized boolean tryRingingWithDialerUI(final AbstractJingleConnection.Id id, final Set<Media> media) { private synchronized boolean tryRingingWithDialerUI(final AbstractJingleConnection.Id id, final Set<Media> media) {
if (mXmppConnectionService.checkSelfPermission(Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) { if (mXmppConnectionService.checkSelfPermission(Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
// We cannot always request audio permission in Dialer UI // We cannot request audio permission in Dialer UI
// e.g. when Dialer is shown over keyguard // when Dialer is shown over keyguard, the user cannot even necessarily
// see notifications.
return false; return false;
} }