concurrency bug fix

PierfrancescoSoffritti · Jun 17, 2016 · 96e138b · 96e138b
1 parent 8a8e6cf
commit 96e138b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/webbasedoauth/src/main/java/com/pierfrancescosoffritti/webbasedoauth/CredentialStore.java b/webbasedoauth/src/main/java/com/pierfrancescosoffritti/webbasedoauth/CredentialStore.java
@@ -85,30 +85,25 @@ public Date getTokenAcquisitionTime() {
      * Other than returning the auth status, this method is responsible for changing the status to expired if expiresIn - 600 seconds are passed
      * @return the status of the authentication. A value from {@link AuthStatus}
      */
-    @AuthStatus int getAuthStatus() {
+    synchronized @AuthStatus int getAuthStatus() {
         if(authStatus == NOT_AUTHENTICATED)
             return authStatus;
 
         // the access token is refreshed offset seconds before expiring
-        long currentTime = new Date().getTime() / 1000;
-        long tokenAcquiredTime = tokenAcquisitionTime.getTime() / 1000;
-        int offset = 600; // 10 minutes
+        long currentTimeMillisec = new Date().getTime() / 1000;
+        long tokenAcquisitionTimeMillisec = this.tokenAcquisitionTime.getTime() / 1000;
+        int offsetMillisec = 600; // 10 minutes
 
-        if(currentTime - tokenAcquiredTime >= expiresIn - offset) {
+        if(currentTimeMillisec - tokenAcquisitionTimeMillisec >= expiresIn - offsetMillisec)
             authStatus = TOKEN_EXPIRED;
 
-            accessToken = null;
-            expiresIn = -1;
-            tokenAcquisitionTime = null;
-        }
-
         return authStatus;
     }
 
     /**
      * Use this method to store new credentials.
      */
-    void authenticate(@NonNull String accessToken, @NonNull String refreshToken, int expiresIn, @NonNull Date tokenAcquisitionTime) {
+    synchronized void authenticate(@NonNull String accessToken, @NonNull String refreshToken, int expiresIn, @NonNull Date tokenAcquisitionTime) {
         if(accessToken.length() == 0 || refreshToken.length() == 0)
             throw new IllegalArgumentException("accessToken.isEmpty() || refreshToken.isEmpty()");
 
@@ -126,14 +121,14 @@ void authenticate(@NonNull String accessToken, @NonNull String refreshToken, int
     /**
      * Use this method to store new credentials.
      */
-    void authenticate(String accessToken, String refreshToken, int expiresIn) {
+    synchronized void authenticate(String accessToken, String refreshToken, int expiresIn) {
         authenticate(accessToken, refreshToken, expiresIn, new Date());
     }
 
     /**
      * Use this method to set a new access token.
      */
-    void setNewAccessToken(@NonNull String accessToken, int expiresIn) {
+    synchronized void setNewAccessToken(@NonNull String accessToken, int expiresIn) {
         if(accessToken.length() == 0)
             throw new IllegalArgumentException("accessToken.isEmpty()");
 
@@ -150,7 +145,7 @@ void setNewAccessToken(@NonNull String accessToken, int expiresIn) {
     /**
      * Use this method to delete all the stored credentials.
      */
-    void clear() {
+    synchronized void clear() {
         this.accessToken = null;
         this.refreshToken = null;
         this.expiresIn = -1;

diff --git a/webbasedoauth/src/main/java/com/pierfrancescosoffritti/webbasedoauth/RefreshTokenTask.java b/webbasedoauth/src/main/java/com/pierfrancescosoffritti/webbasedoauth/RefreshTokenTask.java
@@ -2,6 +2,7 @@
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Log;
 
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/...n/java/com/pierfrancescosoffritti/webbasedoauth/SharedPreferencesCredentialPersister.java b/...n/java/com/pierfrancescosoffritti/webbasedoauth/SharedPreferencesCredentialPersister.java
@@ -30,7 +30,7 @@ public void persistUser(CredentialStore credentialStore) {
                 .putInt(EXPIRES_IN_TOKEN_KEY, credentialStore.getExpiresIn())
                 .putString(TOKEN_ACQUIRE_TIME_KEY, credentialStore.getTokenAcquisitionTime().getTime()+"")
                 .putInt(AUTH_STATUS_KEY, credentialStore.getAuthStatus())
-                .apply();
+                .commit();
     }
 
     @Override