element-hq/element-ios/issues/4090 - Add custom reply text to voice m…

…essages, add duration and samples to sendVoiceMessage.
matrix-org · Jul 13, 2021 · 9ca446d · 9ca446d
1 parent 71d89e1
commit 9ca446d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,12 +7,13 @@ Changes to be released in next version
 🙌 Improvements
  * MXKAttachment: Add support for all voice message types (vector-im/element-ios/issues/4094).
  * MXKRoomViewController, MXKRoomDataSource & MXKRoomInputToolbarView: Add methods to send videos as `AVAsset` objects (vector-im/element-ios/issues/4483).
+ * MXKSendReplyEventStringLocalizations: Added senderSentAVoiceMessage property
 
 🐛 Bugfix
  * 
 
 ⚠️ API Changes
- * 
+ * MXRoomDataSource: Added duration and sample parameters on the sendVoiceMessage method (vector-im/element-ios/issues/4090)
 
 🗣 Translations
  * 

diff --git a/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings b/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings
@@ -255,6 +255,7 @@
 "message_reply_to_sender_sent_an_image" = "sent an image.";
 "message_reply_to_sender_sent_a_video" = "sent a video.";
 "message_reply_to_sender_sent_an_audio_file" = "sent an audio file.";
+"message_reply_to_sender_sent_a_voice_message" = "sent a voice message.";
 "message_reply_to_sender_sent_a_file" = "sent a file.";
 "message_reply_to_message_to_reply_to_prefix" = "In reply to";
 

diff --git a/MatrixKit/Models/Room/MXKAttachment.m b/MatrixKit/Models/Room/MXKAttachment.m
@@ -95,15 +95,13 @@ - (instancetype)initWithEvent:(MXEvent*)event andMediaManager:(MXMediaManager*)m
             {
                 _type = MXKAttachmentTypeImage;
             }
+            else if (event.isVoiceMessage)
+            {
+                _type = MXKAttachmentTypeVoiceMessage;
+            }
             else if ([msgtype isEqualToString:kMXMessageTypeAudio])
             {
-                if (eventContent[kMXMessageTypeVoiceMessage] ||
-                    eventContent[kMXMessageTypeVoiceMessageMSC2516] ||
-                    eventContent[kMXMessageTypeVoiceMessageMSC3245]) {
-                    _type = MXKAttachmentTypeVoiceMessage;
-                } else {
-                    _type = MXKAttachmentTypeAudio;
-                }
+                _type = MXKAttachmentTypeAudio;
             }
             else if ([msgtype isEqualToString:kMXMessageTypeVideo])
             {

diff --git a/MatrixKit/Models/Room/MXKRoomDataSource.h b/MatrixKit/Models/Room/MXKRoomDataSource.h
@@ -546,12 +546,16 @@ extern NSString *const kMXKRoomDataSourceTimelineErrorErrorKey;
 
  @param audioFileLocalURL the local filesystem path of the audio file to send.
  @param mimeType (optional) the mime type of the file. Defaults to `audio/ogg`
+ @param duration the length of the voice message in milliseconds
+ @param samples an array of floating point values normalized to [0, 1], boxed within NSNumbers
  @param success A block object called when the operation succeeds. It returns
                 the event id of the event generated on the homeserver
  @param failure A block object called when the operation fails.
  */
 - (void)sendVoiceMessage:(NSURL *)audioFileLocalURL
                 mimeType:mimeType
+                duration:(NSTimeInterval)duration
+                 samples:(NSArray<NSNumber *> *)samples
                  success:(void (^)(NSString *))success
                  failure:(void (^)(NSError *))failure;
 

diff --git a/MatrixKit/Models/Room/MXKRoomDataSource.m b/MatrixKit/Models/Room/MXKRoomDataSource.m
@@ -1885,11 +1885,16 @@ - (void)sendAudioFile:(NSURL *)audioFileLocalURL mimeType:mimeType success:(void
     }
 }
 
-- (void)sendVoiceMessage:(NSURL *)audioFileLocalURL mimeType:mimeType success:(void (^)(NSString *))success failure:(void (^)(NSError *))failure
+- (void)sendVoiceMessage:(NSURL *)audioFileLocalURL
+                mimeType:mimeType
+                duration:(NSTimeInterval)duration
+                 samples:(NSArray<NSNumber *> *)samples
+                 success:(void (^)(NSString *))success
+                 failure:(void (^)(NSError *))failure
 {
     __block MXEvent *localEchoEvent = nil;
 
-    [_room sendVoiceMessage:audioFileLocalURL mimeType:mimeType localEcho:&localEchoEvent success:success failure:failure keepActualFilename:YES];
+    [_room sendVoiceMessage:audioFileLocalURL mimeType:mimeType duration:duration samples:samples localEcho:&localEchoEvent success:success failure:failure keepActualFilename:YES];
 
     if (localEchoEvent)
     {

diff --git a/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizations.h b/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizations.h
@@ -25,6 +25,7 @@
 @property (copy, readonly, nonnull) NSString *senderSentAnImage;
 @property (copy, readonly, nonnull) NSString *senderSentAVideo;
 @property (copy, readonly, nonnull) NSString *senderSentAnAudioFile;
+@property (copy, readonly, nonnull) NSString *senderSentAVoiceMessage;
 @property (copy, readonly, nonnull) NSString *senderSentAFile;
 @property (copy, readonly, nonnull) NSString *messageToReplyToPrefix;
 

diff --git a/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizations.m b/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizations.m
@@ -28,6 +28,7 @@ - (instancetype)init
         _senderSentAnImage = [NSBundle mxk_localizedStringForKey:@"message_reply_to_sender_sent_an_image"];
         _senderSentAVideo = [NSBundle mxk_localizedStringForKey:@"message_reply_to_sender_sent_a_video"];
         _senderSentAnAudioFile = [NSBundle mxk_localizedStringForKey:@"message_reply_to_sender_sent_an_audio_file"];
+        _senderSentAVoiceMessage = [NSBundle mxk_localizedStringForKey:@"message_reply_to_sender_sent_a_voice_message"];
         _senderSentAFile = [NSBundle mxk_localizedStringForKey:@"message_reply_to_sender_sent_a_file"];
         _messageToReplyToPrefix = [NSBundle mxk_localizedStringForKey:@"message_reply_to_message_to_reply_to_prefix"];                
     }