diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java index 842391a6c..2b4ae10ac 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java @@ -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 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 customizations = select.queryList(); + if (customizations.size() == 0) { + this.apiHelper.getContent().compose(this.apiHelper.configureApiCallObserver()) + .subscribe(contentResult -> { + this.loadCustomizations(); + }, throwable -> {}); + } this.adapter.setCustomizationList(customizations); } diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java index 1f310e4dd..4bd6fc991 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java @@ -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)