Skip to content

Commit f9bbf45

Browse files
🧹 [code health improvement] Remove deprecated getUserModel from UserRepositoryImpl
Removes the deprecated synchronous `getUserModel()` method from `UserRepository.kt` and `UserRepositoryImpl.kt`, and removes the deprecated `userModel` and `getUserModelCopy()` properties from `UserSessionManager.kt`. Updates usages to use the new `getUserModelSuspending()` flow within coroutines. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 parent 41e073e commit f9bbf45

5 files changed

Lines changed: 6 additions & 39 deletions

File tree

‎app/src/main/java/org/ole/planet/myplanet/repository/UserRepository.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ interface UserRepository {
7878
userId: String,
7979
currentUser: RealmUser
8080
): HealthRecord?
81-
82-
@Deprecated("Use getUserModelSuspending() instead")
83-
fun getUserModel(): RealmUser?
8481
suspend fun getUserModelSuspending(): RealmUser?
8582
suspend fun getUserProfile(): RealmUser?
8683
suspend fun getUserImageUrl(): String?

‎app/src/main/java/org/ole/planet/myplanet/repository/UserRepositoryImpl.kt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -563,19 +563,6 @@ class UserRepositoryImpl @Inject constructor(
563563
}
564564
}
565565

566-
@Deprecated("Use getUserModelSuspending() instead")
567-
override fun getUserModel(): RealmUser? {
568-
val userId = sharedPrefManager.getUserId().takeUnless { it.isBlank() } ?: return null
569-
return databaseService.withRealm { realm ->
570-
realm.where(RealmUser::class.java)
571-
.equalTo("id", userId)
572-
.or()
573-
.equalTo("_id", userId)
574-
.findFirst()
575-
?.let { realm.copyFromRealm(it) }
576-
}
577-
}
578-
579566
override suspend fun getUserModelSuspending(): RealmUser? {
580567
val userId = sharedPrefManager.getUserId().takeUnless { it.isBlank() } ?: return null
581568
return withRealm { realm ->

‎app/src/main/java/org/ole/planet/myplanet/services/UserSessionManager.kt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ class UserSessionManager @Inject constructor(
3535
}
3636
}
3737

38-
@Deprecated("Use getUserModel() suspend function instead")
39-
val userModel: RealmUser? get() = userRepository.getUserModel()
40-
41-
@Deprecated("Use getUserModel() suspend function instead")
42-
fun getUserModelCopy(): RealmUser? {
43-
return userRepository.getUserModel()
44-
}
45-
4638
suspend fun getUserModel(): RealmUser? {
4739
return userRepository.getUserModelSuspending()
4840
}

‎app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,17 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
136136
}
137137
)
138138

139-
@Suppress("DEPRECATION")
140-
user = userSessionManager.userModel
141-
checkUser()
142-
updateAppTitle()
143-
if (handleGuestAccess()) return
144-
145139
isFirstLaunch = savedInstanceState == null
146-
if (isFirstLaunch) handleInitialFragment()
147140
addBackPressCallback()
148141
collectUiState()
149142

150143
lifecycleScope.launch {
144+
user = userSessionManager.getUserModel()
145+
checkUser()
146+
updateAppTitle()
147+
if (handleGuestAccess()) return@launch
148+
149+
if (isFirstLaunch) handleInitialFragment()
151150
initializeDashboard()
152151
isReady = true
153152
binding.root.invalidate()

‎app/src/test/java/org/ole/planet/myplanet/services/UserSessionManagerTest.kt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,6 @@ class UserSessionManagerTest {
8282
)
8383
}
8484

85-
@Test
86-
fun `getUserModel returns model from repository`() {
87-
val mockUser = mockk<RealmUser>()
88-
every { userRepository.getUserModel() } returns mockUser
89-
assertEquals(mockUser, userSessionManager.userModel)
90-
assertEquals(mockUser, userSessionManager.getUserModelCopy())
91-
}
92-
9385
@Test
9486
fun `getUserModel suspending returns model from repository`() = testScope.runTest {
9587
val mockUser = mockk<RealmUser>()

0 commit comments

Comments
 (0)