RingRTC: Update to v2.6.0

Co-authored-by: Peter Thatcher <peter@signal.org>

app/build.gradle

@@ -310,7 +310,7 @@ dependencies {
 
     implementation 'org.signal:argon2:13.1@aar'
 
-    implementation 'org.signal:ringrtc-android:2.5.1'
+    implementation 'org.signal:ringrtc-android:2.6.0'
 
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'

app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java

@@ -504,11 +504,14 @@ public final class PushProcessMessageJob extends BaseJob {
       database.markAsMissedCall(smsMessageId.get());
     } else {
       Intent     intent            = new Intent(context, WebRtcCallService.class);
-      RemotePeer remotePeer = new RemotePeer(Recipient.externalHighTrustPush(context, content.getSender()).getId());
+      Recipient  recipient         = Recipient.externalHighTrustPush(context, content.getSender());
+      RemotePeer remotePeer        = new RemotePeer(recipient.getId());
+      byte[]     remoteIdentityKey = recipient.getIdentityKey();
 
       intent.setAction(WebRtcCallService.ACTION_RECEIVE_OFFER)
             .putExtra(WebRtcCallService.EXTRA_CALL_ID,                    message.getId())
             .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER,                remotePeer)
+            .putExtra(WebRtcCallService.EXTRA_REMOTE_IDENTITY_KEY,        remoteIdentityKey)
             .putExtra(WebRtcCallService.EXTRA_REMOTE_DEVICE,              content.getSenderDevice())
             .putExtra(WebRtcCallService.EXTRA_OFFER_OPAQUE,               message.getOpaque())
             .putExtra(WebRtcCallService.EXTRA_OFFER_SDP,                  message.getSdp())
@@ -527,11 +530,14 @@ public final class PushProcessMessageJob extends BaseJob {
   {
     Log.i(TAG, "handleCallAnswerMessage...");
     Intent     intent            = new Intent(context, WebRtcCallService.class);
-    RemotePeer remotePeer = new RemotePeer(Recipient.externalHighTrustPush(context, content.getSender()).getId());
+    Recipient  recipient         = Recipient.externalHighTrustPush(context, content.getSender());
+    RemotePeer remotePeer        = new RemotePeer(recipient.getId());
+    byte[]     remoteIdentityKey = recipient.getIdentityKey();
 
     intent.setAction(WebRtcCallService.ACTION_RECEIVE_ANSWER)
           .putExtra(WebRtcCallService.EXTRA_CALL_ID,             message.getId())
           .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER,         remotePeer)
+          .putExtra(WebRtcCallService.EXTRA_REMOTE_IDENTITY_KEY, remoteIdentityKey)
           .putExtra(WebRtcCallService.EXTRA_REMOTE_DEVICE,       content.getSenderDevice())
           .putExtra(WebRtcCallService.EXTRA_ANSWER_OPAQUE,       message.getOpaque())
           .putExtra(WebRtcCallService.EXTRA_ANSWER_SDP,          message.getSdp())

app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java

@@ -27,6 +27,7 @@ import org.signal.ringrtc.Remote;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.WebRtcCallActivity;
 import org.thoughtcrime.securesms.components.webrtc.BroadcastVideoSink;
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState;
@@ -58,7 +59,11 @@ import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
 import org.thoughtcrime.securesms.webrtc.locks.LockManager;
 import org.webrtc.EglBase;
 import org.webrtc.PeerConnection;
+import org.whispersystems.libsignal.ecc.ECPublicKey;
 import org.whispersystems.libsignal.util.Pair;
+import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.ecc.Curve;
+import org.whispersystems.libsignal.ecc.DjbECPublicKey;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
@@ -107,6 +112,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
   public static final String EXTRA_REMOTE_PEER                = "remote_peer";
   public static final String EXTRA_REMOTE_PEER_KEY            = "remote_peer_key";
   public static final String EXTRA_REMOTE_DEVICE              = "remote_device";
+  public static final String EXTRA_REMOTE_IDENTITY_KEY        = "remote_identity_key";
   public static final String EXTRA_OFFER_OPAQUE               = "offer_opaque";
   public static final String EXTRA_OFFER_SDP                  = "offer_sdp";
   public static final String EXTRA_OFFER_TYPE                 = "offer_type";
@@ -161,8 +167,8 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
   public static final String ACTION_ENDED_INTERNAL_FAILURE              = "ENDED_INTERNAL_FAILURE";
   public static final String ACTION_ENDED_SIGNALING_FAILURE             = "ENDED_SIGNALING_FAILURE";
   public static final String ACTION_ENDED_CONNECTION_FAILURE            = "ENDED_CONNECTION_FAILURE";
-  public static final String ACTION_ENDED_RX_OFFER_EXPIRED              = "ENDED_RX_OFFER_EXPIRED";
+  public static final String ACTION_RECEIVED_OFFER_EXPIRED              = "RECEIVED_OFFER_EXPIRED";
-  public static final String ACTION_ENDED_RX_OFFER_WHILE_ACTIVE         = "ENDED_RX_OFFER_WHILE_ACTIVE";
+  public static final String ACTION_RECEIVED_OFFER_WHILE_ACTIVE         = "RECEIVED_OFFER_WHILE_ACTIVE";
   public static final String ACTION_CALL_CONCLUDED                      = "CALL_CONCLUDED";
 
   public static final int BUSY_TONE_LENGTH = 2000;
@@ -263,8 +269,8 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
       else if (intent.getAction().equals(ACTION_ENDED_INTERNAL_FAILURE))              handleEndedInternalFailure(intent);
       else if (intent.getAction().equals(ACTION_ENDED_SIGNALING_FAILURE))             handleEndedSignalingFailure(intent);
       else if (intent.getAction().equals(ACTION_ENDED_CONNECTION_FAILURE))            handleEndedConnectionFailure(intent);
-      else if (intent.getAction().equals(ACTION_ENDED_RX_OFFER_EXPIRED))              handleEndedReceivedOfferExpired(intent);
+      else if (intent.getAction().equals(ACTION_RECEIVED_OFFER_EXPIRED))              handleReceivedOfferExpired(intent);
-      else if (intent.getAction().equals(ACTION_ENDED_RX_OFFER_WHILE_ACTIVE))         handleEndedReceivedOfferWhileActive(intent);
+      else if (intent.getAction().equals(ACTION_RECEIVED_OFFER_WHILE_ACTIVE))         handleReceivedOfferWhileActive(intent);
       else if (intent.getAction().equals(ACTION_CALL_CONCLUDED))                      handleCallConcluded(intent);
     });
 
