sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix gifting gems

Browse source
This commit is contained in:
Phillip Thelen 2023-08-07 15:13:58 +02:00
parent fc6dee4f6a
commit 55d1f737ad
5 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
View file

@ -85,7 +85,6 @@ interface SocialRepository : BaseRepository {
suspend fun inviteToGroup(id: String, inviteData: Map<String, Any>): List<InviteResponse>?
suspend fun retrieveMember(userId: String?, fromHall: Boolean = false): Member?
suspend fun retrieveMemberWithUsername(username: String?, fromHall: Boolean): Member?
suspend fun findUsernames(
username: String,

26
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
View file

@ -263,31 +263,21 @@ class SocialRepositoryImpl(
return if (userId == null) {
null
} else {
try {
if (fromHall) {
apiClient.getHallMember(userId)
} else {
apiClient.getMember(UUID.fromString(userId).toString())
if (fromHall) {
apiClient.getHallMember(userId)
} else {
try {
val uuid = UUID.fromString(userId).toString()
apiClient.getMember(uuid)
} catch (_: IllegalArgumentException) {
apiClient.getMemberWithUsername(userId)
}
} catch (_: IllegalArgumentException) {
null
}
}
}
override suspend fun retrievegroupInvites(id: String, includeAllPublicFields: Boolean) = apiClient.getGroupInvites(id, includeAllPublicFields)
override suspend fun retrieveMemberWithUsername(username: String?, fromHall: Boolean): Member? {
if (username.isNullOrBlank()) {
return null
}
return try {
apiClient.getMemberWithUsername(username)
} catch (_: IllegalArgumentException) {
null
}
}
override suspend fun findUsernames(username: String, context: String?, id: String?): List<FindUsernameResult>? {
return apiClient.findUsernames(username, context, id)
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
View file

@ -125,7 +125,7 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
lifecycleScope.launch(ExceptionHandler.coroutine()) {
var member: Member? = null
try {
member = socialRepository.retrieveMemberWithUsername(username, false)
member = socialRepository.retrieveMember(username, false)
} finally {
if (member != null) {
alert.dismiss()

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
View file

@ -73,7 +73,7 @@ class InboxViewModel @Inject constructor(
setMemberID(recipientID)
} else if (recipientUsername?.isNotBlank() == true) {
viewModelScope.launch(ExceptionHandler.coroutine()) {
val member = socialRepository.retrieveMemberWithUsername(recipientUsername, false)
val member = socialRepository.retrieveMember(recipientUsername, false)
setMemberID(member?.id ?: "")
invalidateDataSource()
dataSourceFactory.updateRecipientID(memberID)

2
build.gradle
View file

@ -42,7 +42,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.8'
classpath "io.realm:realm-gradle-plugin:10.13.2-transformer-api"
classpath("io.realm.kotlin:gradle-plugin:$realm_version")
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"