Update libsignal-service

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index a449c4ff1bf6f7c939dcde659e5dc42e40f5997c..a1465c188e175c4d7bd063b906df71449a5de810 100644 (file)
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1847,7 +1847,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions",
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions",

-  "fields":[{"name":"addBannedMembers_"}, {"name":"addMembers_"}, {"name":"addPendingMembers_"}, {"name":"addRequestingMembers_"}, {"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"modifyAddFromInviteLinkAccess_"}, {"name":"modifyAnnouncementsOnly_"}, {"name":"modifyAttributesAccess_"}, {"name":"modifyAvatar_"}, {"name":"modifyDescription_"}, {"name":"modifyDisappearingMessagesTimer_"}, {"name":"modifyInviteLinkPassword_"}, {"name":"modifyMemberAccess_"}, {"name":"modifyMemberProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"modifyTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}, {"name":"sourceUuid_"}]
+  "fields":[{"name":"addBannedMembers_"}, {"name":"addMembers_"}, {"name":"addPendingMembers_"}, {"name":"addRequestingMembers_"}, {"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"modifyAddFromInviteLinkAccess_"}, {"name":"modifyAnnouncementsOnly_"}, {"name":"modifyAttributesAccess_"}, {"name":"modifyAvatar_"}, {"name":"modifyDescription_"}, {"name":"modifyDisappearingMessagesTimer_"}, {"name":"modifyInviteLinkPassword_"}, {"name":"modifyMemberAccess_"}, {"name":"modifyMemberProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"modifyTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}, {"name":"sourceServiceId_"}, {"name":"sourceUuid_"}]

 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddBannedMemberAction",
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddBannedMemberAction",


@@ -1983,7 +1983,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupChange",
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupChange",

-  "fields":[{"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"editor_"}, {"name":"modifiedProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"newAttributeAccess_"}, {"name":"newAvatar_"}, {"name":"newBannedMembers_"}, {"name":"newDescription_"}, {"name":"newInviteLinkAccess_"}, {"name":"newInviteLinkPassword_"}, {"name":"newIsAnnouncementGroup_"}, {"name":"newMemberAccess_"}, {"name":"newMembers_"}, {"name":"newPendingMembers_"}, {"name":"newRequestingMembers_"}, {"name":"newTimer_"}, {"name":"newTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}]
+  "fields":[{"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"editorServiceIdBytes_"}, {"name":"editor_"}, {"name":"modifiedProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"newAttributeAccess_"}, {"name":"newAvatar_"}, {"name":"newBannedMembers_"}, {"name":"newDescription_"}, {"name":"newInviteLinkAccess_"}, {"name":"newInviteLinkPassword_"}, {"name":"newIsAnnouncementGroup_"}, {"name":"newMemberAccess_"}, {"name":"newMembers_"}, {"name":"newPendingMembers_"}, {"name":"newRequestingMembers_"}, {"name":"newTimer_"}, {"name":"newTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}]

 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo",
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo",

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java b/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
index 4016f487a6b13f00d75b1ec03622960049674e59..cbfa0bd52447b7e9fb3cf249797a84156c3d0581 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
@@ -22,7 +22,6 @@ public enum TrustLevel {
             case DEFAULT -> TRUSTED_UNVERIFIED;
             case UNVERIFIED -> UNTRUSTED;
             case VERIFIED -> TRUSTED_VERIFIED;
             case DEFAULT -> TRUSTED_UNVERIFIED;
             case UNVERIFIED -> UNTRUSTED;
             case VERIFIED -> TRUSTED_VERIFIED;

-            case UNRECOGNIZED -> null;

         };
     }
 
         };
     }
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index a8eb7f5007062481e7ea78b77741096d7d8f5b5e..e8f23cae8fd8e6544fdf53f4e46f65fe3abc74cd 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -19,7 +19,6 @@ import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;

-import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;

 import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
 
 import java.io.IOException;
 import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
 
 import java.io.IOException;


@@ -80,13 +79,13 @@ public class StorageHelper {
         logger.trace("Reading {} new records", manifest.get().getStorageIds().size());
         for (final var record : getSignalStorageRecords(storageIds)) {
             logger.debug("Reading record of type {}", record.getType());
         logger.trace("Reading {} new records", manifest.get().getStorageIds().size());
         for (final var record : getSignalStorageRecords(storageIds)) {
             logger.debug("Reading record of type {}", record.getType());

-            if (record.getType() == ManifestRecord.Identifier.Type.ACCOUNT_VALUE) {
+            if (record.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue()) {

                 readAccountRecord(record);
                 readAccountRecord(record);

-            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV2_VALUE) {
+            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV2.getValue()) {

                 readGroupV2Record(record);
                 readGroupV2Record(record);

-            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV1_VALUE) {
+            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV1.getValue()) {

                 readGroupV1Record(record);
                 readGroupV1Record(record);

-            } else if (record.getType() == ManifestRecord.Identifier.Type.CONTACT_VALUE) {
+            } else if (record.getType() == ManifestRecord.Identifier.Type.CONTACT.getValue()) {

                 readContactRecord(record);
             }
         }
                 readContactRecord(record);
             }
         }


@@ -256,14 +255,11 @@ public class StorageHelper {
         account.getConfigurationStore()
                 .setUnidentifiedDeliveryIndicators(accountRecord.isSealedSenderIndicatorsEnabled());
         account.getConfigurationStore().setLinkPreviews(accountRecord.isLinkPreviewsEnabled());
         account.getConfigurationStore()
                 .setUnidentifiedDeliveryIndicators(accountRecord.isSealedSenderIndicatorsEnabled());
         account.getConfigurationStore().setLinkPreviews(accountRecord.isLinkPreviewsEnabled());

-        if (accountRecord.getPhoneNumberSharingMode() != AccountRecord.PhoneNumberSharingMode.UNRECOGNIZED) {
-            account.getConfigurationStore()
-                    .setPhoneNumberSharingMode(switch (accountRecord.getPhoneNumberSharingMode()) {
-                        case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
-                        case NOBODY -> PhoneNumberSharingMode.NOBODY;
-                        default -> PhoneNumberSharingMode.CONTACTS;
-                    });
-        }
+        account.getConfigurationStore().setPhoneNumberSharingMode(switch (accountRecord.getPhoneNumberSharingMode()) {
+            case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
+            case NOBODY -> PhoneNumberSharingMode.NOBODY;
+            case CONTACTS_ONLY -> PhoneNumberSharingMode.CONTACTS;
+        });

         account.getConfigurationStore().setPhoneNumberUnlisted(accountRecord.isPhoneNumberUnlisted());
         account.setUsername(accountRecord.getUsername());
 
         account.getConfigurationStore().setPhoneNumberUnlisted(accountRecord.isPhoneNumberUnlisted());
         account.setUsername(accountRecord.getUsername());
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
index d47e327254aa9febe3b57cbf3f5ef812872da08c..5c4e81b89d92560dcca2729802b788078a3cb0ef 100644 (file)
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 

-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_79")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_80")

             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")