Merge pull request #1991 from vector-im/setup_user_defaults

Bug Fix - User defaults: the preset application language (if any) is ignored

CHANGES.rst

@@ -4,6 +4,9 @@ Changes in 0.7.2 (2018-08-)
 Improvements:
  * Upgrade MatrixKit version (v0.8.1).
  * Server Quota Notices in Riot (#1937).
+ 
+ Bug fix:
+ * User defaults: the preset application language (if any) is ignored.
 
 Changes in 0.7.1 (2018-08-17)
 ===============================================

Riot/AppDelegate.m

@@ -400,6 +400,8 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
     NSLog(@"MatrixSDK version: %@", MatrixSDKVersion);
     NSLog(@"Build: %@\n", build);
     NSLog(@"------------------------------\n");
+    
+    [self setupUserDefaults];
 
     // Set up runtime language and fallback by considering the userDefaults object shared within the application group.
     NSUserDefaults *sharedUserDefaults = [MXKAppSettings standardAppSettings].sharedUserDefaults;
@@ -462,8 +464,6 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
     
     _isAppForeground = NO;
     
-    [self setupUserDefaults];
-    
     // Configure our analytics. It will indeed start if the option is enabled
     [MXSDKOptions sharedInstance].analyticsDelegate = [Analytics sharedInstance];
     [DecryptionFailureTracker sharedInstance].delegate = [Analytics sharedInstance];