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

fix stable display

Browse source
This commit is contained in:
Phillip Thelen 2017-06-27 18:22:30 +02:00
parent 5d66e1b538
commit 89b0debaf8
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
View file

@ -146,12 +146,18 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
.map(user1 -> {
localRepository.executeTransaction(realm -> {
if (user != null) {
user1.getItems().setUserId(user.getId());
Items items = realm.copyToRealmOrUpdate(user1.getItems());
user1.getStats().setUserId(user.getId());
Stats stats = realm.copyToRealmOrUpdate(user1.getStats());
user.setItems(items);
user.setStats(stats);
if (user1.getItems() != null) {
user1.getItems().setUserId(user.getId());
Items items = realm.copyToRealmOrUpdate(user1.getItems());
user.setItems(items);
} else {
item.setOwned(item.getOwned()-1);
}
if (user.getStats() != null) {
user1.getStats().setUserId(user.getId());
Stats stats = realm.copyToRealmOrUpdate(user1.getStats());
user.setStats(stats);
}
}
});
return user;

1
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
View file

@ -154,6 +154,7 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
@Override
public Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup) {
animalGroup = animalGroup.replace("pets", "mounts").replace("Pets", "Mounts");
return realm.where(Mount.class)
.equalTo("animalGroup", animalGroup)
.equalTo("animal", animalType)

6
Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
View file

@ -108,7 +108,11 @@ public class Mount extends RealmObject implements Animal {
}
public boolean getOwned() {
return owned;
if (owned == null) {
return false;
} else {
return owned;
}
}
public void setOwned(@Nullable Boolean owned) {