there is no need to make SessionInterceptor.userId() suspendable

CruGlobal · Oct 12, 2023 · f214c3f · f214c3f
1 parent d3ec3f1
commit f214c3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/library/account/src/main/kotlin/org/cru/godtools/account/AccountModule.kt b/library/account/src/main/kotlin/org/cru/godtools/account/AccountModule.kt
@@ -24,7 +24,7 @@ abstract class AccountModule {
             @ApplicationContext context: Context,
             accountManager: GodToolsAccountManager
         ) = object : MobileContentApiSessionInterceptor(context) {
-            override suspend fun userId() = accountManager.userId
+            override fun userId() = accountManager.userId
             override suspend fun authenticate() = accountManager.authenticateWithMobileContentApi()
         }
     }

diff --git a/library/api/src/main/kotlin/org/cru/godtools/api/MobileContentApiSessionInterceptor.kt b/library/api/src/main/kotlin/org/cru/godtools/api/MobileContentApiSessionInterceptor.kt
@@ -13,7 +13,7 @@ import org.cru.godtools.api.model.AuthToken
 private const val HTTP_HEADER_AUTHORIZATION = "Authorization"
 
 abstract class MobileContentApiSessionInterceptor(context: Context) : SessionInterceptor<UserIdSession>(context) {
-    override fun loadSession(prefs: SharedPreferences) = runBlocking { userId()?.let { UserIdSession(prefs, it) } }
+    override fun loadSession(prefs: SharedPreferences) = userId()?.let { UserIdSession(prefs, it) }
 
     override fun attachSession(request: Request, session: UserIdSession): Request {
         if (!session.isValid) return request
@@ -31,6 +31,6 @@ abstract class MobileContentApiSessionInterceptor(context: Context) : SessionInt
 
     override fun isSessionInvalid(response: Response) = response.code == HttpURLConnection.HTTP_UNAUTHORIZED
 
-    protected abstract suspend fun userId(): String?
+    protected abstract fun userId(): String?
     protected abstract suspend fun authenticate(): AuthToken?
 }