Merge tag 'v2.46.2'

mollyim · Sep 13, 2024 · 6b14f94 · 6b14f94
2 parents decc59c + 040a78f
commit 6b14f94
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 32 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -81,6 +81,15 @@ jobs:
       run: >-
         grep -q '"prebuildChecksum": ""' package.json
       working-directory: src/node
+    - name: Compare package.json and package-lock.json versions
+      run: >
+        PKG_OG=$(jq -r .version package.json);
+        PKG_LOCK=$(jq -r .version package-lock.json);
+        if [ "$PKG_OG" != "$PKG_LOCK" ]; then
+          echo "package.json and package-lock.json versions do not match";
+          exit 1;
+        fi
+      working-directory: src/node
 
   wrapper_validation:
     name: Validate Gradle wrapper

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v2.46.2
+
+- Update to webrtc 6478k
+  - iOS: Fixed issue with missing network interfaces
+
+- Android: Disable the use of sessionId for Oboe
+
+- Update to Rust 1.80.1
+
+- Build improvements
+
 ## v2.46.1
 
 - CI: Upload desktop symbols to GCS

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ members = [
 ]
 
 [workspace.package]
-version = "2.46.1"
+version = "2.46.2"
 authors = ["Calling Team <[email protected]>"]
 
 [patch.crates-io]

diff --git a/SignalRingRTC.podspec b/SignalRingRTC.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SignalRingRTC"
-  s.version          = "2.46.1"
+  s.version          = "2.46.2"
   s.summary          = "A Swift & Objective-C library used by the Signal iOS app for WebRTC interactions."
 
   s.description      = <<-DESC

diff --git a/acknowledgments/acknowledgments.html b/acknowledgments/acknowledgments.html
@@ -733,9 +733,9 @@ <h3 id="AGPL-3.0">GNU Affero General Public License v3.0 (synthesized)</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href="https://crates.io/crates/libsignal-core">libsignal-core 0.1.0</a></li>
-                    <li><a href="https://crates.io/crates/mrp">mrp 2.46.1</a></li>
-                    <li><a href="https://crates.io/crates/protobuf">protobuf 2.46.1</a></li>
-                    <li><a href="https://crates.io/crates/ringrtc">ringrtc 2.46.1</a></li>
+                    <li><a href="https://crates.io/crates/mrp">mrp 2.46.2</a></li>
+                    <li><a href="https://crates.io/crates/protobuf">protobuf 2.46.2</a></li>
+                    <li><a href="https://crates.io/crates/ringrtc">ringrtc 2.46.2</a></li>
                     <li><a href="https://crates.io/crates/regex-aot">regex-aot 0.1.0</a></li>
                     <li><a href="https://github.com/signalapp/partial-default">partial-default-derive 0.1.0</a></li>
                 </ul>

diff --git a/acknowledgments/acknowledgments.md b/acknowledgments/acknowledgments.md
@@ -669,7 +669,7 @@ For more information on this, and how to apply and follow the GNU AGPL, see
 
 ```
 
-## libsignal-core 0.1.0, mrp 2.46.1, protobuf 2.46.1, ringrtc 2.46.1, regex-aot 0.1.0, partial-default-derive 0.1.0
+## libsignal-core 0.1.0, mrp 2.46.2, protobuf 2.46.2, ringrtc 2.46.2, regex-aot 0.1.0, partial-default-derive 0.1.0
 
 ```
 GNU AFFERO GENERAL PUBLIC LICENSE

diff --git a/acknowledgments/acknowledgments.plist b/acknowledgments/acknowledgments.plist
@@ -924,7 +924,7 @@ You should also get your employer (if you work as a programmer) or school, if an
 			<key>License</key>
 			<string>GNU Affero General Public License v3.0</string>
 			<key>Title</key>
-			<string>libsignal-core 0.1.0, mrp 2.46.1, protobuf 2.46.1, ringrtc 2.46.1, regex-aot 0.1.0, partial-default-derive 0.1.0</string>
+			<string>libsignal-core 0.1.0, mrp 2.46.2, protobuf 2.46.2, ringrtc 2.46.2, regex-aot 0.1.0, partial-default-derive 0.1.0</string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>

