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

fix avatar setup issues

Browse source
This commit is contained in:
Phillip Thelen 2016-10-02 02:33:25 +02:00
parent b7b9cdb4dd
commit f7d3981eec
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
View file

@ -1,5 +1,6 @@
package com.habitrpg.android.habitica.ui.fragments.setup;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.components.AppComponent;
import com.habitrpg.android.habitica.ui.AvatarView;
@ -23,6 +24,8 @@ import android.view.ViewGroup;
import java.util.List;
import javax.inject.Inject;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -39,6 +42,9 @@ public class AvatarSetupFragment extends BaseFragment {
GridLayoutManager layoutManager;
private HabitRPGUser user;
@Inject
APIHelper apiHelper;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -96,12 +102,17 @@ public class AvatarSetupFragment extends BaseFragment {
Where<Customization> select = new Select()
.from(Customization.class)
.where(Condition.CombinedCondition.begin(Condition.column("purchased").eq(true))
.or(Condition.column("price").eq(0))
.where(Condition.CombinedCondition.begin(Condition.column("price").eq(0))
.or(Condition.column("price").isNull())
);
List<Customization> customizations = select.queryList();
if (customizations.size() == 0) {
this.apiHelper.getContent().compose(this.apiHelper.configureApiCallObserver())
.subscribe(contentResult -> {
this.loadCustomizations();
}, throwable -> {});
}
this.adapter.setCustomizationList(customizations);
}

3
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
View file

@ -213,6 +213,9 @@ public class Preferences extends BaseModel {
@Override
public void save() {
if (user_id == null) {
return;
}
hair.userId = user_id;
if (suppressModals != null)