stop using deprecated hasErrors() method in favor of property

CruGlobal · Oct 4, 2023 · b249e59 · b249e59
1 parent 596a718
commit b249e59
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...unt/src/main/kotlin/org/cru/godtools/account/provider/facebook/FacebookAccountProvider.kt b/...unt/src/main/kotlin/org/cru/godtools/account/provider/facebook/FacebookAccountProvider.kt
@@ -80,7 +80,7 @@ internal class FacebookAccountProvider @Inject constructor(
             resp = authenticateWithMobileContentApi(accessToken)
         }
 
-        val token = resp?.takeIf { it.isSuccessful }?.body()?.takeUnless { it.hasErrors() }?.dataSingle
+        val token = resp?.takeIf { it.isSuccessful }?.body()?.takeUnless { it.hasErrors }?.dataSingle
         if (accessToken != null && token != null) prefs.edit { putString(PREF_USER_ID(accessToken), token.userId) }
         return token
     }

diff --git a/...account/src/main/kotlin/org/cru/godtools/account/provider/google/GoogleAccountProvider.kt b/...account/src/main/kotlin/org/cru/godtools/account/provider/google/GoogleAccountProvider.kt
@@ -61,7 +61,7 @@ internal class GoogleAccountProvider @Inject constructor(
         val account = GoogleSignIn.getLastSignedInAccount(context)
         val request = account?.idToken?.let { AuthToken.Request(googleIdToken = it) } ?: return null
         val token = authApi.authenticate(request).takeIf { it.isSuccessful }
-            ?.body()?.takeUnless { it.hasErrors() }
+            ?.body()?.takeUnless { it.hasErrors }
             ?.dataSingle
         if (token != null) prefs.edit { putString(PREF_USER_ID(account), token.userId) }
         return token

diff --git a/library/sync/src/main/kotlin/org/cru/godtools/sync/task/UserCounterSyncTasks.kt b/library/sync/src/main/kotlin/org/cru/godtools/sync/task/UserCounterSyncTasks.kt
@@ -41,7 +41,7 @@ internal class UserCounterSyncTasks @Inject internal constructor(
         }
 
         val counters = countersApi.getCounters().takeIf { it.isSuccessful }
-            ?.body()?.takeUnless { it.hasErrors() }
+            ?.body()?.takeUnless { it.hasErrors }
             ?.data ?: return false
 
         userCountersRepository.transaction {
@@ -66,7 +66,7 @@ internal class UserCounterSyncTasks @Inject internal constructor(
                 .map { counter ->
                     async {
                         val updated = countersApi.updateCounter(counter.id, counter).takeIf { it.isSuccessful }
-                            ?.body()?.takeUnless { it.hasErrors() }
+                            ?.body()?.takeUnless { it.hasErrors }
                             ?.dataSingle ?: return@async false
 
                         userCountersRepository.transaction {

diff --git a/library/sync/src/main/kotlin/org/cru/godtools/sync/task/UserSyncTasks.kt b/library/sync/src/main/kotlin/org/cru/godtools/sync/task/UserSyncTasks.kt
@@ -38,7 +38,7 @@ internal class UserSyncTasks @Inject constructor(
         }
 
         val user = userApi.getUser().takeIf { it.isSuccessful }
-            ?.body()?.takeUnless { it.hasErrors() }
+            ?.body()?.takeUnless { it.hasErrors }
             ?.dataSingle ?: return false
 
         userRepository.storeUserFromSync(user)