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

fix challenge refreshing

Browse source
This commit is contained in:
Phillip Thelen 2017-01-30 15:05:34 +01:00
parent 30a88aa09d
commit d7e7d87d0e
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
View file

@ -75,14 +75,15 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
challenge.async().save();
}
setRefreshingIfVisible(swipeRefreshLayout, false);
setRefreshingIfVisible(swipeRefreshEmptyLayout, false);
if (viewUserChallengesOnly) {
setChallengeEntries(userChallenges);
} else {
setChallengeEntries(challenges);
}
setRefreshingIfVisible(swipeRefreshLayout, false);
setRefreshingIfVisible(swipeRefreshEmptyLayout, false);
}, throwable -> {
Log.e("ChallengeListFragment", "", throwable);
@ -160,8 +161,10 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
}
if (viewUserChallengesOnly && challenges.size() == 0) {
swipeRefreshEmptyLayout.setVisibility(View.VISIBLE);
swipeRefreshLayout.setRefreshing(false);
swipeRefreshLayout.setVisibility(View.GONE);
} else {
swipeRefreshEmptyLayout.setRefreshing(false);
swipeRefreshEmptyLayout.setVisibility(View.GONE);
swipeRefreshLayout.setVisibility(View.VISIBLE);
}

12
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
View file

@ -393,7 +393,7 @@ public class HabitRPGUser extends BaseModel {
}
List<Challenge> challenges = getChallengeList();
List<Challenge> newChallenges = new ArrayList<>();
if (getChallenges() != null) {
for (String s : getChallenges()) {
boolean challengeExistInDatabase = false;
@ -401,7 +401,8 @@ public class HabitRPGUser extends BaseModel {
for (Challenge challenge : challenges) {
if (challenge.id.equals(s)) {
challengeExistInDatabase = true;
challenges.remove(challenge);
newChallenges.add(challenge);
break;
}
}
@ -411,12 +412,15 @@ public class HabitRPGUser extends BaseModel {
challenge.id = s;
challenge.user_id = id;
challenges.add(challenge);
newChallenges.add(challenge);
}
}
for (Challenge challenge : challenges) {
challenge.user_id = null;
}
}
setChallengeList(challenges);
setChallengeList(newChallenges);
super.save();
}