Split MXKAccount from Data so just data can be loaded from disk without side effects. Also change force reload of accounts to stop double load on init.

Riot/Modules/MatrixKit/Models/Account/MXKAccountData.h

@@ -0,0 +1,141 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#import <MatrixSDK/MatrixSDK.h>
+
+@class MXKAccountData;
+
+@interface MXKAccountData : NSObject <NSCoding> {
+    
+@protected MXCredentials *_mxCredentials;
+@protected NSString *_identityServerURL;
+@protected NSString *_antivirusServerURL;
+@protected NSString *_pushGatewayURL;
+@protected MXDevice *_device;
+@protected BOOL _disabled;
+@protected BOOL _enableInAppNotifications;
+@protected BOOL _warnedAboutEncryption;
+@protected NSMutableDictionary<NSString *, id<NSCoding>> *_others;
+@protected NSArray<MXThirdPartyIdentifier *> *_threePIDs;
+@protected BOOL _isSoftLogout;
+@protected BOOL _hasPusherForPushNotifications;
+@protected BOOL _hasPusherForPushKitNotifications;
+}
+
+/**
+ The account's credentials: homeserver, access token, user id.
+ */
+@property (nonatomic, readonly) MXCredentials *mxCredentials;
+
+/**
+ The identity server URL.
+ */
+@property (nonatomic) NSString *identityServerURL;
+
+/**
+ The antivirus server URL, if any (nil by default).
+ Set a non-null url to configure the antivirus scanner use.
+ */
+@property (nonatomic) NSString *antivirusServerURL;
+
+/**
+ The Push Gateway URL used to send event notifications to (nil by default).
+ This URL should be over HTTPS and never over HTTP.
+ */
+@property (nonatomic) NSString *pushGatewayURL;
+
+/**
+ The 3PIDs linked to this account.
+ [self load3PIDs] must be called to update the property.
+ */
+@property (nonatomic, readonly) NSArray<MXThirdPartyIdentifier *> *threePIDs;
+
+/**
+ The email addresses linked to this account.
+ This is a subset of self.threePIDs.
+ */
+@property (nonatomic, readonly) NSArray<NSString *> *linkedEmails;
+
+/**
+ The phone numbers linked to this account.
+ This is a subset of self.threePIDs.
+ */
+@property (nonatomic, readonly) NSArray<NSString *> *linkedPhoneNumbers;
+
+/**
+ The account user's device.
+ [self loadDeviceInformation] must be called to update the property.
+ */
+@property (nonatomic, readonly) MXDevice *device;
+
+/**
+ The account user's tint color: a unique color fixed by the user id. This tint color may be used to highlight
+ rooms which belong to this account's user.
+ */
+@property (nonatomic, readonly) UIColor *userTintColor;
+
+/**
+ The Apple Push Notification Service activity for this account. YES when APNS is turned on (locally available and synced with server).
+ */
+@property (nonatomic, readonly) BOOL pushNotificationServiceIsActive;
+
+/**
+ Transient information storage.
+ */
+@property (nonatomic, strong, readonly) NSMutableDictionary<NSString *, id<NSCoding>> *others;
+
+/**
+ Flag to indicate that an APNS pusher has been set on the homeserver for this device.
+ */
+@property (nonatomic, readonly) BOOL hasPusherForPushNotifications;
+
+/**
+ The Push notification activity (based on PushKit) for this account.
+ YES when Push is turned on (locally available and enabled homeserver side).
+ */
+@property (nonatomic, readonly) BOOL isPushKitNotificationActive;
+
+/**
+ Flag to indicate that a PushKit pusher has been set on the homeserver for this device.
+ */
+@property (nonatomic, readonly) BOOL hasPusherForPushKitNotifications;
+
+
+/**
+ Enable In-App notifications based on Remote notifications rules.
+ NO by default.
+ */
+@property (nonatomic) BOOL enableInAppNotifications;
+
+/**
+ Disable the account without logging out (NO by default).
+ 
+ A matrix session is automatically opened for the account when this property is toggled from YES to NO.
+ The session is closed when this property is set to YES.
+ */
+@property (nonatomic,getter=isDisabled) BOOL disabled;
+
+/**
+ Flag indicating if the end user has been warned about encryption and its limitations.
+ */
+@property (nonatomic,getter=isWarnedAboutEncryption) BOOL warnedAboutEncryption;
+
+#pragma mark - Soft logout
+
+/**
+ Flag to indicate if the account has been logged out by the homeserver admin.
+ */
+@property (nonatomic, readonly) BOOL isSoftLogout;
+@end