Update libsignal-service-java

diff --git a/README.md b/README.md
index 6ed024d0489b6390c000fb90b584f2f2660dd18e..dcfbad66cdb8308c2d5f292938ce39be4a8baf3d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -22,9 +22,9 @@ a [FreeBSD port](https://www.freshports.org/net-im/signal-cli) available as well
 System requirements:
 
 - at least Java Runtime Environment (JRE) 17
 System requirements:
 
 - at least Java Runtime Environment (JRE) 17

-- native libraries: libzkgroup, libsignal-client
+- native library: libsignal-client

 
 

-  Those are bundled for x86_64 Linux (with recent enough glibc, see #643), for other systems/architectures
+  The native lib is bundled for x86_64 Linux (with recent enough glibc, see #643), for other systems/architectures

   see: [Provide native lib for libsignal](https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal)
 
 ### Install system-wide on Linux
   see: [Provide native lib for libsignal](https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal)
 
 ### Install system-wide on Linux

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 7209e355185ffb713e230764a59cfb31575ab0c0..945107cad7b3c7c0ad34fcc92a70de2d5b71fe54 100644 (file)
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -32,7 +32,11 @@
 ,
 {
   "name":"java.util.UUID",
 ,
 {
   "name":"java.util.UUID",

-  "methods":[{"name":"<init>","parameterTypes":["long","long"] }]}
+  "methods":[
+    {"name":"<init>","parameterTypes":["long","long"] }, 
+    {"name":"getLeastSignificantBits","parameterTypes":[] }, 
+    {"name":"getMostSignificantBits","parameterTypes":[] }
+  ]}

 ,
 {
   "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"}
 ,
 {
   "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"}

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 9110699764f8be6b11a9ddd1efee9b4e8ee939a0..54fbfb2a4c0a745a5a586dc3b326ad506f1c9ce4 100644 (file)
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -31,6 +31,9 @@
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD\\E"
     }, 
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD\\E"
     }, 

+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE\\E"
+    }, 

     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM\\E"
     }, 
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM\\E"
     }, 


@@ -76,6 +79,9 @@
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT\\E"
     }, 
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT\\E"
     }, 

+    {
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
+    }, 

     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
     }, 
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
     }, 


