Privacy: Store Identity Server in Account Data (MSC2230)

element-hq/element-ios#2665
MSC: matrix-org/matrix-spec-proposals#2230

MatrixKit/Models/Account/MXKAccount.m

@@ -129,7 +129,8 @@ - (instancetype)initWithCredentials:(MXCredentials*)credentials
 
  // Refresh device information
  [self loadDeviceInformation:nil failure:nil];
-
+
+ [self registerAccountDataDidChangeIdentityServerNotification];
  [self registerIdentityServiceDidChangeAccessTokenNotification];
  }
  return self;
@@ -171,6 +172,7 @@ - (id)initWithCoder:(NSCoder *)coder
 
  [self prepareRESTClient];
 
+ [self registerAccountDataDidChangeIdentityServerNotification];
  [self registerIdentityServiceDidChangeAccessTokenNotification];
 
  if ([coder decodeObjectForKey:@"threePIDs"])
@@ -1975,6 +1977,34 @@ - (void)checkSyncFilterCompatibility:(MXFilterJSONModel*)syncFilter completion:(
  }
 }
 
+
+#pragma mark - Identity Server updates
+
+- (void)registerAccountDataDidChangeIdentityServerNotification
+{
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAccountDataDidChangeIdentityServerNotification:) name:kMXSessionAccountDataDidChangeIdentityServerNotification object:nil];
+}
+
+- (void)handleAccountDataDidChangeIdentityServerNotification:(NSNotification*)notification
+{
+ MXSession *mxSession = notification.object;
+ if (mxSession == self.mxSession)
+ {
+ if (![mxCredentials.identityServer isEqualToString:self.mxSession.accountDataIdentityServer])
+ {
+ _identityServerURL = self.mxSession.accountDataIdentityServer;
+ mxCredentials.identityServer = _identityServerURL;
+ mxCredentials.identityServerAccessToken = nil;
+
+ // Archive updated field
+ [[MXKAccountManager sharedManager] saveAccounts];
+ }
+ }
+}
+
+
+#pragma mark - Identity Server Access Token updates
+
 - (void)identityService:(MXIdentityService *)identityService didUpdateAccessToken:(NSString *)accessToken
 {
  mxCredentials.identityServerAccessToken = accessToken;
@@ -1996,6 +2026,9 @@ - (void)handleIdentityServiceDidChangeAccessTokenNotification:(NSNotification*)n
  if (userId && identityServer && accessToken && [mxCredentials.identityServer isEqualToString:identityServer])
  {
  mxCredentials.identityServerAccessToken = accessToken;
+
+ // Archive updated field
+ [[MXKAccountManager sharedManager] saveAccounts];
  }
 }