Merge branch 'stable'

apps/ios/Shared/Theme/Theme.swift

@@ -42,12 +42,14 @@ class AppTheme: ObservableObject, Equatable {
     }
 
     func updateFromCurrentColors() {
-        objectWillChange.send()
-        name = CurrentColors.name
-        base = CurrentColors.base
-        colors.updateColorsFrom(CurrentColors.colors)
-        appColors.updateColorsFrom(CurrentColors.appColors)
-        wallpaper.updateWallpaperFrom(CurrentColors.wallpaper)
+        DispatchQueue.main.async {
+            self.objectWillChange.send()
+            self.name = CurrentColors.name
+            self.base = CurrentColors.base
+            self.colors.updateColorsFrom(CurrentColors.colors)
+            self.appColors.updateColorsFrom(CurrentColors.appColors)
+            self.wallpaper.updateWallpaperFrom(CurrentColors.wallpaper)
+        }
     }
 }
 

apps/ios/SimpleX--iOS--Info.plist

@@ -56,5 +56,7 @@
 		<string>remote-notification</string>
 		<string>voip</string>
 	</array>
+	<key>UIDesignRequiresCompatibility</key>
+	<true/>
 </dict>
 </plist>

apps/multiplatform/android/build.gradle.kts

@@ -15,8 +15,7 @@ android {
         applicationId = "chat.simplex.app"
         namespace = "chat.simplex.app"
         minSdk = 26
-        //noinspection OldTargetApi
-        targetSdk = 34
+        targetSdk = 35
         // !!!
         // skip version code after release to F-Droid, as it uses two version codes
         versionCode = (extra["android.version_code"] as String).toInt()

apps/multiplatform/common/build.gradle.kts

@@ -95,7 +95,8 @@ kotlin {
 
         implementation("com.jakewharton:process-phoenix:3.0.0")
 
-        val cameraXVersion = "1.3.4"
+        // https://issuetracker.google.com/issues/351313880
+        val cameraXVersion = "1.5.1"
         implementation("androidx.camera:camera-core:${cameraXVersion}")
         implementation("androidx.camera:camera-camera2:${cameraXVersion}")
         implementation("androidx.camera:camera-lifecycle:${cameraXVersion}")

apps/multiplatform/common/src/commonMain/cpp/android/CMakeLists.txt

@@ -57,6 +57,9 @@ set_target_properties( support PROPERTIES IMPORTED_LOCATION
 # can link multiple libraries, such as libraries you define in this
 # build script, prebuilt third-party libraries, or system libraries.
 
+# https://developer.android.com/guide/practices/page-sizes#cmake
+target_link_options(app-lib PRIVATE "-Wl,-z,max-page-size=16384")
+
 target_link_libraries( # Specifies the target library.
     app-lib
 

cabal.project

@@ -48,7 +48,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/zip.git
-    tag: bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc
+    tag: 2eff156c3aac389e35d38bf10a52733d7061640a
 
 -- waiting for published warp-tls-3.4.7
 source-repository-package

scripts/nix/sha256map.nix

@@ -6,7 +6,7 @@
   "https://github.com/simplex-chat/aeson.git"."aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b" = "0jz7kda8gai893vyvj96fy962ncv8dcsx71fbddyy8zrvc88jfrr";
   "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
   "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn";
-  "https://github.com/simplex-chat/zip.git"."bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc" = "1csqfjhvc8wb5h4kxxndmb6iw7b4ib9ff2n81hrizsmnf45a6gg0";
+  "https://github.com/simplex-chat/zip.git"."2eff156c3aac389e35d38bf10a52733d7061640a" = "052vahd5d4lxnazjrb6l60i261aycn2js7jhzafyb72n15ns4r6p";
   "https://github.com/yesodweb/wai.git"."ec5e017d896a78e787a5acea62b37a4e677dec2e" = "1ckcpmpjfy9jiqrb52q20lj7ln4hmq9v2jk6kpkf3m68c1m9c2bx";
   "https://github.com/simplex-chat/wai.git"."2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0" = "199g4rjdf1zp1fcw8nqdsyr1h36hmg424qqx03071jk7j00z7ay4";
 }

simplex-chat.cabal

@@ -311,7 +311,7 @@ library
     , unliftio-core ==0.2.*
     , uri-bytestring >=0.3.3.1 && <0.4
     , uuid ==1.3.*
-    , zip ==2.0.*
+    , zip ==2.2.*
     , zstd ==0.1.3.*
   default-language: Haskell2010
   if flag(swift)