Merge branch 'release/1.11.20/master'

element-hq · Nov 12, 2024 · e3299db · e3299db
2 parents f823ab9 + 8ffed9f
commit e3299db
Show file tree

Hide file tree

Showing 24 changed files with 206 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+## Changes in 1.11.20 (2024-11-12)
+
+No significant changes.
+
+
 ## Changes in 1.11.19 (2024-10-15)
 
 No significant changes.

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.11.19
-CURRENT_PROJECT_VERSION = 1.11.19
+MARKETING_VERSION = 1.11.20
+CURRENT_PROJECT_VERSION = 1.11.20
diff --git a/Podfile.lock b/Podfile.lock
@@ -39,16 +39,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.13):
-    - MatrixSDK/Core (= 0.27.13)
-  - MatrixSDK/Core (0.27.13):
+  - MatrixSDK (0.27.15):
+    - MatrixSDK/Core (= 0.27.15)
+  - MatrixSDK/Core (0.27.15):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDKCrypto (= 0.4.3)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.13):
+  - MatrixSDK/JingleCallStack (0.27.15):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.4.3)
@@ -179,7 +179,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: b5756a518af19296b94e3ad9b6f16648f9eb17c3
+  MatrixSDK: 12b379749b84ab5b3662042acb1914b9f9bb692b
   MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
@@ -200,4 +200,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 484a1cdf04951cc82156f29de196efd76d3ad893
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3
diff --git a/Riot/Assets/en.lproj/Localizable.strings b/Riot/Assets/en.lproj/Localizable.strings
@@ -182,6 +182,8 @@
 /* Group call from user, CallKit caller name */
 "GROUP_CALL_FROM_USER" = "%@ (Group call)";
 
+"UNSUPPORTED_CALL" = "Unsupported call";
+
 /** Key verification **/
 
 "KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ wants to verify";
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
@@ -1253,6 +1253,7 @@ Tap the + to start adding people.";
 "call_no_stun_server_error_use_fallback_button" = "Try using %@";
 
 "call_actions_unhold" = "Resume";
+"call_unsupported_matrix_rtc_call" = "Unsupported call. The new Element X app is needed to join this call.";
 
 // No VoIP support
 "no_voip_title" = "Incoming call";

diff --git a/Riot/Assets/et.lproj/Localizable.strings b/Riot/Assets/et.lproj/Localizable.strings
@@ -121,3 +121,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ alustas ringhäälingukõnet";
+"UNSUPPORTED_CALL" = "See kõne pole toetatud";
diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings
@@ -2726,3 +2726,4 @@
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Peida tekstitoimeti";
 "wysiwyg_composer_action_maximise_action" = "Ava tekstitoimeti";
+"call_unsupported_matrix_rtc_call" = "See kõne pole toetatud. Kõnega liitumiseks palun kasuta uut Element X rakendust.";
diff --git a/Riot/Assets/id.lproj/Localizable.strings b/Riot/Assets/id.lproj/Localizable.strings
@@ -175,3 +175,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ memulai sebuah siaran suara";
+"UNSUPPORTED_CALL" = "Panggilan tidak didukung";
diff --git a/Riot/Assets/id.lproj/Vector.strings b/Riot/Assets/id.lproj/Vector.strings
@@ -2981,3 +2981,4 @@
 "wysiwyg_composer_action_minimise_action" = "Kecilkan komposer";
 "wysiwyg_composer_action_maximise_action" = "Luaskan komposer";
 "room_action_report" = "Laporkan ruangan";
+"call_unsupported_matrix_rtc_call" = "Panggilan tidak didukung. Aplikasi Element X diperlukan untuk bergabung ke panggilan ini.";
diff --git a/Riot/Assets/nb.lproj/Localizable.strings b/Riot/Assets/nb.lproj/Localizable.strings
@@ -64,3 +64,104 @@
 
 /* New message from a specific person, not referencing a room */
 "MSG_FROM_USER" = "%@ sendte en melding";
