Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopt libsignal 0.51.1

Browse Source
This commit is contained in:
moiseev-signal
2024-06-24 11:37:59 -07:00
committed by Greyson Parrelli
parent c37ed722dc
commit 816e3442a0
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@@ -203,6 +203,7 @@ android {
buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\"") buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\"")
buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\"") buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\"")
buildConfigField("org.signal.libsignal.net.Network.Environment", "LIBSIGNAL_NET_ENV", "org.signal.libsignal.net.Network.Environment.PRODUCTION") buildConfigField("org.signal.libsignal.net.Network.Environment", "LIBSIGNAL_NET_ENV", "org.signal.libsignal.net.Network.Environment.PRODUCTION")
buildConfigField("int", "LIBSIGNAL_LOG_LEVEL", "org.signal.libsignal.protocol.logging.SignalProtocolLogger.INFO")
buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"unset\"") buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"unset\"")
buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"unset\"") buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"unset\"")
@@ -381,6 +382,7 @@ android {
buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\"") buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\"")
buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\"") buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\"")
buildConfigField("org.signal.libsignal.net.Network.Environment", "LIBSIGNAL_NET_ENV", "org.signal.libsignal.net.Network.Environment.STAGING") buildConfigField("org.signal.libsignal.net.Network.Environment", "LIBSIGNAL_NET_ENV", "org.signal.libsignal.net.Network.Environment.STAGING")
buildConfigField("int", "LIBSIGNAL_LOG_LEVEL", "org.signal.libsignal.protocol.logging.SignalProtocolLogger.DEBUG")
buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\"") buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\"")
buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\"") buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\"")

1
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View File

