Refactor contact and profile store

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / util / ProfileUtils.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 63820b517271f25160daab15d2d1ea59e7afb44a..244f34f6bfe815c489fe9b3b3377149cc46392c3 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -1,16 +1,19 @@
 package org.asamk.signal.manager.util;
 
-import org.asamk.signal.manager.storage.profiles.SignalProfile;
+import org.asamk.signal.manager.storage.recipients.Profile;
 import org.signal.zkgroup.profiles.ProfileKey;
+import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 
 import java.util.Base64;
+import java.util.Date;
+import java.util.HashSet;
 
 public class ProfileUtils {
 
-    public static SignalProfile decryptProfile(
+    public static Profile decryptProfile(
             final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
     ) {
         var profileCipher = new ProfileCipher(profileKey);
@@ -28,13 +31,28 @@ public class ProfileUtils {
             } catch (IllegalArgumentException e) {
                 unidentifiedAccess = null;
             }
-            return new SignalProfile(encryptedProfile.getIdentityKey(),
-                    name,
+            final var nameParts = splitName(name);
+            final var capabilities = new HashSet<Profile.Capability>();
+            if (encryptedProfile.getCapabilities().isGv1Migration()) {
+                capabilities.add(Profile.Capability.gv1Migration);
+            }
+            if (encryptedProfile.getCapabilities().isGv2()) {
+                capabilities.add(Profile.Capability.gv2);
+            }
+            if (encryptedProfile.getCapabilities().isStorage()) {
+                capabilities.add(Profile.Capability.storage);
+            }
+            return new Profile(new Date().getTime(),
+                    nameParts.first(),
+                    nameParts.second(),
                     about,
                     aboutEmoji,
-                    unidentifiedAccess,
-                    encryptedProfile.isUnrestrictedUnidentifiedAccess(),
-                    encryptedProfile.getCapabilities());
+                    encryptedProfile.isUnrestrictedUnidentifiedAccess()
+                            ? Profile.UnidentifiedAccessMode.UNRESTRICTED
+                            : unidentifiedAccess != null
+                                    ? Profile.UnidentifiedAccessMode.ENABLED
+                                    : Profile.UnidentifiedAccessMode.DISABLED,
+                    capabilities);
         } catch (InvalidCiphertextException e) {
             return null;
         }
@@ -51,4 +69,17 @@ public class ProfileUtils {
             return null;
         }
     }
+
+    private static Pair<String, String> splitName(String name) {
+        String[] parts = name.split("\0");
+
+        switch (parts.length) {
+            case 0:
+                return new Pair<>(null, null);
+            case 1:
+                return new Pair<>(parts[0], null);
+            default:
+                return new Pair<>(parts[0], parts[1]);
+        }
+    }
 }