Merge tag 'v0.83.0' into ci

v0.83.0

- backups: Support polls in backup validator

- spqr: Remove client-provided options to turn on/off SPQR, defaulting to on everywhere.

Author: tulir

.github/workflows/android_integration.yml

@@ -0,0 +1,72 @@
+name: Android Integration Test
+
+on:
+  workflow_dispatch:
+    inputs:
+      signal_android_branch:
+        description: 'Signal-Android branch to test against'
+        required: false
+        default: 'main'
+        type: string
+
+env:
+  CARGO_TERM_COLOR: always
+  NDK_VERSION: 28.0.13004108
+
+jobs:
+  android-integration:
+    name: Android Client Integration Test
+
+    runs-on: ubuntu-latest-8-cores
+
+    timeout-minutes: 60
+
+    steps:
+    - name: Checkout libsignal
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        path: libsignal
+        submodules: recursive
+
+    - name: Checkout Signal-Android
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        repository: signalapp/Signal-Android
+        ref: ${{ inputs.signal_android_branch }}
+        path: Signal-Android
+
+    - run: 'echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"'
+
+    - name: Validate Gradle Wrapper
+      uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
+
+    - run: |
+        cd libsignal
+        rustup toolchain install $(cat rust-toolchain) --profile minimal --target aarch64-linux-android,armv7-linux-androideabi,x86_64-linux-android,i686-linux-android
+
+    - name: Install protoc
+      run: |
+        curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v32.0/protoc-32.0-linux-x86_64.zip
+        sudo unzip -o protoc-32.0-linux-x86_64.zip -d /usr/local bin/protoc
+        sudo unzip -o protoc-32.0-linux-x86_64.zip -d /usr/local 'include/*'
+        rm protoc-32.0-linux-x86_64.zip
+
+    - name: Install Android NDK
+      run: |
+        sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;$NDK_VERSION"
+        echo "ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}" >> "$GITHUB_ENV"
+
+    - name: Run Android's QA checks with local libsignal
+      run: ./gradlew qa --no-daemon --stacktrace -PlibsignalClientPath=../libsignal -F OFF
+      working-directory: Signal-Android
+      shell: bash # Explicitly setting the shell turns on pipefail in GitHub Actions
+
+    - name: Upload test results
+      if: failure()
+      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+      with:
+        name: test-results
+        path: |
+          Signal-Android/**/build/reports/
+          Signal-Android/**/build/test-results/
+        retention-days: 7

Cargo.lock

@@ -37,7 +37,7 @@ default-members = [
 resolver = "2" # so that our dev-dependency features don't leak into products
 
 [workspace.package]
-version = "0.82.0"
+version = "0.83.0"
 authors = ["Signal Messenger LLC"]
 license = "AGPL-3.0-only"
 rust-version = "1.85"
@@ -48,7 +48,10 @@ rust-version = "1.85"
 cast_possible_truncation = "warn"
 
 [workspace.lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(fuzzing)',
+    'cfg(tokio_unstable)',
+] }
 
 [workspace.dependencies]
 # Our own crates, so that we don't have to depend on them by inter-crate paths
@@ -141,7 +144,7 @@ http-body-util = "0.1.1"
 hyper = "1.4"
 hyper-util = "0.1.4"
 indexmap = "2.1.0"
-intmap = "3.0.0"
+intmap = "3.1.2"
 itertools = "0.14.0"
 jni = "0.21"
 json5 = "0.4.1"

Cargo.toml

@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'LibSignalClient'
-  s.version          = '0.82.0'
+  s.version          = '0.83.0'
   s.summary          = 'A Swift wrapper library for communicating with the Signal messaging service.'
 
   s.homepage         = 'https://github.com/signalapp/libsignal'

LibSignalClient.podspec

@@ -1,7 +1,5 @@
-v0.82.0
+v0.83.0
 
-- Node: migrate libsignal-client to the ECMAScript module format (from CommonJS).
+- backups: Support polls in backup validator
 
-- Node: interfaces now use property notation for method requirements, which TypeScript can check more strictly.
-
-- net: Direct connections to the Signal servers will be tried as a fallback if connecting through an HTTP or SOCKS proxy fails or takes too long.
+- spqr: Remove client-provided options to turn on/off SPQR, defaulting to on everywhere.

RELEASE_NOTES.md

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.library' version '8.9.0'
+    id 'com.android.library' version '8.10.1'
     id 'androidx.benchmark' version '1.1.1'
 }
 

java/android/benchmarks/build.gradle

@@ -26,7 +26,6 @@
 import org.signal.libsignal.protocol.SessionBuilder;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.UntrustedIdentityException;
-import org.signal.libsignal.protocol.UsePqRatchet;
 import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.protocol.groups.GroupCipher;
@@ -209,7 +208,7 @@ private static void initializeSessions(
             bobKyberPreKey.getKeyPair().getPublicKey(),
             bobKyberPreKey.getSignature());
     SessionBuilder aliceSessionBuilder = new SessionBuilder(aliceStore, bobAddress);
-    aliceSessionBuilder.process(bobBundle, UsePqRatchet.YES);
+    aliceSessionBuilder.process(bobBundle);
 
     bobStore.storeSignedPreKey(2, bobSignedPreKey);
     bobStore.storeKyberPreKey(12, bobKyberPreKey);

java/android/benchmarks/src/androidTest/java/SealedSender.java

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.library' version '8.9.0'
+    id 'com.android.library' version '8.10.1'
 }
 
 repositories {

java/android/packaging-test/build.gradle

@@ -11,7 +11,7 @@ plugins {
     id "org.jetbrains.dokka" version "2.0.0" apply false
 
     // These plugins need to be loaded together, so we must declare them up front.
-    id 'com.android.library' version "8.9.0" apply false
+    id 'com.android.library' version "8.10.1" apply false
     id 'org.jetbrains.kotlin.android' version "2.1.0" apply false
 }
 
@@ -22,7 +22,7 @@ repositories {
 }
 
 allprojects {
-    version = "0.82.0"
+    version = "0.83.0"
     group   = "org.signal"
 
     tasks.withType(JavaCompile) {

java/build.gradle

@@ -21,6 +21,7 @@ cargo fetch
 
 export CARGO_PROFILE_RELEASE_DEBUG=1 # Enable line tables
 RUSTFLAGS="--cfg aes_armv8 ${RUSTFLAGS:-}" # Enable ARMv8 cryptography acceleration when available
+RUSTFLAGS="--cfg tokio_unstable ${RUSTFLAGS:-}" # Access tokio's unstable metrics
 RUSTFLAGS="$(rust_remap_path_options) ${RUSTFLAGS:-}" # Strip absolute paths
 export RUSTFLAGS