Merge branch 'develop' into doug/4519_decrypt_notifications_by_default_fix

# Conflicts:
#	CHANGES.rst
#	Config/BuildSettings.swift

Riot/Modules/Application/AppCoordinator.swift

@@ -21,8 +21,12 @@ import Intents
 import FLEX
 #endif
 
-/// The AppCoordinator is responsible of screen navigation and data injection at root application level. It decides if authentication or home screen should be shown and inject data needed for these flows, it changes the navigation stack on deep link, displays global warning.
-/// This class should avoid to contain too many data management code not related to screen navigation logic. For example `MXSession` or push notification management should be handled in dedicated classes and report only navigation changes to the AppCoordinator.
+/// The AppCoordinator is responsible of screen navigation and data injection at root application level. It decides
+/// if authentication or home screen should be shown and inject data needed for these flows, it changes the navigation
+/// stack on deep link, displays global warning.
+/// This class should avoid to contain too many data management code not related to screen navigation logic. For example
+/// `MXSession` or push notification management should be handled in dedicated classes and report only navigation
+/// changes to the AppCoordinator.
 final class AppCoordinator: NSObject, AppCoordinatorType {
     
     // MARK: - Constants
@@ -83,7 +87,8 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
     }
     
     func open(url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
-        // NOTE: As said in the Apple documentation be careful on security issues with Custom Scheme URL (see https://developer.apple.com/documentation/xcode/allowing_apps_and_websites_to_link_to_your_content/defining_a_custom_url_scheme_for_your_app)
+        // NOTE: As said in the Apple documentation be careful on security issues with Custom Scheme URL:
+        // https://developer.apple.com/documentation/xcode/allowing_apps_and_websites_to_link_to_your_content/defining_a_custom_url_scheme_for_your_app
         
         do {
             let deepLinkOption = try self.customSchemeURLParser.parse(url: url, options: options)

Riot/Modules/Application/LegacyAppDelegate.h

@@ -173,7 +173,7 @@ UINavigationControllerDelegate
  Log out all the accounts without confirmation.
  Show the authentication screen on successful logout.
 
- @param sendLogoutRequest Indicate whether send logout request to homeserver.
+ @param sendLogoutServerRequest Indicate whether send logout request to homeserver.
  @param completion the block to execute at the end of the operation.
  */
 - (void)logoutSendingRequestServer:(BOOL)sendLogoutServerRequest
@@ -183,7 +183,7 @@ UINavigationControllerDelegate
  Present incoming key verification request to accept.
 
  @param incomingKeyVerificationRequest The incoming key verification request.
- @param The matrix session.
+ @param session The matrix session.
  @return Indicate NO if the key verification screen could not be presented.
  */
 - (BOOL)presentIncomingKeyVerificationRequest:(MXKeyVerificationRequest*)incomingKeyVerificationRequest

Riot/Modules/Application/LegacyAppDelegate.m

@@ -351,6 +351,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     NSURL *messageSoundURL = [[NSBundle mainBundle] URLForResource:@"message" withExtension:@"caf"];
     AudioServicesCreateSystemSoundID((__bridge CFURLRef)messageSoundURL, &_messageSound);
     
+    // Set app info now as Mac (Designed for iPad) accesses it before didFinishLaunching is called
+    self.appInfo = AppInfo.current;
+    
     MXLogDebug(@"[AppDelegate] willFinishLaunchingWithOptions: Done");
 
     return YES;
@@ -371,8 +374,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 
     _configuration = [AppConfiguration new];
     
-    self.appInfo = AppInfo.current;
-    
     // Log app information
     NSString *appDisplayName = self.appInfo.displayName;
     NSString* appVersion = self.appVersion;