@@ -391,6 +397,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
   private void handleReceivedOffer(Intent intent) {
     CallId            callId                      = getCallId(intent);
     RemotePeer        remotePeer                  = getRemotePeer(intent);
+    byte[]            remoteIdentityKey           = intent.getByteArrayExtra(EXTRA_REMOTE_IDENTITY_KEY);
     Integer           remoteDevice                = intent.getIntExtra(EXTRA_REMOTE_DEVICE, -1);
     byte[]            opaque                      = intent.getByteArrayExtra(EXTRA_OFFER_OPAQUE);
     String            sdp                         = intent.getStringExtra(EXTRA_OFFER_SDP);
@@ -429,8 +436,12 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
     Log.i(TAG, "messageAgeSec: " + messageAgeSec + ", serverReceivedTimestamp: " + serverReceivedTimestamp + ", serverDeliveredTimestamp: " + serverDeliveredTimestamp);
 
     try {
-      callManager.receivedOffer(callId, remotePeer, remoteDevice, opaque, sdp, messageAgeSec, callType, 1, isMultiRing, true);
+      remoteIdentityKey = getPublicKeyBytes(remoteIdentityKey);
-    } catch  (CallException e) {
+
+      byte[] localIdentityKey = getPublicKeyBytes(IdentityKeyUtil.getIdentityKey(this).serialize());
+
+      callManager.receivedOffer(callId, remotePeer, remoteDevice, opaque, sdp, messageAgeSec, callType, 1, isMultiRing, true, remoteIdentityKey, localIdentityKey);
+    } catch  (CallException | InvalidKeyException e) {
       callFailure("Unable to process received offer: ", e);
     }
   }
@@ -824,6 +835,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
 
   private void handleReceivedAnswer(Intent intent) {
     CallId  callId            = getCallId(intent);
+    byte[]  remoteIdentityKey = intent.getByteArrayExtra(EXTRA_REMOTE_IDENTITY_KEY);
     Integer remoteDevice      = intent.getIntExtra(EXTRA_REMOTE_DEVICE, -1);
     byte[]  opaque            = intent.getByteArrayExtra(EXTRA_ANSWER_OPAQUE);
     String  sdp               = intent.getStringExtra(EXTRA_ANSWER_SDP);
@@ -832,8 +844,12 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
     Log.i(TAG, "handleReceivedAnswer(): id: " + callId.format(remoteDevice));
 
     try {
-      callManager.receivedAnswer(callId, remoteDevice, opaque, sdp, isMultiRing);
+      remoteIdentityKey = getPublicKeyBytes(remoteIdentityKey);
-    } catch  (CallException e) {
+
+      byte[] localIdentityKey = getPublicKeyBytes(IdentityKeyUtil.getIdentityKey(this).serialize());
+
+      callManager.receivedAnswer(callId, remoteDevice, opaque, sdp, isMultiRing, remoteIdentityKey, localIdentityKey);
+    } catch  (CallException | InvalidKeyException e) {
       callFailure("receivedAnswer() failed: ", e);
     }
   }
