Bugfix for Activity 'doubling'. This change also addresses #7

Author: Brian Melton

app/src/main/java/com/microsoft/o365_android_onenote_rest/SignInActivity.java

@@ -30,14 +30,47 @@
 
 public class SignInActivity
         extends BaseActivity
-        implements AuthenticationCallback<AuthenticationResult>, LiveAuthListener {
+        implements AuthenticationCallback<AuthenticationResult> {
+
+    protected final LiveAuthListener mLiveAuthListener = new LiveAuthListener() {
+
+        @Override
+        public void onAuthComplete(final LiveStatus status,
+                                   final LiveConnectSession session,
+                                   final Object userState) {
+            Timber.d("MSA: Auth Complete...");
+            if (null != status) {
+                Timber.d(status.toString());
+            }
+            if (null != session) {
+                Timber.d(session.toString());
+                SharedPrefsUtil.persistAuthToken(session);
+            }
+            if (null != userState) {
+                Timber.d(userState.toString());
+            }
+            if (status == LiveStatus.CONNECTED) {
+                start();
+            }
+        }
+
+        @Override
+        public void onAuthError(LiveAuthException exception, Object userState) {
+            exception.printStackTrace();
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_signin);
         if (User.isOrg()) {
             mAuthenticationManager.connect(this);
+        } else if (User.isMsa()
+                // this check has side effects: see mLiveAuthListener implementation
+                && mLiveAuthClient.loginSilent(mLiveAuthListener)) {
+            // callback will be fired, do not inject ButterKnife
+            return;
         }
         ButterKnife.inject(this);
     }
@@ -92,7 +125,7 @@ public void onSignInMsaClicked() {
     private void authenticateMsa() {
         try {
             validateMsaArgs();
-            mLiveAuthClient.login(this, sSCOPES, this);
+            mLiveAuthClient.login(this, sSCOPES, mLiveAuthListener);
         } catch (IllegalArgumentException e) {
             warnBadClient();
         }
@@ -106,12 +139,12 @@ private void validateMsaArgs() throws IllegalArgumentException {
 
     @Override
     public void onSuccess(AuthenticationResult authenticationResult) {
-        finish();
         SharedPrefsUtil.persistAuthToken(authenticationResult);
         start();
     }
 
     private void start() {
+        finish();
         Intent appLaunch = new Intent(this, SnippetListActivity.class);
         startActivity(appLaunch);
     }
@@ -125,29 +158,4 @@ public void onError(Exception e) {
         }
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
     }
-
-    @Override
-    public void onAuthComplete(final LiveStatus status,
-                               final LiveConnectSession session,
-                               final Object userState) {
-        Timber.d("MSA: Auth Complete...");
-        if (null != status) {
-            Timber.d(status.toString());
-        }
-        if (null != session) {
-            Timber.d(session.toString());
-            SharedPrefsUtil.persistAuthToken(session);
-        }
-        if (null != userState) {
-            Timber.d(userState.toString());
-        }
-        if (status == LiveStatus.CONNECTED) {
-            start();
-        }
-    }
-
-    @Override
-    public void onAuthError(LiveAuthException exception, Object userState) {
-        exception.printStackTrace();
-    }
 }

app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListFragment.java

@@ -125,4 +125,6 @@ private void setActivatedPosition(int position) {
 
         mActivatedPosition = position;
     }
+
+
 }

app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AppModule.java

@@ -7,6 +7,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.microsoft.o365_android_onenote_rest.BaseActivity;
 import com.microsoft.o365_android_onenote_rest.application.SnippetApp;
 import com.microsoft.o365_android_onenote_rest.conf.ServiceConstants;
 import com.microsoft.o365_android_onenote_rest.util.SharedPrefsUtil;
@@ -67,6 +68,10 @@ public void intercept(RequestFacade request) {
     @Provides
     @Singleton
     public LiveAuthClient providesLiveAuthClient() {
-        return new LiveAuthClient(SnippetApp.getApp(), ServiceConstants.MSA_CLIENT_ID);
+        return new LiveAuthClient(
+                SnippetApp.getApp(),
+                ServiceConstants.MSA_CLIENT_ID,
+                BaseActivity.sSCOPES
+        );
     }
 }