Merge branch 'release/0.15.2/master'

CHANGES.rst

@@ -1,3 +1,30 @@
+Changes in 0.15.2 (2021-06-24)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * 
+
+🐛 Bugfix
+ * 
+
+⚠️ API Changes
+ * MXKAttachment: Added MXKAttachmentTypeVoiceMessage attachment type (vector-im/element-ios/issues/4090).
+
+🗣 Translations
+ * 
+
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+ * Upgrade MatrixSDK version ([v0.19.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.19.2)).
+
 Changes in 0.15.1 (2021-06-21)
 =================================================
 

MatrixKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.15.1"
+  s.version      = "0.15.2"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = '5.0'
 
-  s.dependency 'MatrixSDK', "= 0.19.1"
+  s.dependency 'MatrixSDK', "= 0.19.2"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.25'

MatrixKit/Assets/MatrixKitAssets.bundle/de.lproj/MatrixKit.strings

@@ -489,3 +489,4 @@
 "call_voice_with_user" = "Sprachanruf mit %@";
 "call_ringing" = "Läuten…";
 "e2e_passphrase_too_short" = "Passphrase zu kurz (Minimum sind %d Zeichen)";
+"call_consulting_with_user" = "Bei %@ anfragen";

MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings

@@ -332,6 +332,8 @@
 "local_contacts_access_discovery_warning_title" = "Users discovery";
 "local_contacts_access_discovery_warning" = "To discover contacts already using Matrix, %@ can send email addresses and phone numbers in your address book to your chosen Matrix identity server. Where supported, personal data is hashed before sending - please check your identity server's privacy policy for more details.";
 
+"microphone_access_not_granted_for_voice_message" = "Voice messages require access to the Microphone but %@ doesn't have permission to use it";
+
 // Country picker
 "country_picker_title" = "Choose a country";
 

MatrixKit/MatrixKitVersion.m

@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixKitVersion = @"0.15.1";
+NSString *const MatrixKitVersion = @"0.15.2";

MatrixKit/Models/Room/MXKAttachment.h

@@ -29,6 +29,7 @@ typedef enum : NSUInteger {
     MXKAttachmentTypeUndefined,
     MXKAttachmentTypeImage,
     MXKAttachmentTypeAudio,
+    MXKAttachmentTypeVoiceMessage,
     MXKAttachmentTypeVideo,
     MXKAttachmentTypeLocation,
     MXKAttachmentTypeFile,

MatrixKit/Models/Room/MXKAttachment.m

@@ -97,7 +97,11 @@ - (instancetype)initWithEvent:(MXEvent*)event andMediaManager:(MXMediaManager*)m
             }
             else if ([msgtype isEqualToString:kMXMessageTypeAudio])
             {
-                _type = MXKAttachmentTypeAudio;
+                if (eventContent[kMXMessageTypeVoiceMessage]) {
+                    _type = MXKAttachmentTypeVoiceMessage;
+                } else {
+                    _type = MXKAttachmentTypeAudio;
+                }
             }
             else if ([msgtype isEqualToString:kMXMessageTypeVideo])
             {

MatrixKit/Models/Room/MXKRoomBubbleCellData.m

@@ -427,7 +427,7 @@ - (void)prepareBubbleComponentsPosition
 
     if (firstComponent)
     {
-        CGFloat positionY = (attachment == nil || attachment.type == MXKAttachmentTypeFile || attachment.type == MXKAttachmentTypeAudio) ? MXKROOMBUBBLECELLDATA_TEXTVIEW_DEFAULT_VERTICAL_INSET : 0;
+        CGFloat positionY = (attachment == nil || attachment.type == MXKAttachmentTypeFile || attachment.type == MXKAttachmentTypeAudio || attachment.type == MXKAttachmentTypeVoiceMessage) ? MXKROOMBUBBLECELLDATA_TEXTVIEW_DEFAULT_VERTICAL_INSET : 0;
         firstComponent.position = CGPointMake(0, positionY);
     }
 }

MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.m

@@ -1092,7 +1092,7 @@ - (BOOL)shouldInteractWithURL:(NSURL *)URL urlItemInteractionValue:(NSNumber*)ur
 - (BOOL)isBubbleDataContainsFileAttachment
 {
     return bubbleData.attachment
-    && (bubbleData.attachment.type == MXKAttachmentTypeFile || bubbleData.attachment.type == MXKAttachmentTypeAudio)
+    && (bubbleData.attachment.type == MXKAttachmentTypeFile || bubbleData.attachment.type == MXKAttachmentTypeAudio || bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage)
     && bubbleData.attachment.contentURL
     && bubbleData.attachment.contentInfo;
 }

Podfile

@@ -8,7 +8,7 @@ abstract_target 'MatrixKitSamplePods' do
 
     # Different flavours of pods to Matrix SDK
     # The tagged version on which this version of MatrixKit has been built
-    pod 'MatrixSDK', '= 0.19.1'
+    pod 'MatrixSDK', '= 0.19.2'
 
     # The lastest release available on the CocoaPods repository
     #pod 'MatrixSDK'

Podfile.lock

@@ -39,9 +39,9 @@ PODS:
   - JSQSystemSoundPlayer (2.0.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
-  - MatrixSDK (0.19.1):
-    - MatrixSDK/Core (= 0.19.1)
-  - MatrixSDK/Core (0.19.1):
+  - MatrixSDK (0.19.2):
+    - MatrixSDK/Core (= 0.19.2)
+  - MatrixSDK/Core (0.19.2):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -64,7 +64,7 @@ DEPENDENCIES:
   - HPGrowingTextView (~> 1.1)
   - JSQMessagesViewController (~> 7.3.5)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.19.1)
+  - MatrixSDK (= 0.19.2)
 
 SPEC REPOS:
   trunk:
@@ -94,11 +94,11 @@ SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
-  MatrixSDK: e02c4998a4fea689000feb9c70f7df62c4443481
+  MatrixSDK: f36fd5831ba91eb4ce0bf3ebe702b83875a296a5
   OLMKit: 2d73cd67d149b5c3e3a8eb8ecae93d0b429d8a02
   Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
 
-PODFILE CHECKSUM: bcd6f6067f0fa97b510fa3eb7b48c1cf10f2b9f0
+PODFILE CHECKSUM: 84120b91a3c48d2918082013c9906ea104df364e
 
 COCOAPODS: 1.10.1