diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java index 5129a6e0179e4112962eee3f9c6eb9ac28113667..1eea9b751ec2d0d8f1907ea92b3e4200889b7e64 100644 --- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java +++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java @@ -4,11 +4,13 @@ import android.content.Context; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; + import com.eyecreate.miceandmystics.miceandmystics.MiceAndMysticsApplication; import com.eyecreate.miceandmystics.miceandmystics.R; -import com.eyecreate.miceandmystics.miceandmystics.model.*; +import com.eyecreate.miceandmystics.miceandmystics.model.Character; import com.eyecreate.miceandmystics.miceandmystics.model.Enums.CampaignType; import com.eyecreate.miceandmystics.miceandmystics.viewholders.CampaignViewHolder; + import io.realm.RealmResults; public class CampaignAdapter extends RecyclerView.Adapter { @@ -50,13 +52,12 @@ public class CampaignAdapter extends RecyclerView.Adapter { .where(com.eyecreate.miceandmystics.miceandmystics.model.Campaign.class) .equalTo("campaignName",campaignName) .findFirst(); - for(com.eyecreate.miceandmystics.miceandmystics.model.Character character:campaign.getCurrentCharacters()) { - CampaignDetailsAdapter.removeCharacterFromDB(character); + for(Character character:campaign.getCurrentCharacters()) { + CampaignDetailsAdapter.removeItemsAndAbilities(character); } MiceAndMysticsApplication.getRealmInstance().beginTransaction(); - for(Achievement achievement:campaign.getPartyStoryAchievements()) { - achievement.deleteFromRealm(); - } + campaign.getCurrentCharacters().deleteAllFromRealm(); + campaign.getPartyStoryAchievements().deleteAllFromRealm(); campaign.deleteFromRealm(); MiceAndMysticsApplication.getRealmInstance().commitTransaction(); fullRefresh(); diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java index 317630e66b561f8f0dbb780ae4de7f14ddc3af22..7f6a62220befa778338a005a203fdb84788ab60e 100644 --- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java +++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java @@ -5,12 +5,14 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.Toast; + import com.eyecreate.miceandmystics.miceandmystics.MiceAndMysticsApplication; import com.eyecreate.miceandmystics.miceandmystics.R; -import com.eyecreate.miceandmystics.miceandmystics.model.*; import com.eyecreate.miceandmystics.miceandmystics.model.Achievement; +import com.eyecreate.miceandmystics.miceandmystics.model.Campaign; import com.eyecreate.miceandmystics.miceandmystics.model.Character; -import com.eyecreate.miceandmystics.miceandmystics.model.Enums.*; +import com.eyecreate.miceandmystics.miceandmystics.model.Enums.CharacterNames; +import com.eyecreate.miceandmystics.miceandmystics.model.Player; import com.eyecreate.miceandmystics.miceandmystics.viewholders.CampaignDetailsViewHolder; import com.eyecreate.miceandmystics.miceandmystics.viewholders.CampaignHeaderViewHolder; import com.eyecreate.miceandmystics.miceandmystics.viewholders.PartyAchievementViewHolder; @@ -92,14 +94,10 @@ public class CampaignDetailsAdapter extends RecyclerView.Adapter