Merge branch 'develop' of https://github.com/vector-im/element-x-ios …

…into mauroromito/knocked_preview_implementation # Conflicts: # ElementX/Sources/Services/Room/JoinedRoomProxy.swift # ElementX/Sources/Services/Timeline/TimelineProxy.swift
element-hq · Oct 23, 2024 · 26ea118 · 26ea118
2 parents 995a769 + 01886bb
commit 26ea118
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 19 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,36 @@
+## Changes in 1.9.2 (2024-10-23)
+
+### What's Changed
+
+🙌 Improvements
+* Add support for rendering media captions in the timeline. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3429
+* Show a verification badge on the Room Member/User Profile screens. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3427
+
+🐛 Bugfixes
+* Only subscribe to identity updates if the room is encrypted. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3414
+* Fix the pinned identity banner to always show the user ID regardless of ambiguity. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3415
+* Fix a bug where uploaded images could have the wrong aspect ratio in the timeline. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3435
+
+⚠️ API Changes
+* Adopt various rust side Timeline API additions by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/3423
+
+🗣 Translations
+* Translations update by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/3433
+
+🚧 In development 🚧
+* Allow image uploads to be optimised to reduce bandwidth. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3412
+* Knock and knocked state for the join room screen by @Velin92 in https://github.com/element-hq/element-x-ios/pull/3424
+
+Others
+* Fix some warnings. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3416
+* Refactor the`TimelineItemIdentifier` handling by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/3418
+* Remove superfluous media request upload handle cancellation call. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/3425
+* Update dependency fastlane to v2.225.0 by @renovate in https://github.com/element-hq/element-x-ios/pull/3434
+* Adopt various Rust side API changes by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/3437
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/1.9.1...1.9.2
+
 ## Changes in 1.9.1 (2024-10-15)
 
 ### What's Changed

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
@@ -7469,7 +7469,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 1.9.2;
+				MARKETING_VERSION = 1.9.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCTION_APP_NAME = Element;
@@ -7546,7 +7546,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 1.9.2;
+				MARKETING_VERSION = 1.9.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;

diff --git a/ElementX/Sources/Services/Client/ClientProxyProtocol.swift b/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
@@ -39,7 +39,6 @@ enum ClientProxyError: Error {
 }
 
 enum SlidingSyncConstants {
-    static let defaultTimelineLimit: UInt32 = 20
     static let maximumVisibleRangeSize = 30
 }
 

diff --git a/ElementX/Sources/Services/Room/JoinedRoomProxy.swift b/ElementX/Sources/Services/Room/JoinedRoomProxy.swift
@@ -187,6 +187,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
         }
 
         subscribedForUpdates = true
