Develop

.github/workflows/android-ci.yml

@@ -27,11 +27,11 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - name: Download and set up Android SDK
         uses: android-actions/setup-android@v2
@@ -54,15 +54,15 @@ jobs:
         run: |
           echo "$KEYSTORE_BASE64" | base64 --decode > release.keystore
 
-      - name: Build Release AAB
+      - name: Build Release AAB (with Java 17)
         run: |
           ./gradlew bundleRelease \
             -Pandroid.injected.signing.store.file=release.keystore \
             -Pandroid.injected.signing.store.password=$KEYSTORE_PASSWORD \
             -Pandroid.injected.signing.key.alias=$SIGNING_KEY_ALIAS \
             -Pandroid.injected.signing.key.password=$SIGNING_KEY_PASSWORD
         env:
-          JAVA_HOME: ${{ runner.tool_cache }}/java/temurin-11-jdk
+          JAVA_HOME: ${{ runner.tool_cache }}/java/temurin-17-jdk
           ANDROID_SDK_ROOT: ${{ runner.tool_cache }}/android-sdk
 
       - name: Create GitHub Release

app/src/main/java/com/jaewchoi/barcodescanner/data/source/local/TokenStorageImpl.kt

@@ -57,8 +57,7 @@ class TokenStorageImpl @Inject constructor(
 
     override suspend fun clearAuthToken() {
         context.tokenDataStore.edit { prefs ->
-            prefs.remove(Keys.ACCESS_TOKEN)
-            prefs.remove(Keys.REFRESH_TOKEN)
+            prefs.remove(Keys.KEY_STATE)
         }
     }
 

app/src/main/java/com/jaewchoi/barcodescanner/viewmodels/SettingViewModel.kt

@@ -36,8 +36,8 @@ class SettingViewModel @Inject constructor(
     private val _authRequest = Channel<AuthorizationRequest>(Channel.BUFFERED)
     val authRequest = _authRequest.receiveAsFlow()
 
-    private val _userInfo = MutableLiveData<UserInfo>(null)
-    val userInfo: LiveData<UserInfo>
+    private val _userInfo = MutableLiveData<UserInfo?>(null)
+    val userInfo: LiveData<UserInfo?>
         get() = _userInfo
 
     val isLogin: LiveData<Boolean> = _userInfo.map { it != null }