Adds logic to notify only on session changes

Change-Id: Ie48363c9b9c0df20c9cc6b3fa6d88142500ad0c9

Author: Israel Camacho

digits/changelog.md

@@ -3,6 +3,8 @@
 
 ## Unreleased
 
+* (IC) Fixed issue that invalidates current session.
+
 ## v1.7.0
 
 * (IC) Added SessionListener to receive session changes.

digits/src/main/java/com/digits/sdk/android/DigitsSessionVerifier.java

@@ -75,7 +75,8 @@ static class VerificationCallback extends Callback<VerifyAccountResponse> {
         public void success(Result<VerifyAccountResponse> result) {
             if (result.data != null) {
                 final DigitsSession newSession = DigitsSession.create(result.data);
-                if (newSession.isValidUser()) {
+                if (newSession.isValidUser() &&
+                        !newSession.equals(sessionManager.getSession(newSession.getId()))) {
                     sessionManager.setSession(newSession.getId(), newSession);
                     for (SessionListener listener : sessionListenerMap.keySet()) {
                         if (listener != null) {

digits/src/test/java/com/digits/sdk/android/TestConstants.java

@@ -27,6 +27,8 @@ public class TestConstants {
     public static final String TOKEN = "token";
     public static final String SECRET = "secret";
     public static final long USER_ID = 11;
+    public static final TwitterAuthToken ANY_TOKEN = new TwitterAuthToken("", "");
+
 
     public static final String RAW_PHONE = "+123456789";
     public static final String ES_RAW_PHONE = "+3423456789";

digits/src/test/java/com/digits/sdk/android/VerificationCallbackTest.java

@@ -19,6 +19,7 @@
 
 import com.twitter.sdk.android.core.Result;
 import com.twitter.sdk.android.core.SessionManager;
+import com.twitter.sdk.android.core.TwitterAuthToken;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,7 +32,9 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
@@ -58,16 +61,52 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void testSuccess() throws Exception {
+    public void testSuccess_tokenChanged() throws Exception {
+        final DigitsSession changedSession = new DigitsSession(TestConstants.ANY_TOKEN,
+                TestConstants.USER_ID, TestConstants.PHONE);
+        when(sessionManager.getSession(TestConstants.USER_ID)).thenReturn(changedSession);
+
+        verificationCallback.addSessionListener(sessionListener);
+        verificationCallback.addSessionListener(sessionListener2);
+        verificationCallback.success(result);
+
+        verify(sessionManager).setSession(TestConstants.USER_ID,
+                DigitsSession.create(result.data));
+        verify(sessionListener).changed(any(DigitsSession.class));
+        verify(sessionListener2).changed(any(DigitsSession.class));
+    }
+
+    @Test
+    public void testSuccess_phoneChanged() throws Exception {
+        final DigitsSession changedSession =
+                new DigitsSession(new TwitterAuthToken(TestConstants.TOKEN, TestConstants.SECRET),
+                        TestConstants.USER_ID, TestConstants.ES_RAW_PHONE);
+        when(sessionManager.getSession(TestConstants.USER_ID)).thenReturn(changedSession);
+
         verificationCallback.addSessionListener(sessionListener);
         verificationCallback.addSessionListener(sessionListener2);
         verificationCallback.success(result);
+
         verify(sessionManager).setSession(TestConstants.USER_ID,
                 DigitsSession.create(result.data));
         verify(sessionListener).changed(any(DigitsSession.class));
         verify(sessionListener2).changed(any(DigitsSession.class));
     }
 
+    @Test
+    public void testSuccess_noSessionChange() throws Exception {
+        when(sessionManager.getSession(TestConstants.USER_ID)).thenReturn(
+                DigitsSession.create(result.data));
+
+        verificationCallback.addSessionListener(sessionListener);
+        verificationCallback.addSessionListener(sessionListener2);
+        verificationCallback.success(result);
+
+        verifyZeroInteractions(sessionListener);
+        verify(sessionManager).getSession(TestConstants.USER_ID);
+        verifyNoMoreInteractions(sessionManager);
+    }
+
     public void testSuccess_nullListener() throws Exception {
         sessionListenerMap.put(null, Boolean.TRUE);
         verificationCallback.success(result);