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

better handling for party display. Fixes #173

Browse source
This commit is contained in:
Phillip Thelen 2015-12-10 10:55:42 +01:00
parent 1f2591fd44
commit 65bcd696a0
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/com/habitrpg/android/habitica/APIHelper.java
View file

@ -246,6 +246,8 @@ public class APIHelper implements ErrorHandler, Profiler {
} else if (status >= 500 && status < 600) {
showConnectionProblemDialog(activity,R.string.internal_error_api);
return cause;
} else if (status == 404 && cause.getUrl().endsWith("party/chat")) {
return cause;
}
}
showConnectionProblemDialog(activity, R.string.internal_error_api);

34
Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java
View file

@ -47,30 +47,21 @@ public class PartyFragment extends BaseFragment {
final ContentCache contentCache = new ContentCache(mAPIHelper.apiService);
if (this.user.getParty() == null ) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity)
.setMessage(activity.getString(R.string.no_party_message))
.setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
}
});
builder.show();
return v;
} else if (this.user.getParty().id == null) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity)
.setMessage(activity.getString(R.string.no_party_message))
.setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
}
});
builder.show();
return v;
}
// Get the full group data
mAPIHelper.apiService.getGroup("party", new Callback<Group>() {
@Override
public void success(Group group, Response response) {
if (group == null) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity)
.setMessage(activity.getString(R.string.no_party_message))
.setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
}
});
builder.show();
tabLayout.removeAllTabs();
return;
}
PartyFragment.this.group = group;
if (partyMemberListFragment != null) {
@ -81,7 +72,7 @@ public class PartyFragment extends BaseFragment {
partyInformationFragment.setGroup(group);
}
if (group != null && group.quest != null && group.quest.key != null && !group.quest.key.isEmpty()) {
if (group.quest != null && group.quest.key != null && !group.quest.key.isEmpty()) {
contentCache.GetQuestContent(group.quest.key, new ContentCache.QuestContentCallback() {
@Override
public void GotQuest(QuestContent content) {
@ -95,7 +86,6 @@ public class PartyFragment extends BaseFragment {
@Override
public void failure(RetrofitError error) {
}
});
setViewPagerAdapter();