merge master into badge-in-app-checkout

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 -->
@@ -109,12 +113,18 @@
         <data android:host="smp4.simplexonflux.com" />
         <data android:host="smp5.simplexonflux.com" />
         <data android:host="smp6.simplexonflux.com" />
-        <data android:pathPrefix="/invitation" />
-        <data android:pathPrefix="/contact" />
-        <data android:pathPrefix="/a" />
-        <data android:pathPrefix="/c" />
-        <data android:pathPrefix="/g" />
-        <data android:pathPrefix="/i" />
+        <data android:path="/invitation" />
+        <data android:path="/contact" />
+        <data android:path="/a" />
+        <data android:path="/c" />
+        <data android:path="/g" />
+        <data android:path="/i" />
+        <data android:pathPrefix="/invitation/" />
+        <data android:pathPrefix="/contact/" />
+        <data android:pathPrefix="/a/" />
+        <data android:pathPrefix="/c/" />
+        <data android:pathPrefix="/g/" />
+        <data android:pathPrefix="/i/" />
       </intent-filter>
       <!-- Receive files from other apps -->
       <intent-filter>

apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt

@@ -178,7 +178,6 @@ object NtfManager {
         val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
         NotificationCompat.Builder(context, CallChannel)
           .setFullScreenIntent(fullScreenPendingIntent, true)
-          .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
       } else {
         val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/raw/ring_once")
         val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, Intent(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)

apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt

@@ -36,6 +36,7 @@ import chat.simplex.app.R
 import chat.simplex.app.TAG
 import chat.simplex.app.model.NtfManager
 import chat.simplex.app.model.NtfManager.AcceptCallAction
+import chat.simplex.common.AppLock
 import chat.simplex.common.helpers.applyAppLocale
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
@@ -342,7 +343,10 @@ fun IncomingCallLockScreenAlert(invitation: RcvCallInvitation, chatModel: ChatMo
       chatModel.activeCallInvitation.value = null
       ntfManager.cancelCallNotification()
     },
-    acceptCall = { cm.acceptIncomingCall(invitation = invitation) },
+    acceptCall = {
+      AppLock.recheckAuthState()
+      cm.acceptIncomingCall(invitation = invitation)
+    },
     openApp = {
       val intent = Intent(context, MainActivity::class.java)
         .setAction(NtfManager.OpenChatAction)
@@ -376,8 +380,12 @@ fun IncomingCallLockScreenAlertLayout(
     IncomingCallInfo(invitation, chatModel)
     Spacer(Modifier.fillMaxHeight().weight(1f))
     if (callOnLockScreen == CallOnLockScreen.ACCEPT) {
-      ProfileImage(size = 192.dp, image = invitation.contact.profile.image)
-      Text(invitation.contact.chatViewName, style = MaterialTheme.typography.h2)
+      if (chatModel.controller.appPrefs.notificationPreviewMode.get() == NotificationPreviewMode.HIDDEN.name) {
+        ProfileImage(size = 192.dp)
+      } else {
+        ProfileImage(size = 192.dp, image = invitation.contact.profile.image)
+        Text(invitation.contact.chatViewName, style = MaterialTheme.typography.h2)
+      }
       Spacer(Modifier.fillMaxHeight().weight(1f))
       Row {
         LockScreenCallButton(stringResource(MR.strings.reject), painterResource(R.drawable.ic_call_end_filled), Color.Red, rejectCall)