Handle well-known data in the login response (#3002)

element-hq · Mar 5, 2019 · 67d7130 · 67d7130
1 parent eeccdf9
commit 67d7130
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/vector/src/main/java/im/vector/LoginHandler.java b/vector/src/main/java/im/vector/LoginHandler.java
@@ -39,17 +39,17 @@
 
 public class LoginHandler {
     /**
-     * The account login / creation succeeds so create the dedicated session and store it.
+     * The account login succeeds so create the dedicated session and store it.
      *
      * @param appCtx      the application context.
      * @param hsConfig    the homeserver config
      * @param credentials the credentials
      * @param callback    the callback
      */
-    private void onRegistrationDone(Context appCtx,
-                                    HomeServerConnectionConfig hsConfig,
-                                    Credentials credentials,
-                                    ApiCallback<Void> callback) {
+    private void onLoginDone(Context appCtx,
+                             HomeServerConnectionConfig hsConfig,
+                             Credentials credentials,
+                             ApiCallback<Void> callback) {
         // sanity check - GA issue
         if (TextUtils.isEmpty(credentials.userId)) {
             callback.onMatrixError(new MatrixError(MatrixError.FORBIDDEN, "No user id"));
@@ -97,7 +97,7 @@ public void login(Context ctx,
         callLogin(ctx, hsConfig, username, phoneNumber, phoneNumberCountry, password, new UnrecognizedCertApiCallback<Credentials>(hsConfig, callback) {
             @Override
             public void onSuccess(Credentials credentials) {
-                onRegistrationDone(appCtx, hsConfig, credentials, callback);
+                onLoginDone(appCtx, hsConfig, credentials, callback);
             }
 
             @Override
@@ -188,7 +188,7 @@ public void getSupportedRegistrationFlows(Context ctx,
             @Override
             public void onSuccess(Credentials credentials) {
                 // Should never happen, onMatrixError() will be called
-                onRegistrationDone(appCtx, hsConfig, credentials, callback);
+                onLoginDone(appCtx, hsConfig, credentials, callback);
             }
 
             @Override

diff --git a/vector/src/main/java/im/vector/activity/LoginActivity.java b/vector/src/main/java/im/vector/activity/LoginActivity.java
@@ -749,12 +749,12 @@ private void onAutoDiscoveryRetrieved(String domain, AutoDiscovery.DiscoveredCli
 
         if (AutoDiscovery.Action.PROMPT == info.getAction()) {
             if (info.getWellKnown() == null) return;
-            if (info.getWellKnown().getHomeServer() == null) return;
-            final String hs = info.getWellKnown().getHomeServer().getBaseURL();
+            if (info.getWellKnown().homeServer == null) return;
+            final String hs = info.getWellKnown().homeServer.baseURL;
             String ids = ServerUrlsRepository.INSTANCE.getDefaultIdentityServerUrl(LoginActivity.this);
-            if (info.getWellKnown().getIdentityServer() != null
-                    && !TextUtils.isEmpty(info.getWellKnown().getIdentityServer().getBaseURL())) {
-                ids = info.getWellKnown().getIdentityServer().getBaseURL();
+            if (info.getWellKnown().identityServer != null
+                    && !TextUtils.isEmpty(info.getWellKnown().identityServer.baseURL)) {
+                ids = info.getWellKnown().identityServer.baseURL;
             }
 
             if (hs != null) {