diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt index af0b2674f..0cd7df3ae 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt @@ -84,7 +84,7 @@ interface SocialRepository : BaseRepository { suspend fun inviteToGroup(id: String, inviteData: Map): List? suspend fun retrieveMember(userId: String?, fromHall: Boolean = false): Member? - suspend fun retrieveMemberWithUsername(username: String?): Member? + suspend fun retrieveMemberWithUsername(username: String?, fromHall: Boolean): Member? suspend fun findUsernames( username: String, diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt index df5c4589b..86b2f523e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt @@ -266,8 +266,8 @@ class SocialRepositoryImpl( } } - override suspend fun retrieveMemberWithUsername(username: String?): Member? { - return retrieveMember(username, true) + override suspend fun retrieveMemberWithUsername(username: String?, fromHall: Boolean): Member? { + return retrieveMember(username, fromHall) } override suspend fun findUsernames(username: String, context: String?, id: String?): List? { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt index be5499b91..e118dd033 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt @@ -119,7 +119,7 @@ class InboxOverviewFragment : BaseMainFragment(), androidx binding.progressCircular.visibility = View.VISIBLE val username = binding.uuidEditText.text?.toString() ?: "" lifecycleScope.launch(ExceptionHandler.coroutine()) { - val member = socialRepository.retrieveMemberWithUsername(username) + val member = socialRepository.retrieveMemberWithUsername(username, false) if (member != null) { alert.dismiss() openInboxMessages("", username) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt index 8bebb03c3..4fb2926cf 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt @@ -71,7 +71,7 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie setMemberID(recipientID) } else if (recipientUsername?.isNotBlank() == true) { viewModelScope.launch(ExceptionHandler.coroutine()) { - val member = socialRepository.retrieveMemberWithUsername(recipientUsername) + val member = socialRepository.retrieveMemberWithUsername(recipientUsername, false) setMemberID(member?.id ?: "") invalidateDataSource() dataSourceFactory.updateRecipientID(memberID)