+
+/* A single unread message */
+"SINGLE_UNREAD" = "Du har mottatt en melding";
+
+/* New file message from a specific person, not referencing a room. */
+"LOCATION_FROM_USER" = "%@ delte posisjonen sin";
+
+/** Media Messages **/
+
+/* New image message from a specific person, not referencing a room. */
+"PICTURE_FROM_USER" = "%@ sendte et bilde";
+
+/* New video message from a specific person, not referencing a room. */
+"VIDEO_FROM_USER" = "%@ sendte en video";
+
+/* New audio message from a specific person, not referencing a room. */
+"AUDIO_FROM_USER" = "%@ sendte en lydfil %@";
+
+/* New voice message from a specific person, not referencing a room. */
+"VOICE_MESSAGE_FROM_USER" = "%@ sendte en talemelding";
+
+/* New file message from a specific person, not referencing a room. */
+"FILE_FROM_USER" = "%@ sendte en fil %@";
+
+/* New image message from a specific person in a named room. */
+"IMAGE_FROM_USER_IN_ROOM" = "%@ postet et bilde %@ i %@";
+
+/* A user has change their name to a new name which we don't know */
+"GENERIC_USER_UPDATED_DISPLAYNAME" = "%@ har endret navn";
+
+/* A user's membership has updated in an unknown way */
+"USER_MEMBERSHIP_UPDATED" = "%@ har oppdatert profilen";
+
+/* A single unread message in a room */
+"SINGLE_UNREAD_IN_ROOM" = "Du mottok en melding i %@";
+
+/** Invites **/
+
+/* A user has invited you to a chat */
+"USER_INVITE_TO_CHAT" = "%@ har invitert deg til en chat";
+
+/* A user has invited you to an (unamed) group chat */
+"USER_INVITE_TO_CHAT_GROUP_CHAT" = "%@ har invitert deg til en gruppechat";
+
+/* A user has invited you to a named room */
+"USER_INVITE_TO_NAMED_ROOM" = "%@ har invitert deg til %@";
+
+/* Incoming one-to-one video call */
+"VIDEO_CALL_FROM_USER" = "Videoanrop fra %@";
+
+/* Incoming unnamed voice conference invite from a specific person */
+"VOICE_CONF_FROM_USER" = "Gruppeanrop fra %@";
+
+/* Incoming unnamed video conference invite from a specific person */
+"VIDEO_CONF_FROM_USER" = "Videogruppeanrop fra %@";
+
+/* Incoming named video conference invite from a specific person */
+"VIDEO_CONF_NAMED_FROM_USER" = "Videogruppeanrop fra %@: '%@'";
+
+/** Reactions **/
+
+/* A user has reacted to a message, including the reaction e.g. "Alice reacted 👍". */
+"REACTION_FROM_USER" = "%@ reagerte %@";
+
+/* A user has reacted to a message, but the reaction content is unknown */
+"GENERIC_REACTION_FROM_USER" = "%@ sendte en reaksjon";
+
+/* A user has change their avatar */
+"USER_UPDATED_AVATAR" = "%@ har endret avatar";
+
+/* A user added a Jitsi call to a room */
+"GROUP_CALL_STARTED" = "Gruppeanrop startet";
+
+/* Group call from user, CallKit caller name */
+"GROUP_CALL_FROM_USER" = "%@ (Gruppeanrop)";
+
+/** Key verification **/
+
+"KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ ønsker å bekrefte";
+
+/* New message reply from a specific person, not referencing a room. */
+"REPLY_FROM_USER_TITLE" = "%@ svarte";
+
+/* New message reply from a specific person in a named room. */
+"REPLY_FROM_USER_IN_ROOM_TITLE" = "%@ svarte i %@";
+
+/** Membership Updates **/
+
+/* A user has change their name to a new name */
+"USER_UPDATED_DISPLAYNAME" = "%@ har endret navn til %@";
+
+/* Incoming named voice conference invite from a specific person */
+"VOICE_CONF_NAMED_FROM_USER" = "Gruppeanrop fra %@: '%@'";
+
+/* New message from a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM" = "%@ postet i %@";
+
+/** Calls **/
+
+/* Incoming one-to-one voice call */
+"VOICE_CALL_FROM_USER" = "Anrop fra %@";
diff --git a/Riot/Assets/pl.lproj/Vector.strings b/Riot/Assets/pl.lproj/Vector.strings
@@ -2861,3 +2861,10 @@
 "settings_manage_account_title" = "Konto";
 "settings_manage_account_action" = "Zarządzaj kontem";
 "settings_manage_account_description" = "Zarządzaj swoim kontem w %@";
