From 40478c1c45ce4820ac44b6004e33c4a898935f78 Mon Sep 17 00:00:00 2001
From: sh <37271604+shumvgolove@users.noreply.github.com>
Date: Wed, 7 Oct 2026 13:30:26 +0400
Subject: [PATCH] android: target API 36, AGP 8.10.1 (#7656)

* android: migrate back handling to callbacks

* android: target API 36, AGP 8.10.1

* android: opt out of predictive back app-wide
---
 apps/multiplatform/android/build.gradle.kts             | 4 ++--
 apps/multiplatform/android/src/main/AndroidManifest.xml | 6 +++++-
 apps/multiplatform/common/build.gradle.kts              | 6 +++---
 apps/multiplatform/gradle.properties                    | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/apps/multiplatform/android/build.gradle.kts b/apps/multiplatform/android/build.gradle.kts
index 419fef90b9..c16aced912 100644
--- a/apps/multiplatform/android/build.gradle.kts
+++ b/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()
diff --git a/apps/multiplatform/android/src/main/AndroidManifest.xml b/apps/multiplatform/android/src/main/AndroidManifest.xml
index 64d7a03cf7..5fa9c7fefa 100644
--- a/apps/multiplatform/android/src/main/AndroidManifest.xml
+++ b/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 -->
diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts
index a03a7d4b27..ca19cdea3a 100644
--- a/apps/multiplatform/common/build.gradle.kts
+++ b/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")
diff --git a/apps/multiplatform/gradle.properties b/apps/multiplatform/gradle.properties
index 6224646940..069a1a20b8 100644
--- a/apps/multiplatform/gradle.properties
+++ b/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