Merge branch 'master' into master-ghc8107

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -720,8 +720,9 @@ func apiUpdateProfile(profile: Profile) async throws -> (Profile, [Contact])? {
     let userId = try currentUserId("apiUpdateProfile")
     let r = await chatSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
     switch r {
-    case .userProfileNoChange: return nil
+    case .userProfileNoChange: return (profile, [])
     case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
+    case .chatCmdError(_, .errorStore(.duplicateName)): return nil;
     default: throw r
     }
 }

apps/ios/Shared/Views/Chat/ChatInfoView.swift

@@ -242,7 +242,7 @@ struct ChatInfoView: View {
         }
         .actionSheet(isPresented: $showDeleteContactActionSheet) {
             if contact.ready && contact.active {
-                ActionSheet(
+                return ActionSheet(
                     title: Text("Delete contact?\nThis cannot be undone!"),
                     buttons: [
                         .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
@@ -251,7 +251,7 @@ struct ChatInfoView: View {
                     ]
                 )
             } else {
-                ActionSheet(
+                return ActionSheet(
                     title: Text("Delete contact?\nThis cannot be undone!"),
                     buttons: [
                         .destructive(Text("Delete")) { deleteContact() },

apps/ios/Shared/Views/ChatList/ChatListNavLink.swift

@@ -78,7 +78,7 @@ struct ChatListNavLink: View {
         .frame(height: rowHeights[dynamicTypeSize])
         .actionSheet(isPresented: $showDeleteContactActionSheet) {
             if contact.ready && contact.active {
-                ActionSheet(
+                return ActionSheet(
                     title: Text("Delete contact?\nThis cannot be undone!"),
                     buttons: [
                         .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
@@ -87,7 +87,7 @@ struct ChatListNavLink: View {
                     ]
                 )
             } else {
-                ActionSheet(
+                return ActionSheet(
                     title: Text("Delete contact?\nThis cannot be undone!"),
                     buttons: [
                         .destructive(Text("Delete")) { Task { await deleteChat(chat) } },

apps/ios/Shared/Views/UserSettings/UserProfile.swift

@@ -174,11 +174,13 @@ struct UserProfile: View {
                         chatModel.updateCurrentUser(newProfile)
                         profile = newProfile
                     }
+                    editProfile = false
+                } else {
+                    alert = .duplicateUserError
                 }
             } catch {
                 logger.error("UserProfile apiUpdateProfile error: \(responseError(error))")
             }
-            editProfile = false
         }
     }
 }

apps/ios/SimpleXChat/AppGroup.swift

@@ -83,9 +83,9 @@ public enum AppState: String {
 
     public var canSuspend: Bool {
         switch self {
-        case .active: true
-        case .bgRefresh: true
-        default: false
+        case .active: return true
+        case .bgRefresh: return true
+        default: return false
         }
     }
 }

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

@@ -143,6 +143,7 @@ fun processExternalIntent(intent: Intent?) {
           val text = intent.getStringExtra(Intent.EXTRA_TEXT)
           val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
           if (uri != null) {
+            if (uri.scheme != "content") return showNonContentUriAlert()
             // Shared file that contains plain text, like `*.log` file
             chatModel.sharedContent.value = SharedContent.File(text ?: "", uri.toURI())
           } else if (text != null) {
@@ -153,12 +154,14 @@ fun processExternalIntent(intent: Intent?) {
         isMediaIntent(intent) -> {
           val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
           if (uri != null) {
+            if (uri.scheme != "content") return showNonContentUriAlert()
             chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", listOf(uri.toURI()))
           } // All other mime types
         }
         else -> {
           val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
           if (uri != null) {
+            if (uri.scheme != "content") return showNonContentUriAlert()
             chatModel.sharedContent.value = SharedContent.File(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uri.toURI())
           }
         }
@@ -173,6 +176,7 @@ fun processExternalIntent(intent: Intent?) {
         isMediaIntent(intent) -> {
           val uris = intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM) as? List<Uri>
           if (uris != null) {
+            if (uris.any { it.scheme != "content" }) return showNonContentUriAlert()
             chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uris.map { it.toURI() })
           } // All other mime types
         }
@@ -185,6 +189,13 @@ fun processExternalIntent(intent: Intent?) {
 fun isMediaIntent(intent: Intent): Boolean =
   intent.type?.startsWith("image/") == true || intent.type?.startsWith("video/") == true
 
+private fun showNonContentUriAlert() {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(MR.strings.non_content_uri_alert_title),
+    text = generalGetString(MR.strings.non_content_uri_alert_text)
+  )
+}
+
 //fun testJson() {
 //  val str: String = """
 //  """.trimIndent()

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt

@@ -943,6 +943,9 @@ object ChatController {
     val r = sendCmd(CC.ApiUpdateProfile(userId, profile))
     if (r is CR.UserProfileNoChange) return profile to emptyList()
     if (r is CR.UserProfileUpdated) return r.toProfile to r.updateSummary.changedContacts
+    if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.DuplicateName) {
+      AlertManager.shared.showAlertMsg(generalGetString(MR.strings.failed_to_create_user_duplicate_title), generalGetString(MR.strings.failed_to_create_user_duplicate_desc))
+    }
     Log.e(TAG, "apiUpdateProfile bad response: ${r.responseType} ${r.details}")
     return null
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt

@@ -324,8 +324,26 @@ fun ComposeView(
   }
 
   fun deleteUnusedFiles() {
-    chatModel.filesToDelete.forEach { it.delete() }
-    chatModel.filesToDelete.clear()
+    val shared = chatModel.sharedContent.value
+    if (shared == null) {
+      chatModel.filesToDelete.forEach { it.delete() }
+      chatModel.filesToDelete.clear()
+    } else {
+      val sharedPaths = when (shared) {
+        is SharedContent.Media -> shared.uris.map { it.toString() }
+        is SharedContent.File -> listOf(shared.uri.toString())
+        is SharedContent.Text -> emptyList()
+      }
+      // When sharing a file and pasting it in SimpleX itself, the file shouldn't be deleted before sending or before leaving the chat after sharing
+      chatModel.filesToDelete.removeAll { file ->
+        if (sharedPaths.any { it.endsWith(file.name) }) {
+          false
+        } else {
+          file.delete()
+          true
+        }
+      }
+    }
   }
 
   suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: CryptoFile? = null, live: Boolean = false, ttl: Int?): ChatItem? {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfileView.kt

@@ -42,8 +42,8 @@ fun UserProfileView(chatModel: ChatModel, close: () -> Unit) {
             val (newProfile, _) = updated
             chatModel.updateCurrentUser(newProfile)
             profile = newProfile
+            close()
           }
-          close()
         }
       }
     )

apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml

@@ -16,6 +16,8 @@
 
   <!-- MainActivity.kt -->
   <string name="opening_database">Opening database…</string>
+  <string name="non_content_uri_alert_title">Invalid file path</string>
+  <string name="non_content_uri_alert_text">You shared an invalid file path. Report the issue to the app developers.</string>
 
   <!-- Server info - ChatModel.kt -->
   <string name="server_connected">connected</string>