Merge branch 'master' into master-ios

2026-05-14 10:25:28 +00:00 · 2023-08-24 20:43:20 +01:00
parent 20ebccdbf2 06369e277c
commit d6dba0e26a
14 changed files with 63 additions and 36 deletions
@@ -691,12 +691,12 @@ func apiListContacts() throws -> [Contact] {
    throw r
 }

-func apiUpdateProfile(profile: Profile) async throws -> Profile? {
+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 let .userProfileUpdated(_, _, toProfile): return toProfile
+    case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
    default: throw r
    }
 }
@@ -706,7 +706,7 @@ func apiSetProfileAddress(on: Bool) async throws -> User? {
    let r = await chatSendCmd(.apiSetProfileAddress(userId: userId, on: on))
    switch r {
    case .userProfileNoChange: return nil
-    case let .userProfileUpdated(user, _, _): return user
+    case let .userProfileUpdated(user, _, _, _): return user
    default: throw r
    }
 }
@@ -22,6 +22,7 @@ struct CIVideoView: View {
    @State private var scrollProxy: ScrollViewProxy?
    @State private var preview: UIImage? = nil
    @State private var player: AVPlayer?
+    @State private var fullPlayer: AVPlayer?
    @State private var url: URL?
    @State private var showFullScreenPlayer = false
    @State private var timeObserver: Any? = nil
@@ -36,6 +37,7 @@ struct CIVideoView: View {
        self.scrollProxy = scrollProxy
        if let url = getLoadedVideo(chatItem.file) {
            self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(url, false))
+            self._fullPlayer = State(initialValue: AVPlayer(url: url))
            self._url = State(initialValue: url)
        }
        if let data = Data(base64Encoded: dropImagePrefix(image)),
@@ -96,6 +98,7 @@ struct CIVideoView: View {
        DispatchQueue.main.async { videoWidth = w }
        return ZStack(alignment: .topTrailing) {
            ZStack(alignment: .center) {
+                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete
                VideoPlayerView(player: player, url: url, showControls: false)
                .frame(width: w, height: w * preview.size.height / preview.size.width)
                .onChange(of: ChatModel.shared.stopPreviousRecPlay) { playingUrl in
@@ -113,7 +116,9 @@ struct CIVideoView: View {
                        player.pause()
                        videoPlaying = false
                    case .paused:
-                        showFullScreenPlayer = true
+                        if canBePlayed {
+                            showFullScreenPlayer = true
+                        }
                    default: ()
                    }
                }
@@ -122,8 +127,9 @@ struct CIVideoView: View {
                        ChatModel.shared.stopPreviousRecPlay = url
                        player.play()
                    } label: {
-                        playPauseIcon("play.fill")
+                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
                    }
+                    .disabled(!canBePlayed)
                }
            }
            loadingIndicator()
@@ -258,8 +264,7 @@ struct CIVideoView: View {
    private func fullScreenPlayer(_ url: URL) -> some View {
        ZStack {
            Color.black.edgesIgnoringSafeArea(.all)
-            VideoPlayer(player: createFullScreenPlayerAndPlay(url)) {
-            }
+            VideoPlayer(player: fullPlayer)
            .overlay(alignment: .topLeading, content: {
                Button(action: { showFullScreenPlayer = false },
                    label: {
@@ -282,28 +287,29 @@ struct CIVideoView: View {
                    }
                }
            )
+            .onAppear {
+                DispatchQueue.main.asyncAfter(deadline: .now()) {
+                    ChatModel.shared.stopPreviousRecPlay = url
+                    if let player = fullPlayer {
+                        player.play()
+                        fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
+                            player.seek(to: CMTime.zero)
+                            player.play()
+                        }
+                    }
+                }
+            }
            .onDisappear {
                if let fullScreenTimeObserver = fullScreenTimeObserver {
                    NotificationCenter.default.removeObserver(fullScreenTimeObserver)
                }
                fullScreenTimeObserver = nil
+                fullPlayer?.pause()
+                fullPlayer?.seek(to: CMTime.zero)
            }
        }
    }

-    private func createFullScreenPlayerAndPlay(_ url: URL) -> AVPlayer {
-        let player = AVPlayer(url: url)
-        DispatchQueue.main.asyncAfter(deadline: .now()) {
-            ChatModel.shared.stopPreviousRecPlay = url
-            player.play()
-            fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
-                player.seek(to: CMTime.zero)
-                player.play()
-            }
-        }
-        return player
-    }
-
    private func addObserver(_ player: AVPlayer, _ url: URL) {
        timeObserver = player.addPeriodicTimeObserver(forInterval: CMTime(seconds: 0.01, preferredTimescale: CMTimeScale(NSEC_PER_SEC)), queue: .main) { time in
            if let item = player.currentItem {
@@ -130,7 +130,7 @@ struct GroupProfileView: View {
                let err = responseError(error)
                saveGroupError = err
                showSaveErrorAlert = true
-                logger.error("UserProfile apiUpdateProfile error: \(err)")
+                logger.error("GroupProfile apiUpdateGroup error: \(err)")
            }
        }
    }
@@ -133,7 +133,7 @@ struct LibraryMediaListPicker: UIViewControllerRepresentable {
        config.filter = .any(of: [.images, .videos])
        config.selectionLimit = selectionLimit
        config.selection = .ordered
-        //config.preferredAssetRepresentationMode = .current
+        config.preferredAssetRepresentationMode = .current
        let controller = PHPickerViewController(configuration: config)
        controller.delegate = context.coordinator
        return controller
@@ -71,9 +71,10 @@ struct PreferencesView: View {
            do {
                var p = fromLocalProfile(profile)
                p.preferences = fullPreferencesToPreferences(preferences)
-                if let newProfile = try await apiUpdateProfile(profile: p) {
+                if let (newProfile, updatedContacts) = try await apiUpdateProfile(profile: p) {
                    await MainActor.run {
                        chatModel.updateCurrentUser(newProfile, preferences)
+                        updatedContacts.forEach(chatModel.updateContact)
                        currentPreferences = preferences
                    }
                }
@@ -144,7 +144,7 @@ struct UserProfile: View {
    func saveProfile() {
        Task {
            do {
-                if let newProfile = try await apiUpdateProfile(profile: profile) {
+                if let (newProfile, _) = try await apiUpdateProfile(profile: profile) {
                    DispatchQueue.main.async {
                        chatModel.updateCurrentUser(newProfile)
                        profile = newProfile
@@ -457,7 +457,7 @@ public enum ChatResponse: Decodable, Error {
    case contactDeleted(user: UserRef, contact: Contact)
    case chatCleared(user: UserRef, chatInfo: ChatInfo)
    case userProfileNoChange(user: User)
-    case userProfileUpdated(user: User, fromProfile: Profile, toProfile: Profile)
+    case userProfileUpdated(user: User, fromProfile: Profile, toProfile: Profile, updateSummary: UserProfileUpdateSummary)
    case userPrivacy(user: User, updatedUser: User)
    case contactAliasUpdated(user: UserRef, toContact: Contact)
    case connectionAliasUpdated(user: UserRef, toConnection: PendingContactConnection)
@@ -724,7 +724,7 @@ public enum ChatResponse: Decodable, Error {
            case let .contactDeleted(u, contact): return withUser(u, String(describing: contact))
            case let .chatCleared(u, chatInfo): return withUser(u, String(describing: chatInfo))
            case .userProfileNoChange: return noDetails
-            case let .userProfileUpdated(u, _, toProfile): return withUser(u, String(describing: toProfile))
+            case let .userProfileUpdated(u, _, toProfile, _): return withUser(u, String(describing: toProfile))
            case let .userPrivacy(u, updatedUser): return withUser(u, String(describing: updatedUser))
            case let .contactAliasUpdated(u, toContact): return withUser(u, String(describing: toContact))
            case let .connectionAliasUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
@@ -171,6 +171,13 @@ public func fromLocalProfile (_ profile: LocalProfile) -> Profile {
    Profile(displayName: profile.displayName, fullName: profile.fullName, image: profile.image, contactLink: profile.contactLink, preferences: profile.preferences)
 }

+public struct UserProfileUpdateSummary: Decodable {
+    public var notChanged: Int
+    public var updateSuccesses: Int
+    public var updateFailures: Int
+    public var changedContacts: [Contact]
+}
+
 public enum ChatType: String {
    case direct = "@"
    case group = "#"
@@ -946,6 +946,14 @@ data class LocalProfile(
  }
 }

+@Serializable
+data class UserProfileUpdateSummary(
+  val notChanged: Int,
+  val updateSuccesses: Int,
+  val updateFailures: Int,
+  val changedContacts: List<Contact>
+)
+
@Serializable
 class Group (
  val groupInfo: GroupInfo,
@@ -910,11 +910,11 @@ object ChatController {
    return null
  }

-  suspend fun apiUpdateProfile(profile: Profile): Profile? {
+  suspend fun apiUpdateProfile(profile: Profile): Pair<Profile, List<Contact>>? {
    val userId = kotlin.runCatching { currentUserId("apiUpdateProfile") }.getOrElse { return null }
    val r = sendCmd(CC.ApiUpdateProfile(userId, profile))
-    if (r is CR.UserProfileNoChange) return profile
-    if (r is CR.UserProfileUpdated) return r.toProfile
+    if (r is CR.UserProfileNoChange) return profile to emptyList()
+    if (r is CR.UserProfileUpdated) return r.toProfile to r.updateSummary.changedContacts
    Log.e(TAG, "apiUpdateProfile bad response: ${r.responseType} ${r.details}")
    return null
  }
@@ -3254,7 +3254,7 @@ sealed class CR {
  @Serializable @SerialName("contactDeleted") class ContactDeleted(val user: UserRef, val contact: Contact): CR()
  @Serializable @SerialName("chatCleared") class ChatCleared(val user: UserRef, val chatInfo: ChatInfo): CR()
  @Serializable @SerialName("userProfileNoChange") class UserProfileNoChange(val user: User): CR()
-  @Serializable @SerialName("userProfileUpdated") class UserProfileUpdated(val user: User, val fromProfile: Profile, val toProfile: Profile): CR()
+  @Serializable @SerialName("userProfileUpdated") class UserProfileUpdated(val user: User, val fromProfile: Profile, val toProfile: Profile, val updateSummary: UserProfileUpdateSummary): CR()
  @Serializable @SerialName("userPrivacy") class UserPrivacy(val user: User, val updatedUser: User): CR()
  @Serializable @SerialName("contactAliasUpdated") class ContactAliasUpdated(val user: UserRef, val toContact: Contact): CR()
  @Serializable @SerialName("connectionAliasUpdated") class ConnectionAliasUpdated(val user: UserRef, val toConnection: PendingContactConnection): CR()
@@ -25,9 +25,11 @@ fun PreferencesView(m: ChatModel, user: User, close: () -> Unit,) {
  fun savePrefs(afterSave: () -> Unit = {}) {
    withApi {
      val newProfile = user.profile.toProfile().copy(preferences = preferences.toPreferences())
-      val updatedProfile = m.controller.apiUpdateProfile(newProfile)
-      if (updatedProfile != null) {
+      val updated = m.controller.apiUpdateProfile(newProfile)
+      if (updated != null) {
+        val (updatedProfile, updatedContacts) = updated
        m.updateCurrentUser(updatedProfile, preferences)
+        updatedContacts.forEach(m::updateContact)
        currentPreferences = preferences
      }
      afterSave()
@@ -39,8 +39,9 @@ fun UserProfileView(chatModel: ChatModel, close: () -> Unit) {
      close,
      saveProfile = { displayName, fullName, image ->
        withApi {
-          val newProfile = chatModel.controller.apiUpdateProfile(profile.copy(displayName = displayName, fullName = fullName, image = image))
-          if (newProfile != null) {
+          val updated = chatModel.controller.apiUpdateProfile(profile.copy(displayName = displayName, fullName = fullName, image = image))
+          if (updated != null) {
+            val (newProfile, _) = updated
            chatModel.updateCurrentUser(newProfile)
            profile = newProfile
          }
@@ -2,6 +2,8 @@ packages: .
 -- packages: . ../simplexmq
 -- packages: . ../simplexmq ../direct-sqlcipher ../sqlcipher-simple

+with-compiler: ghc-8.10.7
+
 constraints: zip +disable-bzip2 +disable-zstd

 source-repository-package
@@ -1852,14 +1852,14 @@ processChatCommand = \case
          summary <- foldM (processAndCount user' logLevel) (UserProfileUpdateSummary 0 0 0 []) contacts
          pure $ CRUserProfileUpdated user' (fromLocalProfile p) p' summary
      where
-        processAndCount user' ll (!s@UserProfileUpdateSummary {notChanged, updateSuccesses, updateFailures, changedContacts}) ct = do
+        processAndCount user' ll (!s@UserProfileUpdateSummary {notChanged, updateSuccesses, updateFailures, changedContacts = cts}) ct = do
          let mergedProfile = userProfileToSend user Nothing $ Just ct
              ct' = updateMergedPreferences user' ct
              mergedProfile' = userProfileToSend user' Nothing $ Just ct'
          if mergedProfile' == mergedProfile
            then pure s {notChanged = notChanged + 1}
            else 
-              let cts' = ct' : changedContacts
+              let cts' = if mergedPreferences ct == mergedPreferences ct' then  cts else ct' : cts
               in (notifyContact mergedProfile' ct' $> s {updateSuccesses = updateSuccesses + 1, changedContacts = cts'})
                    `catchChatError` \e -> when (ll <= CLLInfo) (toView $ CRChatError (Just user) e) $> s {updateFailures = updateFailures + 1, changedContacts = cts'}
          where