diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts
index d7224e4d..6e6844f6 100644
--- a/sdk/build.gradle.kts
+++ b/sdk/build.gradle.kts
@@ -77,12 +77,12 @@ dependencies {
 mavenPublishing {
     publishToMavenCentral()
 
-     signAllPublications()
+    signAllPublications()
 
-     coordinates(
+    coordinates(
         "com.authgear",
         "android-sdk",
-        System.getenv("GITHUB_REF_NAME") ?: error("GITHUB_REF_NAME is not set")
+        System.getenv("GITHUB_REF_NAME") ?: "0.0.0-SNAPSHOT"
     )
 
     pom {
diff --git a/sdk/src/main/java/com/oursky/authgear/AuthgearCore.kt b/sdk/src/main/java/com/oursky/authgear/AuthgearCore.kt
index 1ce9c0ae..ea87c78f 100644
--- a/sdk/src/main/java/com/oursky/authgear/AuthgearCore.kt
+++ b/sdk/src/main/java/com/oursky/authgear/AuthgearCore.kt
@@ -544,20 +544,7 @@ internal class AuthgearCore(
                 )
             )
 
-            synchronized(this) {
-                if (tokenResponse.idToken != null) {
-                    this.idToken = tokenResponse.idToken
-                }
-            }
-
-            val idToken = this.idToken
-            val deviceSecret = tokenResponse.deviceSecret
-            if (idToken != null) {
-                sharedStorage.setIDToken(name, idToken)
-            }
-            if (deviceSecret != null) {
-                tokenStorage.setRefreshToken(name, deviceSecret)
-            }
+            saveToken(tokenResponse, SessionStateChangeReason.FOUND_TOKEN)
         } catch (e: Exception) {
             handleInvalidGrantError(e)
             throw e