Merge pull request #539 from vector-im/release-v0.1.15

Release v0.1.15

Author: manuroe

CHANGES.rst

@@ -1,3 +1,33 @@
+Changes in Vector iOS in 0.1.15 (2016-08-25)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.3.14).
+ * Add conference call.
+ * Add the Vector VoIP call screen #455.
+ * Speed up app startup #376.
+ * Call: Update the libjingle lib to its latest version. We now use the pod from https://github.com/Anakros/WebRTC-iOS.
+ * Conference call: Add an enabler button in Settings > LABS.
+ * Conference call: Add ongoing conference call banner.
+ * Banned user list are shown in room settings #450.
+ * Display the list of ignored users in user settings #451.
+ * Media Picker: Allow multi selection of pictures #301.
+ * Settings: Adjust the section header display.
+ 
+Bug fixes:
+ * Redacting membership events should immediately reset the displayname & avatar of room members #443.
+ * Profile changes shouldn't reorder the room list #494.
+ * Media album: The aspect fill ratio is not respected #495.
+ * "Return to call" banner: Use the Vector green for the background #482.
+ * Tapping on the room details for Matrix HQ freezes the app for about 5s #499.
+ * Crash in [AppDelegate applicationDidBecomeActive:] #489.
+ * Chat screen: tapping resend now does nothing #510.
+ * Conference call: The initialisation of a conference call silently fails when the room member has not enough power level (https://github.com/vector-im/vector-im/vector-web#1948).
+ * When the last message is redacted, [MXKRecentCellData update] makes paginations loops #520.
+ * MXSession: Do not send kMXSessionIgnoredUsersDidChangeNotification when the session loads the data from the store #491.
+ * MXHTTPClient: Fix crash: "Task created in a session that has been invalidated" #490.
+ * Call: the remote and local video are not scaled to fill the video container #537.
+ 
 Changes in Vector iOS in 0.1.14 (2016-08-01)
 ===============================================
 

Podfile

@@ -8,7 +8,7 @@ target "Vector" do
 
 # Different flavours of pods to MatrixKit
 # The tagged version on which this version of Vector has been built
-pod 'MatrixKit', '0.3.13'
+pod 'MatrixKit', '0.3.14'
 
 # The lastest release available on the CocoaPods repository 
 #pod 'MatrixKit'
@@ -27,7 +27,7 @@ pod 'GBDeviceInfo', '~> 4.1.0'
 pod 'GoogleAnalytics'
 
 # The Google WebRTC stack
-pod 'libjingle_peerconnection'
+pod 'WebRTC', '1.0.13807'
 
 end
 

Podfile.lock

@@ -29,38 +29,38 @@ PODS:
     - GBDeviceInfo/Core (= 4.1.0)
   - GBDeviceInfo/Core (4.1.0)
   - GHMarkdownParser (0.1.2)
-  - GoogleAnalytics (3.14.0)
+  - GoogleAnalytics (3.16.0)
   - HPGrowingTextView (1.1)
-  - libjingle_peerconnection (11177.2.0)
-  - libPhoneNumber-iOS (0.8.15)
-  - MatrixKit (0.3.13):
+  - libPhoneNumber-iOS (0.8.16)
+  - MatrixKit (0.3.14):
     - DTCoreText (~> 1.6.17)
     - GHMarkdownParser (~> 0.1.2)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.8.14)
-    - MatrixSDK (= 0.6.12)
-  - MatrixSDK (0.6.12):
+    - MatrixSDK (= 0.6.13)
+  - MatrixSDK (0.6.13):
     - AFNetworking (~> 3.1.0)
+  - WebRTC (1.0.13807)
 
 DEPENDENCIES:
   - GBDeviceInfo (~> 4.1.0)
   - GoogleAnalytics
-  - libjingle_peerconnection
-  - MatrixKit (= 0.3.13)
+  - MatrixKit (= 0.3.14)
+  - WebRTC (= 1.0.13807)
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   DTCoreText: 3ea8bba23dd2141ba18adb227a7dd33a822df1c4
   DTFoundation: 3b6b1b817d2a7fb02e7eaf2596c922a68145bd43
   GBDeviceInfo: e50df975a95e21faec93e2bf98376846fe17d307
   GHMarkdownParser: 14cbf59d0ab9450017d843dffd4a3ef691e5bd77
