element-hq/element-ios/issues/4090 - Made sendVoiceMessage `mimeTyp…

…e` optional, defaulting to `audio/ogg`.
matrix-org · Jun 9, 2021 · f85f0f3 · f85f0f3
1 parent 5fea5d4
commit f85f0f3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,7 @@ Changes to be released in next version
  * MXRoomSummary: `lastMessageEvent` property removed for performance reasons (vector-im/element-ios/issues/4360).
  * MXRoomSummary: All properties about lastMessage are moved into `lastMessage` property.
  * MXSession: Does not compute anymore last events for every room summaries by default. Use -[MXSession eventWithEventId:inRoom:success:failure:] method to load the last event for a room summary.
+ * MXRoom: Added method for seding voice messages (vector-im/element-ios/issues/4090).
 
 🗣 Translations
  * 

diff --git a/MatrixSDK/Contrib/Swift/Data/MXRoom.swift b/MatrixSDK/Contrib/Swift/Data/MXRoom.swift
@@ -300,7 +300,7 @@ public extension MXRoom {
      
      - parameters:
      - localURL: the local filesystem path of the file to send.
-     - mimeType: the mime type of the file.
+     - mimeType: (optional) the mime type of the file. Defaults to `audio/ogg`.
      - localEcho: a pointer to a MXEvent object.
      
      This pointer is set to an actual MXEvent object
@@ -319,7 +319,7 @@ public extension MXRoom {
      - returns: a `MXHTTPOperation` instance.
      */
 
-    @nonobjc @discardableResult func sendVoiceMessage(localURL: URL, mimeType: String, localEcho: inout MXEvent?, completion: @escaping (_ response: MXResponse<String?>) -> Void) -> MXHTTPOperation {
+    @nonobjc @discardableResult func sendVoiceMessage(localURL: URL, mimeType: String?, localEcho: inout MXEvent?, completion: @escaping (_ response: MXResponse<String?>) -> Void) -> MXHTTPOperation {
         return __sendVoiceMessage(localURL, mimeType: mimeType, localEcho: &localEcho, success: currySuccess(completion), failure: curryFailure(completion), keepActualFilename: false)
     }
 

diff --git a/MatrixSDK/Data/MXRoom.h b/MatrixSDK/Data/MXRoom.h
@@ -477,7 +477,7 @@ FOUNDATION_EXPORT NSString *const kMXRoomDidFlushDataNotification;
  Send a voice message to the room.
  
  @param fileLocalURL the local filesystem path of the file to send.
- @param mimeType the mime type of the file.
+ @param mimeType (optional) the mime type of the file. Defaults to `audio/ogg`
  @param localEcho a pointer to a MXEvent object (@see sendMessageWithContent: for details).
  @param success A block object called when the operation succeeds. It returns
  the event id of the event generated on the home server

diff --git a/MatrixSDK/Data/MXRoom.m b/MatrixSDK/Data/MXRoom.m
@@ -1391,7 +1391,7 @@ - (MXHTTPOperation*)sendVoiceMessage:(NSURL*)fileLocalURL
     return [self _sendFile:fileLocalURL
                    msgType:kMXMessageTypeAudio
            additionalTypes:@{kMXMessageTypeVoiceMessage : @{}}
-                  mimeType:mimeType
+                  mimeType:(mimeType ?: @"audio/ogg")
                  localEcho:localEcho
                    success:success
                    failure:failure