Merge branch 'develop' into andy/4829_activity_indicators

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

@@ -367,7 +367,7 @@
 "notice_room_join" = "%@ joined";
 "notice_room_leave" = "%@ left";
 "notice_room_reject" = "%@ rejected the invitation";
-"notice_room_kick" = "%@ kicked %@";
+"notice_room_kick" = "%@ removed %@";
 "notice_room_unban" = "%@ unbanned %@";
 "notice_room_ban" = "%@ banned %@";
 "notice_room_withdraw" = "%@ withdrew %@'s invitation";
@@ -399,7 +399,7 @@
 "notice_room_join_by_you" = "You joined";
 "notice_room_leave_by_you" = "You left";
 "notice_room_reject_by_you" = "You rejected the invitation";
-"notice_room_kick_by_you" = "You kicked %@";
+"notice_room_kick_by_you" = "You removed %@";
 "notice_room_unban_by_you" = "You unbanned %@";
 "notice_room_ban_by_you" = "You banned %@";
 "notice_room_withdraw_by_you" = "You withdrew %@'s invitation";
@@ -479,7 +479,7 @@
 "num_members_one" = "%@ user";
 "num_members_other" = "%@ users";
 "invite" = "Invite";
-"kick" = "Kick";
+"kick" = "Remove from chat";
 "ban" = "Ban";
 "unban" = "Un-ban";
 "message_unsaved_changes" = "There are unsaved changes. Leaving will discard them.";

Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m

@@ -1422,29 +1422,31 @@ static const CGFloat kLocalPreviewMargin = 20;
     }
 }
 
-- (void)updateProximityAndSleep
-{
-    BOOL inCall = (mxCall.state == MXCallStateConnected || mxCall.state == MXCallStateRinging || mxCall.state == MXCallStateInviteSent || mxCall.state == MXCallStateConnecting || mxCall.state == MXCallStateCreateOffer || mxCall.state == MXCallStateCreateAnswer);
-    
-    if (inCall)
-    {
-        BOOL isBuiltInReceiverUsed = self.isBuiltInReceiverAudioOuput;
-        
-        // Enable the proximity monitoring when the built in receiver is used as the audio output.
-        BOOL enableProxMonitoring = isBuiltInReceiverUsed;
-        [[UIDevice currentDevice] setProximityMonitoringEnabled:enableProxMonitoring];
-        
-        // Disable the idle timer during a video call, or during a voice call which is performed with the built-in receiver.
-        // Note: if the device is locked, VoIP calling get dropped if an incoming GSM call is received.
-        BOOL disableIdleTimer = mxCall.isVideoCall || isBuiltInReceiverUsed;
-        
-        UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
-        if (sharedApplication)
-        {
-            sharedApplication.idleTimerDisabled = disableIdleTimer;
-        }
-    }
-}
+ - (void)updateProximityAndSleep
+ {
+     BOOL inCall = (mxCall.state == MXCallStateConnected || mxCall.state == MXCallStateRinging || mxCall.state == MXCallStateInviteSent || mxCall.state == MXCallStateConnecting || mxCall.state == MXCallStateCreateOffer || mxCall.state == MXCallStateCreateAnswer);
+
+     BOOL isBuiltInReceiverUsed = self.isBuiltInReceiverAudioOuput;
+     
+     // Enable the proximity monitoring when the built in receiver is used as the audio output.
+     BOOL enableProxMonitoring = inCall && isBuiltInReceiverUsed;
+     
+     UIDevice *device = [UIDevice currentDevice];
+     if (device && device.isProximityMonitoringEnabled != enableProxMonitoring)
+     {
+         [device setProximityMonitoringEnabled:enableProxMonitoring];
+     }
+
+     // Disable the idle timer during a video call, or during a voice call which is performed with the built-in receiver.
+     // Note: if the device is locked, VoIP calling get dropped if an incoming GSM call is received.
+     BOOL disableIdleTimer = inCall && (mxCall.isVideoCall || isBuiltInReceiverUsed);
+     
+     UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+     if (sharedApplication && sharedApplication.isIdleTimerDisabled != disableIdleTimer)
+     {
+         sharedApplication.idleTimerDisabled = disableIdleTimer;
+     }
+ }
 
 - (UIView *)createIncomingCallView
 {

Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.h

@@ -19,7 +19,7 @@
 #import "MXKEventFormatter.h"
 #import "MXKURLPreviewDataProtocol.h"
 
-@class MXThread;
+@protocol MXThreadProtocol;
 
 /**
  Flags to indicate if a fix is required at the display time.
@@ -108,7 +108,7 @@ typedef enum : NSUInteger {
 /**
  Thread for the bubble component. Should only exist for thread root events.
  */
-@property (nonatomic, readonly) MXThread *thread;
+@property (nonatomic, readonly) id<MXThreadProtocol> thread;
 
 /**
  Create a new `MXKRoomBubbleComponent` object based on a `MXEvent` instance.

Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.m

@@ -22,7 +22,7 @@
 
 @interface MXKRoomBubbleComponent ()
 
-@property (nonatomic, readwrite) MXThread *thread;
+@property (nonatomic, readwrite) id<MXThreadProtocol> thread;
 
 @end
 
@@ -69,8 +69,17 @@
         _showEncryptionBadge = [self shouldShowWarningBadgeForEvent:event roomState:(MXRoomState*)roomState session:session];
         
         [self updateLinkWithRoomState:roomState];
-        
-        self.thread = [session.threadingService threadWithId:event.eventId];
+
+        if (event.unsignedData.relations.thread)
+        {
+            self.thread = [[MXThreadModel alloc] initWithRootEvent:event
+                                                 notificationCount:0
+                                                    highlightCount:0];
+        }
+        else
+        {
+            self.thread = [session.threadingService threadWithId:event.eventId];
+        }
     }
     return self;
 }

Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m

@@ -955,7 +955,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
             }
             if (event.content[@"kick"])
             {
-                displayText = [NSString stringWithFormat:@"%@\n\u2022 kick: %@", displayText, event.content[@"kick"]];
+                displayText = [NSString stringWithFormat:@"%@\n\u2022 remove: %@", displayText, event.content[@"kick"]];
             }
             if (event.content[@"redact"])
             {