-  GoogleAnalytics: 9be1afdb8deeac4bb5f13ca7f7d3b9db2a1f43dc
+  GoogleAnalytics: 3de986b2fa29012c69fa415566006a9c9cf25320
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
-  libjingle_peerconnection: 3458f646ddd61f08a9f3a0c43fb01fff5c165eb8
-  libPhoneNumber-iOS: 62a740e1ea5741060f5cec0f788b52071115cf31
-  MatrixKit: 4ed4963069510e2be2349d3310602a03b9d3a043
-  MatrixSDK: 15f165271e3c677060be1f131edef9e643067677
+  libPhoneNumber-iOS: acb5805f67892db37adc3440290a367923672b51
+  MatrixKit: c8855ccd0186e2e2c1dd359767d87a056bdcb17e
+  MatrixSDK: d848e4050411f66061f98b77f8bcb1a1eca377a2
+  WebRTC: 5263e2983d21b6c53e0e6859aaf8aabeee6bafdf
 
-PODFILE CHECKSUM: 0f4ac1211874e84d41b66ba970dd2d15eb65242c
+PODFILE CHECKSUM: d21a2f5518b49b8812b1a9cfa94a094aa41e17c8
 
 COCOAPODS: 1.0.1

Vector.xcodeproj/project.pbxproj

@@ -30,6 +30,11 @@
  */
 extern NSString *const kAppDelegateDidTapStatusBarNotification;
 
