Update libsignal-service-java

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

diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
index dd9dd2d265434ff639ed53b55196f1ee0c2de2ae..3425d95ebf568d7a675d1b9c707fe38c083cf9f5 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
@@ -2,10 +2,10 @@ package org.asamk.signal.manager.groups;
 
 import com.google.protobuf.ByteString;
 
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.storageservice.protos.groups.GroupInviteLink;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.groups.GroupMasterKey;
 import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;
@@ -26,10 +26,6 @@ public final class GroupInviteLinkUrl {
                 GroupLinkPassword.fromBytes(group.getInviteLinkPassword().toByteArray()));
     }
 
-    public static boolean isGroupLink(String urlString) {
-        return getGroupUrl(urlString) != null;
-    }
-
     /**
      * @return null iff not a group url.
      * @throws InvalidGroupLinkException If group url, but cannot be parsed.
@@ -56,7 +52,7 @@ public final class GroupInviteLinkUrl {
             var groupInviteLink = GroupInviteLink.parseFrom(bytes);
 
             switch (groupInviteLink.getContentsCase()) {
-                case V1CONTENTS: {
+                case V1CONTENTS -> {
                     var groupInviteLinkContentsV1 = groupInviteLink.getV1Contents();
                     var groupMasterKey = new GroupMasterKey(groupInviteLinkContentsV1.getGroupMasterKey()
                             .toByteArray());
@@ -65,8 +61,7 @@ public final class GroupInviteLinkUrl {
 
                     return new GroupInviteLinkUrl(groupMasterKey, password);
                 }
-                default:
-                    throw new UnknownGroupLinkVersionException("Url contains no known group link content");
+                default -> throw new UnknownGroupLinkVersionException("Url contains no known group link content");
             }
         } catch (InvalidInputException | IOException e) {
             throw new InvalidGroupLinkException(e);
@@ -96,7 +91,7 @@ public final class GroupInviteLinkUrl {
         this.url = createUrl(groupMasterKey, password);
     }
 
-    protected static String createUrl(GroupMasterKey groupMasterKey, GroupLinkPassword password) {
+    private static String createUrl(GroupMasterKey groupMasterKey, GroupLinkPassword password) {
         var groupInviteLink = GroupInviteLink.newBuilder()
                 .setV1Contents(GroupInviteLink.GroupInviteLinkContentsV1.newBuilder()
                         .setGroupMasterKey(ByteString.copyFrom(groupMasterKey.serialize()))