Implement editing of previous messages

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

diff --git a/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java b/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
index 1f9d10ff897248f61c08d8f5c1023fef27544ff2..356cb47d56c0253b23f1d65f011e97c4d760dc47 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
@@ -1,71 +1,55 @@
 package org.asamk.signal.manager;
 
-import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.libsignal.ecc.Curve;
-import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.util.Utils;
+import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.protocol.ecc.Curve;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
 
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
-public class DeviceLinkInfo {
+public record DeviceLinkInfo(String deviceIdentifier, ECPublicKey deviceKey) {
 
-    final String deviceIdentifier;
-    final ECPublicKey deviceKey;
-
-    public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws InvalidKeyException {
+    public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws InvalidDeviceLinkException {
         final var rawQuery = linkUri.getRawQuery();
         if (isEmpty(rawQuery)) {
             throw new RuntimeException("Invalid device link uri");
         }
 
-        var query = getQueryMap(rawQuery);
+        var query = Utils.getQueryMap(rawQuery);
         var deviceIdentifier = query.get("uuid");
         var publicKeyEncoded = query.get("pub_key");
 
         if (isEmpty(deviceIdentifier) || isEmpty(publicKeyEncoded)) {
-            throw new RuntimeException("Invalid device link uri");
+            throw new InvalidDeviceLinkException("Invalid device link uri");
         }
 
         final byte[] publicKeyBytes;
         try {
             publicKeyBytes = Base64.getDecoder().decode(publicKeyEncoded);
         } catch (IllegalArgumentException e) {
-            throw new RuntimeException("Invalid device link uri", e);
+            throw new InvalidDeviceLinkException("Invalid device link uri", e);
         }
-        var deviceKey = Curve.decodePoint(publicKeyBytes, 0);
-
-        return new DeviceLinkInfo(deviceIdentifier, deviceKey);
-    }
-
-    private static Map<String, String> getQueryMap(String query) {
-        var params = query.split("&");
-        var map = new HashMap<String, String>();
-        for (var param : params) {
-            final var paramParts = param.split("=");
-            var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
-            var value = URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
-            map.put(name, value);
+        ECPublicKey deviceKey;
+        try {
+            deviceKey = Curve.decodePoint(publicKeyBytes, 0);
+        } catch (InvalidKeyException e) {
+            throw new InvalidDeviceLinkException("Invalid device link", e);
         }
-        return map;
-    }
 
-    public DeviceLinkInfo(final String deviceIdentifier, final ECPublicKey deviceKey) {
-        this.deviceIdentifier = deviceIdentifier;
-        this.deviceKey = deviceKey;
+        return new DeviceLinkInfo(deviceIdentifier, deviceKey);
     }
 
     public URI createDeviceLinkUri() {
         final var deviceKeyString = Base64.getEncoder().encodeToString(deviceKey.serialize()).replace("=", "");
         try {
-            return new URI("tsdevice:/?uuid="
+            return new URI("sgnl://linkdevice?uuid="
                     + URLEncoder.encode(deviceIdentifier, StandardCharsets.UTF_8)
                     + "&pub_key="
                     + URLEncoder.encode(deviceKeyString, StandardCharsets.UTF_8));