Fix crash when receiving a PreKey message in a new session.

We don't allow creating recipients with only a UUID at the moment
(for good reason), but the way the decrypt method was written, it
was possible to do so. Until we have CDS, we should prefer the phone
number in scenarios like these.

libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java

@@ -293,7 +293,18 @@ private static SignalProtocolAddress getPreferredProtocolAddress(SignalProtocolS
     } else if (e164Address != null && store.containsSession(e164Address)) {
       return e164Address;
     } else {
-      return new SignalProtocolAddress(address.getIdentifier(), sourceDevice);
+      // TODO [greyson][uuid] We should switch to preferring the UUID once we allow UUID-only recipients
+      String preferred;
+
+      if (address.getNumber().isPresent()) {
+        preferred = address.getNumber().get();
+      } else if (address.getUuid().isPresent()) {
+        preferred = address.getUuid().get().toString();
+      } else {
+        throw new AssertionError("Given the constrains of creating a SignalServiceAddress, this should not be possible.");
+      }
+
+      return new SignalProtocolAddress(preferred, sourceDevice);
     }
   }
 

libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java

@@ -65,7 +65,7 @@ public String getIdentifier() {
     } else if (e164.isPresent()) {
       return e164.get();
     } else {
-      return null;
+      throw new AssertionError("Given the checks in the constructor, this should not be possible.");
     }
   }