Merge remote-tracking branch 'origin/develop' into reskin

Riot/Modules/Authentication/Views/AuthInputsView.m

@@ -965,21 +965,10 @@
     // Check whether an account may be created without third-party identifiers.
     for (MXLoginFlow *loginFlow in currentSession.flows)
     {
-        if ([loginFlow.stages indexOfObject:kMXLoginFlowTypeDummy] != NSNotFound || [loginFlow.type isEqualToString:kMXLoginFlowTypeDummy])
+        if ([loginFlow.stages indexOfObject:kMXLoginFlowTypeEmailIdentity] == NSNotFound
+             && [loginFlow.stages indexOfObject:kMXLoginFlowTypeMSISDN] == NSNotFound)
         {
-            // The dummy flow is supported, the 3pid are then optional.
-            return NO;
-        }
-        
-        if ((loginFlow.stages.count == 1 && [loginFlow.stages[0] isEqualToString:kMXLoginFlowTypeRecaptcha]) || [loginFlow.type isEqualToString:kMXLoginFlowTypeRecaptcha])
-        {
-            // The recaptcha flow is supported alone, the 3pids are then optional.
-            return NO;
-        }
-        
-        if ((loginFlow.stages.count == 1 && [loginFlow.stages[0] isEqualToString:kMXLoginFlowTypePassword]) || [loginFlow.type isEqualToString:kMXLoginFlowTypePassword])
-        {
-            // The password flow is supported alone, the 3pids are then optional.
+            // There is a flow with no 3pids
             return NO;
         }
     }

Riot/Modules/Call/Views/IncomingCallView.h

@@ -18,7 +18,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void (^IncomingCallViewAction)();
+typedef void (^IncomingCallViewAction)(void);
 @class MXMediaManager;
 
 @interface IncomingCallView : UIView

Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h

@@ -135,7 +135,7 @@ extern NSString *const kRecentsDataSourceTapOnDirectoryServerChange;
  Move a cell from a path to another one.
  It is based on room Tag.
  */
-- (void)moveRoomCell:(MXRoom*)room from:(NSIndexPath*)oldPath to:(NSIndexPath*)newPath success:(void (^)())moveSuccess failure:(void (^)(NSError *error))moveFailure;
+- (void)moveRoomCell:(MXRoom*)room from:(NSIndexPath*)oldPath to:(NSIndexPath*)newPath success:(void (^)(void))moveSuccess failure:(void (^)(NSError *error))moveFailure;
 
 /**
  The current number of the favourite rooms with missed notifications.

Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m

@@ -1513,7 +1513,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
     return nil;
 }
 
-- (void)moveRoomCell:(MXRoom*)room from:(NSIndexPath*)oldPath to:(NSIndexPath*)newPath success:(void (^)())moveSuccess failure:(void (^)(NSError *error))moveFailure;
+- (void)moveRoomCell:(MXRoom*)room from:(NSIndexPath*)oldPath to:(NSIndexPath*)newPath success:(void (^)(void))moveSuccess failure:(void (^)(NSError *error))moveFailure;
 {
     NSLog(@"[RecentsDataSource] moveCellFrom (%tu, %tu) to (%tu, %tu)", oldPath.section, oldPath.row, newPath.section, newPath.row);
     

Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.h

@@ -57,7 +57,7 @@
  @param failure A block object called when the operation fails.
  */
 - (void)openWidget:(Widget*)widget withVideo:(BOOL)video
-           success:(void (^)())success
+           success:(void (^)(void))success
            failure:(void (^)(NSError *error))failure;
 
 /**
@@ -95,7 +95,7 @@
  @param jitsiViewController the jitsi view controller.
  @param completion the block to execute at the end of the operation.
  */
-- (void)jitsiViewController:(JitsiViewController *)jitsiViewController dismissViewJitsiController:(void (^)())completion;
+- (void)jitsiViewController:(JitsiViewController *)jitsiViewController dismissViewJitsiController:(void (^)(void))completion;
 
 /**
  Tells the delegate to put the jitsi view controller in background.
@@ -103,6 +103,6 @@
  @param jitsiViewController the jitsi view controller.
  @param completion the block to execute at the end of the operation.
  */
-- (void)jitsiViewController:(JitsiViewController *)jitsiViewController goBackToApp:(void (^)())completion;
+- (void)jitsiViewController:(JitsiViewController *)jitsiViewController goBackToApp:(void (^)(void))completion;
 
 @end

Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m

@@ -45,7 +45,7 @@ static const NSString *kJitsiServerUrl = @"https://jitsi.riot.im/";
 }
 
 - (void)openWidget:(Widget*)widget withVideo:(BOOL)aVideo
-           success:(void (^)())success
+           success:(void (^)(void))success
            failure:(void (^)(NSError *error))failure
 {
     video = aVideo;

Riot/Modules/Room/Settings/RoomSettingsViewController.m

@@ -3227,7 +3227,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     return canSetCanonicalAlias;
 }
 
-- (void)shouldRemoveCanonicalAlias:(void (^)())didRemoveCanonicalAlias
+- (void)shouldRemoveCanonicalAlias:(void (^)(void))didRemoveCanonicalAlias
 {
     // Prompt the user before removing the current main address
     [currentAlert dismissViewControllerAnimated:NO completion:nil];

Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.h

@@ -43,7 +43,7 @@
  @param onComplete a block called when the the dialog is closed.
  @return the newly created instance.
  */
-- (instancetype)initWithDeviceInfo:(MXDeviceInfo*)deviceInfo wasNewDevice:(BOOL)wasNewDevice andMatrixSession:(MXSession*)session onComplete:(void (^)())onComplete;
+- (instancetype)initWithDeviceInfo:(MXDeviceInfo*)deviceInfo wasNewDevice:(BOOL)wasNewDevice andMatrixSession:(MXSession*)session onComplete:(void (^)(void))onComplete;
 
 /**
  Show the dialog in a modal way.

Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m

@@ -21,7 +21,7 @@
 
 @interface RoomKeyRequestViewController ()
 {
-    void (^onComplete)();
+    void (^onComplete)(void);
 
     EncryptionInfoView *encryptionInfoView;
 
@@ -31,7 +31,7 @@
 
 @implementation RoomKeyRequestViewController
 
-- (instancetype)initWithDeviceInfo:(MXDeviceInfo *)deviceInfo wasNewDevice:(BOOL)theWasNewDevice andMatrixSession:(MXSession *)session onComplete:(void (^)())onCompleteBlock
+- (instancetype)initWithDeviceInfo:(MXDeviceInfo *)deviceInfo wasNewDevice:(BOOL)theWasNewDevice andMatrixSession:(MXSession *)session onComplete:(void (^)(void))onCompleteBlock
 {
     self = [super init];
     if (self)

Riot/Modules/Settings/SettingsViewController.m

@@ -132,7 +132,7 @@ enum {
 
 #define SECTION_TITLE_PADDING_WHEN_HIDDEN 0.01f
 
-typedef void (^blockSettingsViewController_onReadyToDestroy)();
+typedef void (^blockSettingsViewController_onReadyToDestroy)(void);
 
 
 @interface SettingsViewController () <DeactivateAccountViewControllerDelegate>