+
+
+// MARK: - WYSIWYG Composer
+"wysiwyg_composer_action_minimise_action" = "Zmniejsz edytora treści";
+"wysiwyg_composer_action_maximise_action" = "Powiększ edytora treści";
+"room_action_report_prompt_reason" = "Powód zgłoszenia tego pokoju";
+"room_action_report" = "Zgłoś pokój";
diff --git a/Riot/Assets/sq.lproj/Localizable.strings b/Riot/Assets/sq.lproj/Localizable.strings
@@ -121,3 +121,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ nisi një transmetim zanor";
+"UNSUPPORTED_CALL" = "Thirrje që s’mbulohet";
diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings
@@ -2764,3 +2764,4 @@
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Tkurre hartuesin";
 "wysiwyg_composer_action_maximise_action" = "Zgjeroje hartuesin";
+"call_unsupported_matrix_rtc_call" = "Thirrje që s’mbulohet. Për të marrë pjesë në këtë thirrje, lypset aplikacioni i ri Element X.";
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
@@ -1187,6 +1187,10 @@ public class VectorL10n: NSObject {
   public static var callTransferUsers: String { 
     return VectorL10n.tr("Vector", "call_transfer_users") 
   }
+  /// Unsupported call. The new Element X app is needed to join this call.
+  public static var callUnsupportedMatrixRtcCall: String { 
+    return VectorL10n.tr("Vector", "call_unsupported_matrix_rtc_call") 
+  }
   /// Video call with %@
   public static func callVideoWithUser(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "call_video_with_user", p1)

diff --git a/Riot/Modules/MatrixKit/Models/MXKAppSettings.m b/Riot/Modules/MatrixKit/Models/MXKAppSettings.m
@@ -169,6 +169,8 @@ -(instancetype)init
             kMXEventTypeStringCallHangup,
             kMXEventTypeStringCallReject,
             kMXEventTypeStringCallNegotiate,
+            kMXEventTypeStringCallNotify,
+            kMXEventTypeStringCallNotifyUnstable,
             kMXEventTypeStringSticker,
             kMXEventTypeStringKeyVerificationCancel,
             kMXEventTypeStringKeyVerificationDone,

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.h b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
@@ -25,6 +25,7 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
     RoomBubbleCellDataTagKeyVerificationConclusion,
     RoomBubbleCellDataTagCall,
     RoomBubbleCellDataTagGroupCall,
+    RoomBubbleCellDataTagRTCCallNotify,
     RoomBubbleCellDataTagRoomCreationIntro,
     RoomBubbleCellDataTagPoll,
     RoomBubbleCellDataTagLocation,

diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -142,6 +142,14 @@ - (instancetype)initWithEvent:(MXEvent *)event andRoomState:(MXRoomState *)roomS
                 self.displayTimestampForSelectedComponentOnLeftWhenPossible = NO;
                 break;
             }
