sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix challenge loading.

Browse source
This commit is contained in:
Phillip Thelen 2018-03-12 13:22:11 +01:00
parent ed38ca6000
commit afd3303256
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica" package="com.habitrpg.android.habitica"
android:versionCode="1974" android:versionCode="1975"
android:versionName="1.4.3" android:versionName="1.4.3"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:installLocation="auto" > android:installLocation="auto" >

4
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
View file

@ -42,7 +42,7 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
removeOldTags(user.id, user.tags) removeOldTags(user.id, user.tags)
} }
if (user.challenges != null) { if (user.challenges != null) {
removeOldChallenges(user.id, user.challenges) removeOldChallenges(user.challenges)
} }
} }
@ -56,7 +56,7 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
} }
} }
private fun removeOldChallenges(userId: String, onlineChallenges: List<Challenge>) { private fun removeOldChallenges(onlineChallenges: List<Challenge>) {
val challenges = realm.where(Challenge::class.java).equalTo("isParticipating", true).findAll().createSnapshot() val challenges = realm.where(Challenge::class.java).equalTo("isParticipating", true).findAll().createSnapshot()
val challengesToDelete = challenges.filterNot { onlineChallenges.contains(it) } val challengesToDelete = challenges.filterNot { onlineChallenges.contains(it) }
realm.executeTransaction { realm.executeTransaction {

9
Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
View file

@ -1,5 +1,6 @@
package com.habitrpg.android.habitica.models.social; package com.habitrpg.android.habitica.models.social;
import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
import com.habitrpg.android.habitica.models.tasks.TasksOrder; import com.habitrpg.android.habitica.models.tasks.TasksOrder;
import com.habitrpg.android.habitica.models.user.User; import com.habitrpg.android.habitica.models.user.User;
@ -64,4 +65,12 @@ public class Challenge extends RealmObject {
return map; return map;
} }
@Override
public boolean equals(Object obj) {
if (obj.getClass().equals(Challenge.class) && this.id != null) {
return this.id.equals(((Challenge)obj).id);
}
return super.equals(obj);
}
} }