ConnectionService: Dialer UI integration for incoming calls

src/cheogram/java/com/cheogram/android/ConnectionService.java

@@ -1,54 +1,48 @@
 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.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.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.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
 
-import com.google.common.collect.ImmutableSet;
-
-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.entities.Account;
 import eu.siacs.conversations.services.AppRTCAudioManager;
 import eu.siacs.conversations.services.AvatarService;
-import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder;
 import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder;
 import eu.siacs.conversations.ui.RtpSessionActivity;
 import eu.siacs.conversations.utils.PhoneNumberUtilWrapper;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.jingle.JingleRtpConnection;
 import eu.siacs.conversations.xmpp.jingle.Media;
 import eu.siacs.conversations.xmpp.jingle.RtpEndUserState;
+import io.michaelrocks.libphonenumber.android.NumberParseException;
 
 public class ConnectionService extends android.telecom.ConnectionService {
     public XmppConnectionService xmppConnectionService = null;
@@ -64,9 +58,17 @@ public class ConnectionService extends android.telecom.ConnectionService {
             xmppConnectionService = null;
         }
     };
+    private PermissionManager mPermissionManager;
 
     @Override
     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
         Intent intent = new Intent(this, XmppConnectionService.class);
         intent.setAction("ui");
@@ -112,16 +114,9 @@ public class ConnectionService extends android.telecom.ConnectionService {
         Jid with = Jid.ofLocalAndDomain(tel, gateway[1]);
         CheogramConnection connection = new CheogramConnection(account, with, postDial);
 
-		PermissionManager permissionManager = PermissionManager.getInstance(this);
+        Set<String> permissions = new HashSet<>();
-		permissionManager.setNotificationSettings(
-			new NotificationSettings.Builder()
-				.withMessage(R.string.microphone_permission_for_call)
-				.withSmallIcon(R.drawable.ic_notification).build()
-		);
-
-		Set<String> permissions = new HashSet();
         permissions.add(Manifest.permission.RECORD_AUDIO);
-		permissionManager.checkPermissions(permissions, new PermissionManager.PermissionRequestListener() {
+        mPermissionManager.checkPermissions(permissions, new PermissionManager.PermissionRequestListener() {
             @Override
             public void onPermissionGranted() {
                 connection.setSessionId(xmppConnectionService.getJingleConnectionManager().proposeJingleRtpSession(
@@ -150,11 +145,34 @@ public class ConnectionService extends android.telecom.ConnectionService {
         return connection;
     }
 
+    @Override
+    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));
+        Jid with = Jid.of(withJid);
+
+        CheogramConnection connection = new CheogramConnection(account, with, null);
+        connection.setSessionId(sessionId);
+        connection.setAddress(
+                Uri.fromParts("tel", with.getLocal(), null),
+                TelecomManager.PRESENTATION_ALLOWED
+        );
+        connection.setRinging();
+
+        xmppConnectionService.setOnRtpConnectionUpdateListener(connection);
+
+        return connection;
+    }
+
     public class CheogramConnection extends Connection implements XmppConnectionService.OnJingleRtpConnectionUpdate {
         protected Account account;
         protected Jid with;
         protected String sessionId = null;
-		protected Stack<String> postDial = new Stack();
+        protected Stack<String> postDial = new Stack<>();
         protected Icon gatewayIcon;
         protected WeakReference<JingleRtpConnection> rtpConnection = null;
 
@@ -203,6 +221,8 @@ public class ConnectionService extends android.telecom.ConnectionService {
                 setInitialized();
             } else if (state == RtpEndUserState.RINGING) {
                 setDialing();
+            } else if (state == RtpEndUserState.INCOMING_CALL) {
+                setRinging();
             } else if (state == RtpEndUserState.CONNECTED) {
                 xmppConnectionService.setDiallerIntegrationActive(true);
                 setActive();
@@ -235,6 +255,34 @@ public class ConnectionService extends android.telecom.ConnectionService {
             }
         }
 
+        @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);
+
+            // Request recording permission only when answering
+            Set<String> permissions = new HashSet<>();
+            permissions.add(Manifest.permission.RECORD_AUDIO);
+            mPermissionManager.checkPermissions(permissions, new PermissionManager.PermissionRequestListener() {
+                @Override
+                public void onPermissionGranted() {
+                    if (rtpConnection == null || rtpConnection.get() == null) {
+                        setDisconnected(new DisconnectCause(DisconnectCause.ERROR));
+                    } else {
+                        rtpConnection.get().acceptCall();
+                    }
+                }
+
+                @Override
+                public void onPermissionDenied(DeniedPermissions deniedPermissions) {
+                    setDisconnected(new DisconnectCause(DisconnectCause.ERROR));
+                }
+            });
+        }
+
         @Override
         public void onDisconnect() {
             if (rtpConnection == null || rtpConnection.get() == null) {

src/main/java/eu/siacs/conversations/entities/Contact.java

@@ -599,7 +599,7 @@ public class Contact implements ListItem, Blockable {
             "/" + getJid().asBareJid().toString();
     }
 
-    protected PhoneAccountHandle phoneAccountHandle() {
+    public PhoneAccountHandle phoneAccountHandle() {
         ComponentName componentName = new ComponentName(
             "com.cheogram.android",
             "com.cheogram.android.ConnectionService"

src/main/java/eu/siacs/conversations/services/NotificationService.java

@@ -16,9 +16,12 @@ import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.SystemClock;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
 import android.text.SpannableString;
 import android.text.style.StyleSpan;
 import android.util.DisplayMetrics;
@@ -423,7 +426,52 @@ public class NotificationService {
         notify(DELIVERY_FAILED_NOTIFICATION_ID, summaryNotification);
     }
 
+    private synchronized boolean tryRingingWithDialerUI(final AbstractJingleConnection.Id id, final Set<Media> media) {
+        if (media.size() != 1 || !media.contains(Media.AUDIO)) {
+            // Currently our ConnectionService only handles single audio calls
+            Log.w(Config.LOGTAG, "only audio calls can be handled by cheogram connection service");
+            return false;
+        }
+
+        PhoneAccountHandle handle = null;
+        for (Contact contact : id.account.getRoster().getContacts()) {
+            if (!contact.getJid().getDomain().equals(id.with.getDomain()))
+                continue;
+            if (!contact.getPresences().anyIdentity("gateway", "pstn"))
+                continue;
+            handle = contact.phoneAccountHandle();
+            break;
+        }
+
+        if (handle == null) {
+            Log.w(Config.LOGTAG, "Could not find phone account handle for " + id.account.getJid().toString());
+            return false;
+        }
+
+        Bundle callInfo = new Bundle();
+        callInfo.putString("account", id.account.getJid().toString());
+        callInfo.putString("with", id.with.toString());
+        callInfo.putString("sessionId", id.sessionId);
+
+        TelecomManager telecomManager = mXmppConnectionService.getSystemService(TelecomManager.class);
+
+        try {
+            telecomManager.addNewIncomingCall(handle, callInfo);
+        } catch (SecurityException e) {
+            // There *could* be race conditions where the account is not registered yet
+            // when an incoming call is already received
+            Log.w(Config.LOGTAG, e);
+            return false;
+        }
+
+        return true;
+    }
+
     public synchronized void startRinging(final AbstractJingleConnection.Id id, final Set<Media> media) {
+        if (tryRingingWithDialerUI(id, media)) {
+            return;
+        }
+
         showIncomingCallNotification(id, media);
         final NotificationManager notificationManager = (NotificationManager) mXmppConnectionService.getSystemService(Context.NOTIFICATION_SERVICE);
         final int currentInterruptionFilter;