@@ -104,13 +110,13 @@
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US\\E"
     }, 
     {
       "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US\\E"
     }, 
     {

-      "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
+      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK\\E"

     }, 
     {
     }, 
     {

-      "pattern":"\\Qlibsignal_jni.so\\E"
+      "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"

     }, 
     {
     }, 
     {

-      "pattern":"\\Qlibzkgroup.so\\E"
+      "pattern":"\\Qlibsignal_jni.so\\E"

     }, 
     {
       "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
     }, 
     {
       "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 54c23a0da0c5115b909cecd0e7e735c1f358de86..73a0e559f493164209ca7ea89f18cf13a936ff4a 100644 (file)
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
 }
 
 dependencies {

-    implementation("com.github.turasa:signal-service-java:2.15.3_unofficial_33")
+    implementation("com.github.turasa:signal-service-java:2.15.3_unofficial_34")

     api("com.fasterxml.jackson.core", "jackson-databind", "2.13.0")
     implementation("com.google.protobuf:protobuf-javalite:3.11.4")
     implementation("org.bouncycastle:bcprov-jdk15on:1.69")
     api("com.fasterxml.jackson.core", "jackson-databind", "2.13.0")
     implementation("com.google.protobuf:protobuf-javalite:3.11.4")
     implementation("org.bouncycastle:bcprov-jdk15on:1.69")

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 6ff29c55575d3bdc776810b6cffc66328046dffc..e84a5c1604b768082f43f8b2b29995fa5f2ec733 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -1,6 +1,5 @@
 package org.asamk.signal.manager.config;
 
 package org.asamk.signal.manager.config;
 

-import org.signal.zkgroup.internal.Native;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.AccountAttributes;


@@ -31,21 +30,7 @@ public class ServiceConfig {
     public static final AccountAttributes.Capabilities capabilities;
 
     static {
     public static final AccountAttributes.Capabilities capabilities;
 
     static {

-        boolean zkGroupAvailable;
-        try {
-            Native.serverPublicParamsCheckValidContentsJNI(new byte[]{});
-            zkGroupAvailable = true;
-        } catch (Throwable e) {
-            logger.warn("Failed to call libzkgroup: {}", e.getMessage());
-            zkGroupAvailable = false;
-        }
-        capabilities = new AccountAttributes.Capabilities(false,
-                zkGroupAvailable,
-                false,
-                zkGroupAvailable,
-                true,
-                true,
-                false);
+        capabilities = new AccountAttributes.Capabilities(false, true, false, true, true, true, false);

 
         try {
             TrustStore contactTrustStore = new IasTrustStore();
 
         try {
             TrustStore contactTrustStore = new IasTrustStore();


@@ -60,10 +45,6 @@ public class ServiceConfig {
         }
     }
 
         }
     }
 

-    public static boolean isZkgroupAvailable() {
-        return ServiceConfig.getCapabilities().isGv2();
-    }
-

     public static boolean isSignalClientAvailable() {
         try {
             org.signal.client.internal.Native.DeviceTransfer_GeneratePrivateKey();
     public static boolean isSignalClientAvailable() {
         try {
             org.signal.client.internal.Native.DeviceTransfer_GeneratePrivateKey();

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupAuthorizationProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupAuthorizationProvider.java
deleted file mode 100644 (file)
index d26ebb0..0000000
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupAuthorizationProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.asamk.signal.manager.helper;
-
-import org.signal.zkgroup.groups.GroupSecretParams;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString;
-
-import java.io.IOException;
-
-public interface GroupAuthorizationProvider {
-
-    GroupsV2AuthorizationString getAuthorizationForToday(GroupSecretParams groupSecretParams) throws IOException;
-}

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 57e8085d277c2aef48455a98fdfa435af1f9edbb..5314fe77ba3aa1c5e2a3fba04e60e89183dc5ad9 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -23,7 +23,6 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 import org.whispersystems.signalservice.api.services.ProfileService;

-import org.whispersystems.signalservice.internal.ServiceResponse;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;


@@ -306,22 +305,10 @@ public final class ProfileHelper {
             Optional<UnidentifiedAccess> unidentifiedAccess,
             SignalServiceProfile.RequestType requestType
     ) {
             Optional<UnidentifiedAccess> unidentifiedAccess,
             SignalServiceProfile.RequestType requestType
     ) {

-        var profileService = dependencies.getProfileService();
-
-        Single<ServiceResponse<ProfileAndCredential>> responseSingle;
+        final var profileService = dependencies.getProfileService();

         final var locale = Utils.getDefaultLocale();
         final var locale = Utils.getDefaultLocale();

-        try {
-            responseSingle = profileService.getProfile(address, profileKey, unidentifiedAccess, requestType, locale);
-        } catch (NoClassDefFoundError e) {
-            // Native zkgroup lib not available for ProfileKey
-            responseSingle = profileService.getProfile(address,
-                    Optional.absent(),
-                    unidentifiedAccess,
-                    requestType,
-                    locale);
-        }

 
 

-        return responseSingle.map(pair -> {
+        return profileService.getProfile(address, profileKey, unidentifiedAccess, requestType, locale).map(pair -> {

             var processor = new ProfileService.ProfileResponseProcessor(pair);
             if (processor.hasResult()) {
                 return processor.getResult();
             var processor = new ProfileService.ProfileResponseProcessor(pair);
             if (processor.hasResult()) {
                 return processor.getResult();

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index e97f28d91fd849a9d7475fa6762ab6086081e5fc..564e08d24bf6a68e89f5e1101d007b9e383dcd76 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -142,11 +142,6 @@ public class App {
             dataPath = getDefaultDataPath();
         }
 
             dataPath = getDefaultDataPath();
         }
 

-        if (!ServiceConfig.isZkgroupAvailable()) {
-            logger.warn("WARNING: Support for new group V2 is disabled,"
-                    + " because the required native library dependency is missing: libzkgroup");
-        }
-

         if (!ServiceConfig.isSignalClientAvailable()) {
             throw new UserErrorException("Missing required native library dependency: libsignal-client");
         }
         if (!ServiceConfig.isSignalClientAvailable()) {
             throw new UserErrorException("Missing required native library dependency: libsignal-client");
         }