+            case MXEventTypeCallNotify:
+            {
+                self.tag = RoomBubbleCellDataTagRTCCallNotify;
+                self.collapsable = NO;
+                self.collapsed = NO;
+                self.displayTimestampForSelectedComponentOnLeftWhenPossible = NO;
+                break;
+            }
             case MXEventTypePollStart:
             case MXEventTypePollEnd:
             {
@@ -374,6 +382,11 @@ - (BOOL)hasNoDisplay
             break;
         case RoomBubbleCellDataTagVoiceBroadcastNoDisplay:
             break;
+        case RoomBubbleCellDataTagRTCCallNotify:
+        {
+            hasNoDisplay = NO;
+            break;
+        }
         default:
             hasNoDisplay = [super hasNoDisplay];
             break;
@@ -1119,6 +1132,9 @@ - (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
         case RoomBubbleCellDataTagGroupCall:
             shouldAddEvent = NO;
             break;
+        case RoomBubbleCellDataTagRTCCallNotify:
+            shouldAddEvent = NO;
+            break;
         case RoomBubbleCellDataTagRoomCreateConfiguration:
             shouldAddEvent = NO;
             break;
@@ -1193,6 +1209,9 @@ - (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
             case MXEventTypeCallReject:
                 shouldAddEvent = NO;
                 break;
+            case MXEventTypeCallNotify:
+                shouldAddEvent = NO;
+                break;
             case MXEventTypePollStart:
             case MXEventTypePollEnd:
                 shouldAddEvent = NO;

diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -3220,6 +3220,10 @@ - (RoomTimelineCellIdentifier)cellIdentifierForCellData:(MXKCellData*)cellData a
     {
         cellIdentifier = RoomTimelineCellIdentifierGroupCallStatus;
     }
+    else if (bubbleData.tag == RoomBubbleCellDataTagRTCCallNotify)
+    {
+        cellIdentifier = RoomTimelineCellIdentifierMatrixRTCCall;
+    }
     else if (bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage || bubbleData.attachment.type == MXKAttachmentTypeAudio)
     {
         if (bubbleData.isIncoming)

diff --git a/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib b/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="CallCellContentView" customModule="Riot" customModuleProvider="target">
+        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="CallCellContentView" customModule="Element" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="414" height="220"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="pdr-Jo-LHQ">
@@ -87,7 +87,7 @@
                                                         <constraint firstAttribute="height" constant="16" id="OdD-1h-kkV"/>
                                                     </constraints>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Active call" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Active call" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
                                                     <rect key="frame" x="22" y="2" width="62" height="16"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <nil key="textColor"/>

diff --git a/Riot/Modules/Room/TimelineCells/Call/MatrixRTC/RoomMatrixRTCCallCell.swift b/Riot/Modules/Room/TimelineCells/Call/MatrixRTC/RoomMatrixRTCCallCell.swift
@@ -0,0 +1,29 @@
+// 
+// Copyright 2021-2024 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
+//
+
+import UIKit
+
+@objcMembers
+class RoomMatrixRTCCallCell: RoomCallBaseCell {
+    private static var className: String { String(describing: self) }
+
+    //  MARK: - MXKCellRendering
+
+    override func render(_ cellData: MXKCellData!) {
+        super.render(cellData)
+
+        guard let bubbleCellData = cellData as? RoomBubbleCellData else { return }
+        let roomID = bubbleCellData.roomId
+        guard let room = bubbleCellData.mxSession.room(withRoomId: roomID) else { return }
+
+        room.summary.setRoomAvatarImageIn(innerContentView.avatarImageView)
+        innerContentView.avatarImageView.defaultBackgroundColor = .clear
+        innerContentView.callerNameLabel.text = room.summary.displayName
+        statusText = VectorL10n.callUnsupportedMatrixRtcCall
+        bottomContentView = nil // Expands the size of the status stack.
+    }
+}
diff --git a/Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h b/Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
@@ -128,6 +128,7 @@ typedef NS_ENUM(NSUInteger, RoomTimelineCellIdentifier) {
     // - Call
     RoomTimelineCellIdentifierDirectCallStatus,
     RoomTimelineCellIdentifierGroupCallStatus,
+    RoomTimelineCellIdentifierMatrixRTCCall,
 
     // - Voice message
     // -- Incoming

diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
@@ -235,6 +235,7 @@ - (void)registerCallCellsForTableView:(UITableView*)tableView
 {
     [tableView registerClass:RoomDirectCallStatusCell.class forCellReuseIdentifier:RoomDirectCallStatusCell.defaultReuseIdentifier];
     [tableView registerClass:RoomGroupCallStatusCell.class forCellReuseIdentifier:RoomGroupCallStatusCell.defaultReuseIdentifier];
+    [tableView registerClass:RoomMatrixRTCCallCell.class forCellReuseIdentifier:RoomMatrixRTCCallCell.defaultReuseIdentifier];
 }
 
 - (void)registerVoiceMessageCellsForTableView:(UITableView*)tableView
@@ -520,6 +521,7 @@ - (void)registerVoiceBroadcastRecorderCellsForTableView:(UITableView*)tableView
     return @{
         @(RoomTimelineCellIdentifierDirectCallStatus) : RoomDirectCallStatusCell.class,
         @(RoomTimelineCellIdentifierGroupCallStatus) : RoomGroupCallStatusCell.class,
+        @(RoomTimelineCellIdentifierMatrixRTCCall) : RoomMatrixRTCCallCell.class,
     };
 }
 

diff --git a/RiotNSE/NotificationService.swift b/RiotNSE/NotificationService.swift
@@ -577,6 +577,15 @@ class NotificationService: UNNotificationServiceExtension {
                             notificationTitle = self.messageTitle(for: eventSenderName, in: roomDisplayName)
                             notificationBody = VectorL10n.pollTimelineEndedText
 
+                        case .callNotify:
+                            if let callNotify = MXCallNotify(fromJSON: event.content) {
+                                let userIDs = callNotify.mentions.userIDs as? [String]
+                                if currentUserId.flatMap({ userIDs?.contains($0) }) ?? callNotify.mentions.room {
+                                    notificationTitle = self.messageTitle(for: eventSenderName, in: roomDisplayName)
+                                    notificationBody = NotificationService.localizedString(forKey: "UNSUPPORTED_CALL")
+                                }
+                            }
+
                         default:
                             break
                     }