+/**
+ Posted when the property 'isOffline' has changed. This property is related to the network reachability status.
+ */
+extern NSString *const kAppDelegateNetworkStatusDidChangeNotification;
+
 @interface AppDelegate : UIResponder <UIApplicationDelegate, MXKCallViewControllerDelegate, UISplitViewControllerDelegate, UINavigationControllerDelegate>
 {
     BOOL isAPNSRegistered;
@@ -111,5 +116,9 @@ extern NSString *const kAppDelegateDidTapStatusBarNotification;
  */
 - (BOOL)handleUniversalLinkFragment:(NSString*)fragment;
 
+#pragma mark - Call status handling
+
+- (void)returnToCallView;
+
 @end
 

Vector/AppDelegate.h

@@ -39,6 +39,8 @@
 
 #import <AudioToolbox/AudioToolbox.h>
 
+#import "CallViewController.h"
+
 //#define MX_CALL_STACK_OPENWEBRTC
 #ifdef MX_CALL_STACK_OPENWEBRTC
 #import <MatrixOpenWebRTCWrapper/MatrixOpenWebRTCWrapper.h>
@@ -56,6 +58,7 @@
 #define MAKE_NS_STRING(x) @MAKE_STRING(x)
 
 NSString *const kAppDelegateDidTapStatusBarNotification = @"kAppDelegateDidTapStatusBarNotification";
+NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateNetworkStatusDidChangeNotification";
 
 @interface AppDelegate ()
 {
@@ -88,7 +91,7 @@ @interface AppDelegate ()
     /**
      The current call view controller (if any).
      */
-    MXKCallViewController *currentCallViewController;
+    CallViewController *currentCallViewController;
 
     /**
      Call status window displayed when user goes back to app during a call.
@@ -148,6 +151,7 @@ The room id of the current handled remote notification (if any)
 }
 
 @property (strong, nonatomic) MXKAlert *mxInAppNotification;
+@property (strong, nonatomic) MXKAlert *incomingCallNotification;
 
 @end
 
@@ -222,7 +226,12 @@ - (void)setIsOffline:(BOOL)isOffline
         }];
     }
 
-    _isOffline = isOffline;
+    if (_isOffline != isOffline)
+    {
+        _isOffline = isOffline;
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:kAppDelegateNetworkStatusDidChangeNotification object:nil];
+    }
 }
 
 #pragma mark - UIApplicationDelegate
@@ -362,7 +371,6 @@ - (void)applicationDidEnterBackground:(UIApplication *)application
     }
     [[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:nil];
     [[AFNetworkReachabilityManager sharedManager] stopMonitoring];
-    _isOffline = NO;
 
     // check if some media must be released to reduce the cache size
     [MXKMediaManager reduceCacheSizeToInsert:0];
@@ -482,7 +490,7 @@ - (void)applicationWillTerminate:(UIApplication *)application
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler
 {
-    BOOL continueUserActivity;
+    BOOL continueUserActivity = NO;
 
     if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb])
     {
@@ -1267,6 +1275,9 @@ - (void)initMatrixSessions
                 [self enableNoVoIPOnMatrixSession:mxSession];
             }
 
+            // Ignore the room member profile changes during the last message process in each room.
+            mxSession.ignoreProfileChangesDuringLastMessageProcessing = YES;
+            
             // Each room member will be considered as a potential contact.
             [MXKContactManager sharedManager].contactManagerMXRoomSource = MXKContactManagerMXRoomSourceAll;
         }
@@ -1356,6 +1367,15 @@ - (void)initMatrixSessions
 
     }];
 
+    [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionDidCorruptDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification * _Nonnull notif) {
+        
+        NSLog(@"[AppDelegate] kMXSessionDidCorruptDataNotification received. Reload the app");
+        
+        // Reload entirely the app when a session has corrupted its data
+        [[AppDelegate theDelegate] reloadMatrixSessions:YES];
+        
+    }];
+    
     // Observe settings changes
     [[MXKAppSettings standardAppSettings]  addObserver:self forKeyPath:@"showAllEventsInRoomHistory" options:0 context:nil];
 
@@ -1517,17 +1537,88 @@ - (void)addMatrixCallObserver
         {
             MXCall *mxCall = (MXCall*)notif.object;
 
-            currentCallViewController = [MXKCallViewController callViewController:mxCall];
+            // Prepare the call view controller
+            currentCallViewController = [CallViewController callViewController:mxCall];
             currentCallViewController.delegate = self;
 
-            // FIXME GFO Check whether present call from self.window.rootViewController is working
-            [self.window.rootViewController presentViewController:currentCallViewController animated:YES completion:^{
-                currentCallViewController.isPresented = YES;
-            }];
-            
-            // Hide system status bar
-            [UIApplication sharedApplication].statusBarHidden = YES;
+            if (mxCall.isIncoming)
+            {
+                // Prompt user before presenting the call view controller
+                NSString *callPromptFormat = mxCall.isVideoCall ? NSLocalizedStringFromTable(@"call_incoming_video_prompt", @"Vector", nil) : NSLocalizedStringFromTable(@"call_incoming_voice_prompt", @"Vector", nil);
+                NSString *callerName = currentCallViewController.peer.displayname;
+                if (!callerName.length)
+                {
+                    callerName = currentCallViewController.peer.userId;
+                }
+                NSString *callPrompt = [NSString stringWithFormat:callPromptFormat, callerName];
+                
+                __weak typeof(self) weakSelf = self;
+                
+                // Removing existing notification (if any)
+                [_incomingCallNotification dismiss:NO];
+                
+                
+                
+                _incomingCallNotification = [[MXKAlert alloc] initWithTitle:callPrompt
+                                                                    message:nil
+                                                                      style:MXKAlertStyleAlert];
+                
+                _incomingCallNotification.cancelButtonIndex = [_incomingCallNotification addActionWithTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil)
+                                                                                                      style:MXKAlertActionStyleDefault
+                                                                                                    handler:^(MXKAlert *alert) {
+                                                                                                        
+                                                                                                        if (weakSelf)
+                                                                                                        {
+                                                                                                            __strong __typeof(weakSelf)strongSelf = weakSelf;
+                                                                                                            
+                                                                                                            strongSelf.incomingCallNotification = nil;
+                                                                                                            
+                                                                                                            [strongSelf->currentCallViewController onButtonPressed:strongSelf->currentCallViewController.rejectCallButton];
+                                                                                                            
+                                                                                                            mxCall.delegate = nil;
+                                                                                                            currentCallViewController = nil;
+                                                                                                        }
+                                                                                                        
+                                                                                                    }];
+                
+                [_incomingCallNotification addActionWithTitle:NSLocalizedStringFromTable(@"accept", @"Vector", nil)
+                                                        style:MXKAlertActionStyleDefault
+                                                      handler:^(MXKAlert *alert) {
+                                                          if (weakSelf)
+                                                          {
+                                                              __strong __typeof(weakSelf)strongSelf = weakSelf;
+                                                              
+                                                              strongSelf.incomingCallNotification = nil;
+                                                              
+                                                              [strongSelf->currentCallViewController onButtonPressed:strongSelf->currentCallViewController.answerCallButton];
+                                                              
+                                                              [strongSelf.window.rootViewController presentViewController:strongSelf->currentCallViewController animated:YES completion:^{
+                                                                  
+                                                                  strongSelf->currentCallViewController.isPresented = YES;
+                                                                  
+                                                              }];
+                                                              
+                                                              // Hide system status bar
+                                                              [UIApplication sharedApplication].statusBarHidden = YES;
+                                                              
+                                                          }
+                                                      }];
+                
+                [_incomingCallNotification showInViewController:self.window.rootViewController];
+            }
+            else
+            {
+                [self.window.rootViewController presentViewController:currentCallViewController animated:YES completion:^{
+                    
+                    currentCallViewController.isPresented = YES;
+                    
+                }];
+                
+                // Hide system status bar
+                [UIApplication sharedApplication].statusBarHidden = YES;
+            }
         }
+        
     }];
 }
 
@@ -1776,12 +1867,28 @@ - (void)startPrivateOneToOneRoomWithUserId:(NSString*)userId completion:(void (^
 
 #pragma mark - MXKCallViewControllerDelegate
 
-- (void)dismissCallViewController:(MXKCallViewController *)callViewController
+- (void)dismissCallViewController:(MXKCallViewController *)callViewController completion:(void (^)())completion
 {
     if (callViewController == currentCallViewController)
     {
-        
-        if (callViewController.isPresented)
+        if (_incomingCallNotification)
+        {
+            // The user was prompted for an incoming call which ended
+            // The call view controller was not presented yet.
+            [_incomingCallNotification dismiss:NO];
+            _incomingCallNotification = nil;
+            
+            // Release properly
+            currentCallViewController.mxCall.delegate = nil;
+            currentCallViewController.delegate = nil;
+            currentCallViewController = nil;
+            
+            if (completion)
+            {
+                completion();
+            }
+        }
+        else if (callViewController.isPresented)
         {
             BOOL callIsEnded = (callViewController.mxCall.state == MXCallStateEnded);
             NSLog(@"Call view controller is dismissed (%d)", callIsEnded);
@@ -1793,6 +1900,11 @@ - (void)dismissCallViewController:(MXKCallViewController *)callViewController
                 {
                     [self addCallStatusBar];
                 }
+                
+                if (completion)
+                {
+                    completion();
+                }
             }];
 
             if (callIsEnded)
@@ -1807,12 +1919,13 @@ - (void)dismissCallViewController:(MXKCallViewController *)callViewController
                 currentCallViewController.delegate = nil;
                 currentCallViewController = nil;
             }
-        } else
+        }
+        else
         {
             // Here the presentation of the call view controller is in progress
             // Postpone the dismiss
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [self dismissCallViewController:callViewController];
+                [self dismissCallViewController:callViewController completion:completion];
             });
         }
     }
@@ -1837,7 +1950,7 @@ - (void)addCallStatusBar
     [callStatusBarButton setTitle:btnTitle forState:UIControlStateHighlighted];
     callStatusBarButton.titleLabel.textColor = [UIColor whiteColor];
 
-    [callStatusBarButton setBackgroundColor:[UIColor blueColor]];
+    [callStatusBarButton setBackgroundColor:kVectorColorGreen];
     [callStatusBarButton addTarget:self action:@selector(returnToCallView) forControlEvents:UIControlEventTouchUpInside];
 
     // Place button into the new window
@@ -1875,7 +1988,6 @@ - (void)returnToCallView
 {
     [self removeCallStatusBar];
 
-    // FIXME GFO check whether self.window.rootViewController may present the call
     [self.window.rootViewController presentViewController:currentCallViewController animated:YES completion:^{
         currentCallViewController.isPresented = YES;
     }];