Merge branch 'master' into develop

bindings/dart/android/build.gradle

@@ -119,6 +119,28 @@ cargo {
     profile = gradle.startParameter.taskNames.any{it.toLowerCase().contains("debug")} ? "debug" : "release"
 
     extraCargoBuildArguments = ['-p', 'ouisync-ffi']
+
+    // HACK: Recent NDK (since r23) no longer links `libgcc`, which breaks some libraries since
+    // they depended on the symbols from `libclang_rt.builtins-x86_64-android`
+    // (e.g. `__extenddftf2`, ...). To work around it, we link the library explicitly by setting
+    // it through the RUSTFLAGS env variable.
+    // More info: https://github.com/bbqsrc/cargo-ndk/issues/94.
+    exec { spec, toolchain ->
+        if (toolchain.target == 'x86_64-linux-android') {
+            def os_toolchain
+            if (System.properties['os.name'].toLowerCase().contains('windows')) {
+                os_toolchain = 'windows-x86_64'
+            } else {
+                os_toolchain = 'linux-x86_64' 
+            }
+
+
+            def clangVersion = '18'
+            def libDir = "${android.sdkDirectory}/ndk/${android.ndkVersion}/toolchains/llvm/prebuilt/${os_toolchain}/lib/clang/${clangVersion}/lib/linux"
+
+            spec.environment('RUSTFLAGS', "-L${libDir} -lstatic=clang_rt.builtins-x86_64-android")
+        }
+    }
 }
 
 preBuild.dependsOn 'cargoBuild'

bindings/dart/lib/local_secret.dart

@@ -37,6 +37,12 @@ class LocalPassword implements LocalSecret, SetLocalSecret {
   // Discourage from writing local secret into the log.
   @override
   String toString() => "LocalPassword(***)";
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! LocalPassword) return false;
+    return string == other.string;
+  }
 }
 
 class LocalSecretKey implements LocalSecret {