@@ -317,6 +317,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
Log.initialize(RemoteConfig::internalUser, new AndroidLogger(), new PersistentLogger(this)); Log.initialize(RemoteConfig::internalUser, new AndroidLogger(), new PersistentLogger(this));
SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger()); SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
SignalProtocolLoggerProvider.initializeLogging(BuildConfig.LIBSIGNAL_LOG_LEVEL);
SignalExecutors.UNBOUNDED.execute(() -> { SignalExecutors.UNBOUNDED.execute(() -> {
Log.blockUntilAllWritesFinished(); Log.blockUntilAllWritesFinished();

2
app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt
View File

@@ -20,6 +20,7 @@ import org.robolectric.annotation.Config
import org.signal.core.util.Hex import org.signal.core.util.Hex
import org.signal.core.util.ThreadUtil import org.signal.core.util.ThreadUtil
import org.signal.core.util.logging.Log import org.signal.core.util.logging.Log
import org.signal.libsignal.protocol.logging.SignalProtocolLogger
import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider
import org.signal.libsignal.zkgroup.groups.GroupMasterKey import org.signal.libsignal.zkgroup.groups.GroupMasterKey
import org.signal.libsignal.zkgroup.groups.GroupSecretParams import org.signal.libsignal.zkgroup.groups.GroupSecretParams
@@ -80,6 +81,7 @@ class GroupManagerV2Test_edit {
ThreadUtil.enforceAssertions = false ThreadUtil.enforceAssertions = false
Log.initialize(SystemOutLogger()) Log.initialize(SystemOutLogger())
SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger()) SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())
SignalProtocolLoggerProvider.initializeLogging(SignalProtocolLogger.INFO)
val clientZkOperations = ClientZkOperations(server.getServerPublicParams()) val clientZkOperations = ClientZkOperations(server.getServerPublicParams())

2
dependencies.gradle.kts
View File

@@ -15,7 +15,7 @@ dependencyResolutionManagement {
version("exoplayer", "2.19.0") version("exoplayer", "2.19.0")
version("glide", "4.15.1") version("glide", "4.15.1")
version("kotlin", "1.9.20") version("kotlin", "1.9.20")
version("libsignal-client", "0.47.0") version("libsignal-client", "0.51.1")
version("mp4parser", "1.9.39") version("mp4parser", "1.9.39")
version("android-gradle-plugin", "8.4.0") version("android-gradle-plugin", "8.4.0")
version("accompanist", "0.28.0") version("accompanist", "0.28.0")

20
gradle/verification-metadata.xml
View File

@@ -8288,20 +8288,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="6eb4422e8a618b3b76cb2096a3619d251f9e27989dc68307a1e5414c3710f2d1" origin="Generated by Gradle"/> <sha256 value="6eb4422e8a618b3b76cb2096a3619d251f9e27989dc68307a1e5414c3710f2d1" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.signal" name="libsignal-android" version="0.47.0"> <component group="org.signal" name="libsignal-android" version="0.51.1">
<artifact name="libsignal-android-0.47.0.aar"> <artifact name="libsignal-android-0.51.1.aar">
<sha256 value="022a291a87ebdf2e229052e7ed22beb4505daea7b26aea4ab5bc15f34470cbe4" origin="Generated by Gradle"/> <sha256 value="d12f4e794512eef25f7f084001877bf0c0725e1bb7e6bfff18b569c077d6c00d" origin="Generated by Gradle"/>
</artifact> </artifact>
<artifact name="libsignal-android-0.47.0.module"> <artifact name="libsignal-android-0.51.1.module">
<sha256 value="3ac003c987b1187bdb3a455dea579e1aaf0f9a6d543152c5980f74d9e94f1401" origin="Generated by Gradle"/> <sha256 value="c08b6e08e48e7673bc4f2089046fa3ef3e2f011c786b6432946957415231640c" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.signal" name="libsignal-client" version="0.47.0"> <component group="org.signal" name="libsignal-client" version="0.51.1">
<artifact name="libsignal-client-0.47.0.jar"> <artifact name="libsignal-client-0.51.1.jar">
<sha256 value="5ba566a1eed8d887cce3f5810318295d1465b998bb12a4b4393935686771def3" origin="Generated by Gradle"/> <sha256 value="b8b770cb98817300c7e5cb84754c7ada32c87c55d93331f2405abd9a74af6d95" origin="Generated by Gradle"/>
</artifact> </artifact>
<artifact name="libsignal-client-0.47.0.module"> <artifact name="libsignal-client-0.51.1.module">
<sha256 value="1d830ac16d4c2e7e7fc7cfb33ecf1a0f35d33f55e901ef41fb8bddf92fc9729f" origin="Generated by Gradle"/> <sha256 value="bd3e9d19550ed53f7988a16d9e23bba26c985c673a2cad1ab653b6d8a2aae8b2" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.signal" name="ringrtc-android" version="2.44.0"> <component group="org.signal" name="ringrtc-android" version="2.44.0">

4
libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java
View File

@@ -3,6 +3,7 @@ package org.whispersystems.signalservice.api.services;
import org.signal.cdsi.proto.ClientRequest; import org.signal.cdsi.proto.ClientRequest;
import org.signal.cdsi.proto.ClientResponse; import org.signal.cdsi.proto.ClientResponse;
import org.signal.libsignal.attest.AttestationDataException; import org.signal.libsignal.attest.AttestationDataException;
import org.signal.libsignal.attest.AttestationFailedException;
import org.signal.libsignal.cds2.Cds2Client; import org.signal.libsignal.cds2.Cds2Client;
import org.signal.libsignal.protocol.logging.Log; import org.signal.libsignal.protocol.logging.Log;
import org.signal.libsignal.protocol.util.Pair; import org.signal.libsignal.protocol.util.Pair;
@@ -165,8 +166,7 @@ final class CdsiSocket {
webSocket.close(1000, "OK"); webSocket.close(1000, "OK");
break; break;
} }
} catch (IOException | AttestationDataException | SgxCommunicationFailureException | AssertionError e) { } catch (IOException | AttestationDataException | AttestationFailedException | SgxCommunicationFailureException e) {
// TODO only catching AssertionError because of libsignal bug. Remove when bug is fixed.
Log.w(TAG, e); Log.w(TAG, e);
webSocket.close(1000, "OK"); webSocket.close(1000, "OK");
emitter.tryOnError(e); emitter.tryOnError(e);