@@ -1070,25 +1086,25 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
     }
   }
 
-  private void handleEndedReceivedOfferExpired(Intent intent) {
+  private void handleReceivedOfferExpired(Intent intent) {
     RemotePeer remotePeer = getRemotePeerFromMap(intent);
 
-    Log.i(TAG, "handleEndedReceivedOfferExpired(): call_id: " + remotePeer.getCallId());
+    Log.i(TAG, "handleReceivedOfferExpired(): call_id: " + remotePeer.getCallId());
 
     insertMissedCall(remotePeer, true);
 
     terminate(remotePeer);
   }
 
-  private void handleEndedReceivedOfferWhileActive(Intent intent) {
+  private void handleReceivedOfferWhileActive(Intent intent) {
     RemotePeer remotePeer = getRemotePeerFromMap(intent);
 
     if (activePeer == null) {
-      Log.w(TAG, "handleEndedReceivedOfferWhileActive(): Ignoring for inactive call.");
+      Log.w(TAG, "handleReceivedOfferWhileActive(): Ignoring for inactive call.");
       return;
     }
 
-    Log.i(TAG, "handleEndedReceivedOfferWhileActive(): call_id: " + remotePeer.getCallId());
+    Log.i(TAG, "handleReceivedOfferWhileActive(): call_id: " + remotePeer.getCallId());
 
     switch (activePeer.getState()) {
       case DIALING:
@@ -1272,6 +1288,15 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
     return activePeer == null;
   }
 
+  private static byte[] getPublicKeyBytes(byte[] identityKey) throws InvalidKeyException {
+    ECPublicKey key = Curve.decodePoint(identityKey, 0);
+
+    if (key instanceof DjbECPublicKey) {
+      return ((DjbECPublicKey) key).getPublicKey();
+    }
+    throw new InvalidKeyException();
+  }
+
   private void initializeVideo() {
     Util.runOnMainSync(() -> {
       eglBase          = EglBase.create();
@@ -1589,7 +1614,6 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
   }
 
   private abstract class StateAwareListener<V> implements FutureTaskListener<V> {
-
     private final CallState expectedState;
     private final CallId    expectedCallId;
 
@@ -1830,15 +1854,16 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
         case ENDED_CONNECTION_FAILURE:
           intent.setAction(ACTION_ENDED_CONNECTION_FAILURE);
           break;
-        case ENDED_RECEIVED_OFFER_EXPIRED:
+        case RECEIVED_OFFER_EXPIRED:
-          intent.setAction(ACTION_ENDED_RX_OFFER_EXPIRED);
+          intent.setAction(ACTION_RECEIVED_OFFER_EXPIRED);
           break;
-        case ENDED_RECEIVED_OFFER_WHILE_ACTIVE:
+        case RECEIVED_OFFER_WHILE_ACTIVE:
-          intent.setAction(ACTION_ENDED_RX_OFFER_WHILE_ACTIVE);
+        case RECEIVED_OFFER_WITH_GLARE:
+          intent.setAction(ACTION_RECEIVED_OFFER_WHILE_ACTIVE);
           break;
         case ENDED_LOCAL_HANGUP:
         case ENDED_APP_DROPPED_CALL:
-        case ENDED_IGNORE_CALLS_FROM_NON_MULTIRING_CALLERS:
+        case IGNORE_CALLS_FROM_NON_MULTIRING_CALLERS:
           Log.i(TAG, "Ignoring event: " + event);
           return;
         default:

app/witness-verifications.gradle

@@ -432,8 +432,8 @@ dependencyVerification {
         ['org.signal:argon2:13.1',
          '0f686ccff0d4842bfcc74d92e8dc780a5f159b9376e37a1189fabbcdac458bef'],
 
-        ['org.signal:ringrtc-android:2.5.1',
+        ['org.signal:ringrtc-android:2.6.0',
-         'bbb357f7a6286c3fc641e84394e2903db72a0cbeb10393afed4e689c587ecdf9'],
+         '94245b1dc2c7d0068d82c10ac836786c73968918284b13fdef17fb5f97c0348c'],
 
         ['org.signal:signal-metadata-java:0.1.2',
          '6aaeb6a33bf3161a3e6ac9db7678277f7a4cf5a2c96b84342e4007ee49bab1bd'],