Merge branch 'master' into ab/names-lookup-api

apps/multiplatform/android/build.gradle.kts

@@ -9,13 +9,13 @@ plugins {
 }
 
 android {
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "chat.simplex.app"
         namespace = "chat.simplex.app"
         minSdk = 26
-        targetSdk = 35
+        targetSdk = 36
         // !!!
         // skip version code after release to F-Droid, as it uses two version codes
         versionCode = (extra["android.version_code"] as String).toInt()

apps/multiplatform/android/src/main/AndroidManifest.xml

@@ -35,6 +35,8 @@
     </intent>
   </queries>
 
+  <!-- enableOnBackInvokedCallback="false": Activity.onBackPressed() overrides are not called on Android 16+ without it.
+       UnusedAttribute is ignored because the attribute only exists on API 33+, older versions call onBackPressed() anyway -->
   <application
       android:name="SimplexApp"
       android:allowBackup="false"
@@ -44,7 +46,9 @@
       android:largeHeap="true"
       android:extractNativeLibs="${extract_native_libs}"
       android:supportsRtl="true"
-      android:theme="@style/Theme.SimpleX">
+      android:enableOnBackInvokedCallback="false"
+      android:theme="@style/Theme.SimpleX"
+      tools:ignore="UnusedAttribute">
     <!--      android:localeConfig="@xml/locales_config"-->
 
     <!-- Main activity -->

apps/multiplatform/common/build.gradle.kts

@@ -158,13 +158,13 @@ kotlin {
 
 android {
   namespace = "chat.simplex.common"
-  compileSdk = 35
+  compileSdk = 36
   sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
   defaultConfig {
     minSdk = 26
   }
-  testOptions.targetSdk = 34
-  lint.targetSdk = 34
+  testOptions.targetSdk = 36
+  lint.targetSdk = 36
   val isAndroid = gradle.startParameter.taskNames.find {
     val lower = it.lowercase()
     lower.contains("release") || lower.startsWith("assemble") || lower.startsWith("install")

apps/multiplatform/gradle.properties

@@ -31,7 +31,7 @@ desktop.version_name=7.1-beta.6
 desktop.version_code=167
 
 kotlin.version=2.1.20
-gradle.plugin.version=8.7.0
+gradle.plugin.version=8.10.1
 compose.version=1.8.2
 
 # Choose sqlite or postgres backend

src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt

@@ -1123,6 +1123,15 @@ SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
 SEARCH g USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
 SEARCH h USING INDEX idx_sent_probe_hashes_sent_probe_id (sent_probe_id=?)
 
+Query: 
+            SELECT s.member_relations_vector, r.index_in_group
+            FROM group_members s, group_members r
+            WHERE s.local_display_name = ? AND r.local_display_name = ?
+          
+Plan:
+SCAN s
+SEARCH r USING AUTOMATIC PARTIAL COVERING INDEX (local_display_name=?)
+
 Query: 
             SELECT t.roster_transfer_id, t.roster_version, t.roster_digest, t.sending_owner_gm_id, t.broker_ts,
                    t.roster_msg_chat_binding, t.roster_msg_signatures, t.roster_msg_body
@@ -4201,15 +4210,6 @@ SEARCH c USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH cs USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
 SEARCH m USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
 
-Query: 
-        SELECT s.member_relations_vector, r.index_in_group
-        FROM group_members s, group_members r
-        WHERE s.local_display_name = ? AND r.local_display_name = ?
-      
-Plan:
-SCAN s
-SEARCH r USING AUTOMATIC PARTIAL COVERING INDEX (local_display_name=?)
-
 Query: 
         SELECT smp_server_id, host, port, key_hash, basic_auth, preset, tested, enabled,
                role_storage, role_proxy, role_names
@@ -7501,9 +7501,9 @@ Query: SELECT contact_domain_resolved_at, contact_domain_expires_at FROM contact
 Plan:
 SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
 
-Query: SELECT contact_id FROM contacts WHERE user_id = ? AND chat_item_ttl > 0 OR chat_item_ttl IS NULL
+Query: SELECT contact_id FROM contacts WHERE user_id = ? AND (chat_item_ttl > 0 OR chat_item_ttl IS NULL)
 Plan:
-SCAN contacts
+SEARCH contacts USING INDEX idx_contacts_chat_ts (user_id=?)
 
 Query: SELECT contact_id FROM contacts WHERE user_id = ? AND deleted = 0
 Plan:
@@ -7623,9 +7623,9 @@ Query: SELECT group_id FROM groups WHERE inv_queue_info = ? AND user_id = ? LIMI
 Plan:
 SEARCH groups USING INDEX sqlite_autoindex_groups_2 (user_id=?)
 
-Query: SELECT group_id FROM groups WHERE user_id = ? AND chat_item_ttl > 0 OR chat_item_ttl IS NULL
+Query: SELECT group_id FROM groups WHERE user_id = ? AND (chat_item_ttl > 0 OR chat_item_ttl IS NULL)
 Plan:
-SCAN groups
+SEARCH groups USING INDEX sqlite_autoindex_groups_2 (user_id=?)
 
 Query: SELECT group_id FROM groups WHERE user_id = ? AND creating_in_progress = 1 AND created_at <= ?
 Plan:
@@ -7663,6 +7663,10 @@ Query: SELECT image FROM contact_profiles WHERE display_name = ? LIMIT 1
 Plan:
 SEARCH contact_profiles USING INDEX contact_profiles_index (display_name=?)
 
+Query: SELECT index_in_group, member_relations_vector FROM group_members WHERE local_display_name = ?
+Plan:
+SCAN group_members
+
 Query: SELECT issue_failed_since, issue_error FROM badge_purchases
 Plan:
 SCAN badge_purchases

website/src/crowdfunding.html

@@ -1033,7 +1033,7 @@ templateEngineOverride: njk
                         </div>
                         <div class="cf-stat">
                             <img src="/img/crowdfunding/p2p.png" alt="">
-                            <div><b>520K</b><span>Monthly users</span></div>
+                            <div><b>600K</b><span>Monthly users</span></div>
                         </div>
                     </div>
                 </div>
@@ -1048,8 +1048,8 @@ templateEngineOverride: njk
         <section class="page cf cf-light cf-left cf-growth" data-section="growth">
             <div class="area">
                 <div class="text-container">
-                    <h2>520,000<br>monthly users</h2>
-                    <p>Grown with <span>zero marketing spend</span>: hundreds of user posts, podcasts and videos, and <span>$650,000 in user donations</span>, before any paid features.</p>
+                    <h2>Over 600,000<br>monthly users</h2>
+                    <p><span>Organic growth</span>: hundreds of user posts, podcasts and videos, and <span>$650,000 in user donations</span>, before any paid features.</p>
                     <p>Only <span>$1.7M investment over 4 years</span> &mdash; more capital efficient than most startups.</p>
                 </div>
             </div>
@@ -1074,7 +1074,7 @@ templateEngineOverride: njk
                 <img class="cf-tags-art" src="/img/design_3/section-3-mobile-light.webp" alt="">
                 <div class="cf-tag" style="left: 40.8%; top: 70.1%;">
                     <div class="n">Users</div>
-                    <div class="v"><b>520,000</b> active monthly,</div>
+                    <div class="v"><b>600,000</b> active monthly,</div>
                     <div class="v">organic growth</div>
                 </div>
                 <div class="cf-tag" style="left: 45.8%; top: 47.6%;">
@@ -1084,7 +1084,7 @@ templateEngineOverride: njk
                 </div>
                 <div class="cf-tag" style="left: 45.2%; top: 30%;">
                     <div class="n">Businesses</div>
-                    <div class="v"><b>20+</b> offer customer</div>
+                    <div class="v"><b>50+</b> offer customer</div>
                     <div class="v">support</div>
                 </div>
                 <div class="cf-tag" style="left: 31.9%; top: 29.4%;">