+
         do {
             try roomListService.subscribeToRooms(roomIds: [id])
         } catch {

diff --git a/ElementX/Sources/Services/Timeline/TimelineProxy.swift b/ElementX/Sources/Services/Timeline/TimelineProxy.swift
@@ -227,9 +227,14 @@ final class TimelineProxy: TimelineProxyProtocol {
                    requestHandle: @MainActor (SendAttachmentJoinHandleProtocol) -> Void) async -> Result<Void, TimelineProxyError> {
         MXLog.info("Sending audio")
 
-        let handle = timeline.sendAudio(url: url.path(percentEncoded: false), audioInfo: audioInfo, caption: nil, formattedCaption: nil, storeInCache: false, progressWatcher: UploadProgressListener { progress in
-            progressSubject?.send(progress)
-        })
+        let handle = timeline.sendAudio(url: url.path(percentEncoded: false),
+                                        audioInfo: audioInfo,
+                                        caption: nil,
+                                        formattedCaption: nil,
+                                        storeInCache: true,
+                                        progressWatcher: UploadProgressListener { progress in
+                                            progressSubject?.send(progress)
+                                        })
 
         await requestHandle(handle)
 
@@ -250,9 +255,12 @@ final class TimelineProxy: TimelineProxyProtocol {
                   requestHandle: @MainActor (SendAttachmentJoinHandleProtocol) -> Void) async -> Result<Void, TimelineProxyError> {
         MXLog.info("Sending file")
 
-        let handle = timeline.sendFile(url: url.path(percentEncoded: false), fileInfo: fileInfo, storeInCache: false, progressWatcher: UploadProgressListener { progress in
-            progressSubject?.send(progress)
-        })
+        let handle = timeline.sendFile(url: url.path(percentEncoded: false),
+                                       fileInfo: fileInfo,
+                                       storeInCache: true,
+                                       progressWatcher: UploadProgressListener { progress in
+                                           progressSubject?.send(progress)
+                                       })
 
         await requestHandle(handle)
 
@@ -274,9 +282,15 @@ final class TimelineProxy: TimelineProxyProtocol {
                    requestHandle: @MainActor (SendAttachmentJoinHandleProtocol) -> Void) async -> Result<Void, TimelineProxyError> {
         MXLog.info("Sending image")
 
-        let handle = timeline.sendImage(url: url.path(percentEncoded: false), thumbnailUrl: thumbnailURL.path(percentEncoded: false), imageInfo: imageInfo, caption: nil, formattedCaption: nil, storeInCache: false, progressWatcher: UploadProgressListener { progress in
-            progressSubject?.send(progress)
-        })
+        let handle = timeline.sendImage(url: url.path(percentEncoded: false),
+                                        thumbnailUrl: thumbnailURL.path(percentEncoded: false),
+                                        imageInfo: imageInfo,
+                                        caption: nil,
+                                        formattedCaption: nil,
+                                        storeInCache: true,
+                                        progressWatcher: UploadProgressListener { progress in
+                                            progressSubject?.send(progress)
+                                        })
 
         await requestHandle(handle)
 
@@ -316,9 +330,15 @@ final class TimelineProxy: TimelineProxyProtocol {
                    requestHandle: @MainActor (SendAttachmentJoinHandleProtocol) -> Void) async -> Result<Void, TimelineProxyError> {
         MXLog.info("Sending video")
 
-        let handle = timeline.sendVideo(url: url.path(percentEncoded: false), thumbnailUrl: thumbnailURL.path(percentEncoded: false), videoInfo: videoInfo, caption: nil, formattedCaption: nil, storeInCache: false, progressWatcher: UploadProgressListener { progress in
-            progressSubject?.send(progress)
-        })
+        let handle = timeline.sendVideo(url: url.path(percentEncoded: false),
+                                        thumbnailUrl: thumbnailURL.path(percentEncoded: false),
+                                        videoInfo: videoInfo,
+                                        caption: nil,
+                                        formattedCaption: nil,
+                                        storeInCache: true,
+                                        progressWatcher: UploadProgressListener { progress in
+                                            progressSubject?.send(progress)
+                                        })
 
         await requestHandle(handle)
 
@@ -340,9 +360,15 @@ final class TimelineProxy: TimelineProxyProtocol {
                           requestHandle: @MainActor (SendAttachmentJoinHandleProtocol) -> Void) async -> Result<Void, TimelineProxyError> {
         MXLog.info("Sending voice message")
 
-        let handle = timeline.sendVoiceMessage(url: url.path(percentEncoded: false), audioInfo: audioInfo, waveform: waveform, caption: nil, formattedCaption: nil, storeInCache: false, progressWatcher: UploadProgressListener { progress in
-            progressSubject?.send(progress)
-        })
+        let handle = timeline.sendVoiceMessage(url: url.path(percentEncoded: false),
+                                               audioInfo: audioInfo,
+                                               waveform: waveform,
+                                               caption: nil,
+                                               formattedCaption: nil,
+                                               storeInCache: true,
+                                               progressWatcher: UploadProgressListener { progress in
+                                                   progressSubject?.send(progress)
+                                               })
 
         await requestHandle(handle)
 

diff --git a/project.yml b/project.yml
@@ -41,7 +41,7 @@ settings:
   APP_GROUP_IDENTIFIER: group.$(BASE_APP_GROUP_IDENTIFIER)
   APP_NAME: ElementX
   KEYCHAIN_ACCESS_GROUP_IDENTIFIER: "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"
-  MARKETING_VERSION: 1.9.2
+  MARKETING_VERSION: 1.9.3
   CURRENT_PROJECT_VERSION: 1
   SUPPORTS_MACCATALYST: false