diff --git a/bin/fetch-artifact.py b/bin/fetch-artifact.py
@@ -18,14 +18,14 @@
 UNVERIFIED_DOWNLOAD_NAME = "unverified.tmp"
 
 PREBUILD_CHECKSUMS = {
-    'android': '00a1ea957354f9ab363c5fc078aa2ed8cab3a67d32fc82001cd41ac81e4f37d2',
-    'ios': '99f07214c72583d30731ea53c941add4cf54db150d844cd5c3d0b2e8f7f94020',
-    'linux-arm64': 'b608de3c9931fe9be2567a75354afb55920ad0f8647e70e9cca637c5b4ad1e80',
-    'linux-x64': 'bf637590ad40a1ab293b2df3e1d59c98cdaa7117cfcde68a6332be2f7ccddaff',
-    'mac-arm64': '2dfcab4528e81d85b6caec35c4552d3873cb231cbf126c61c2650358e44db405',
-    'mac-x64': '0db0b48637757e27cbdca560107a74d863ce23b453c6b72f5efa69f166c49cfb',
-    'windows-arm64': '43c57a2c0119e7f4dbec2217e8ab2d32aac96c735967549cd47a7ed51c75a110',
-    'windows-x64': '6d3514099b6aa5a4e497c2cfbb6c65b6ed0df0af92eb0796cb8f1583405acbfc',
+    'android': '4b29072aba3ab26a33ae65e3e5e8ee1a08cbe269a74eca3cecfc1fd8ced7ae7d',
+    'ios': 'ab013e24315f4eaaca37e77b5f40b27348452aaab118f4928ac8cac30cd22944',
+    'linux-arm64': 'cf6b7feb41cf2d9053e363aeed7504b27cbebefcba334759407cb606ae80d649',
+    'linux-x64': 'd5daaef28621f56e0d050f9e2f57109631eadb7096c63bcd7fc902df2ef04b40',
+    'mac-arm64': '6ee4757b93555af4ff86ee5aec7f8d00710e95624d37e06a9f23d25fa51302f5',
+    'mac-x64': '818fda82e677dad07b9017b5cbea85cfe4b9e7a60829242df8738b111be20697',
+    'windows-arm64': 'eb30ffb127ed5acb156c704162eb4fe0590d458c70bbd5026c919f716a21ad66',
+    'windows-x64': '18a219d2318820823ead2a2c40ffe920b05d4d49a7750c758fae7739fcb5aa1f',
 }
 
 

diff --git a/call_sim/docker/signaling_server/Cargo.lock b/call_sim/docker/signaling_server/Cargo.lock
diff --git a/config/version.properties b/config/version.properties
@@ -1,5 +1,5 @@
-webrtc.version=6478j
+webrtc.version=6478k
 
 ringrtc.version.major=2
 ringrtc.version.minor=46
-ringrtc.version.revision=1
+ringrtc.version.revision=2
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.79.0
+1.80.1
diff --git a/src/android/api/org/signal/ringrtc/CallManager.java b/src/android/api/org/signal/ringrtc/CallManager.java
@@ -54,6 +54,7 @@
  *
  */
 public class CallManager {
+  public static final  int     INVALID_AUDIO_SESSION_ID = -1;
 
   @NonNull
   private static final String  TAG = CallManager.class.getSimpleName();
@@ -244,15 +245,11 @@ private PeerConnectionFactory createPeerConnectionFactory(@Nullable EglBase
 
     if (useOboe) {
       // Use the Oboe Audio Device Module.
-
-      AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-      int audioSessionId = audioManager.generateAudioSessionId();
-
       OboeAudioDeviceModule adm = OboeAudioDeviceModule.builder()
         .setUseSoftwareAcousticEchoCanceler(!useHardware)
         .setUseSoftwareNoiseSuppressor(!useHardware)
         .setExclusiveSharingMode(true)
-        .setAudioSessionId(audioSessionId)
+        .setAudioSessionId(INVALID_AUDIO_SESSION_ID)
         .createAudioDeviceModule();
 
       PeerConnectionFactory factory = PeerConnectionFactory.builder()

diff --git a/src/node/package-lock.json b/src/node/package-lock.json
diff --git a/src/node/package.json b/src/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@signalapp/ringrtc",
-  "version": "2.46.1",
+  "version": "2.46.2",
   "description": "Signal Messenger voice and video calling library.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/rust/src/android/api/call_link_root_key.rs b/src/rust/src/android/api/call_link_root_key.rs
@@ -115,7 +115,7 @@ pub unsafe extern "C" fn Java_org_signal_ringrtc_CallLinkRootKey_nativeToFormatt
     try_scoped(|| {
         let key_bytes = env.convert_byte_array(key_bytes)?;
         let key = CallLinkRootKey::try_from(key_bytes.as_slice())?;
-        Ok(env.new_string(&key.to_formatted_string())?)
+        Ok(env.new_string(key.to_formatted_string())?)
     })
     .unwrap_or_else(|e| {
         error::throw_error(&mut env, e);

diff --git a/src/rust/src/core/connection.rs b/src/rust/src/core/connection.rs
@@ -1931,7 +1931,7 @@ where
     ///
     /// * `call_id` - Call ID from the remote peer.
     /// * `max_bitrate_bps` - the bitrate that the remote peer wants to use for
-    /// the session.
+    ///   the session.
     pub fn inject_received_receiver_status_via_rtp_data(
         &mut self,
         call_id: CallId,
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
-    ## libsignal-core 0.1.0, mrp 2.46.1, protobuf 2.46.1, ringrtc 2.46.1, regex-aot 0.1.0, partial-default-derive 0.1.0
+    ## libsignal-core 0.1.0, mrp 2.46.2, protobuf 2.46.2, ringrtc 2.46.2, regex-aot 0.1.0, partial-default-derive 0.1.0
     ```
     GNU AFFERO GENERAL PUBLIC LICENSE
@@ Expand Down @@