From ec37bf04fc89d0a7b4374e9a2afcd0dbc8a494cf Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 31 Oct 2016 15:26:13 +0100 Subject: [PATCH] fix potential crash when creating task --- Habitica/AndroidManifest.xml | 2 +- Habitica/build.gradle | 2 +- .../habitica/ui/fragments/tasks/TasksFragment.java | 11 ++--------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index c5e926f4c..ec9d3a0c4 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 94f743cab..fee33eebb 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -177,7 +177,7 @@ android { } release { signingConfig signingConfigs.release - debuggable false + debuggable true multiDexEnabled true resValue "string", "content_provider", "com.habitrpg.android.habitica.fileprovider" diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java index 84556343b..841b737cd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java @@ -5,23 +5,16 @@ import com.github.clans.fab.FloatingActionMenu; import com.habitrpg.android.habitica.HabiticaApplication; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback; -import com.habitrpg.android.habitica.callbacks.TaskCreationCallback; -import com.habitrpg.android.habitica.callbacks.TaskScoringCallback; -import com.habitrpg.android.habitica.callbacks.TaskUpdateCallback; import com.habitrpg.android.habitica.components.AppComponent; -import com.habitrpg.android.habitica.events.HabitScoreEvent; import com.habitrpg.android.habitica.events.TaskSaveEvent; import com.habitrpg.android.habitica.events.TaskTappedEvent; import com.habitrpg.android.habitica.events.ToggledEditTagsEvent; -import com.habitrpg.android.habitica.events.ToggledInnStateEvent; import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand; -import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand; import com.habitrpg.android.habitica.events.commands.CreateTagCommand; import com.habitrpg.android.habitica.events.commands.DeleteTagCommand; import com.habitrpg.android.habitica.events.commands.EditTagCommand; import com.habitrpg.android.habitica.events.commands.FilterTasksByTagsCommand; import com.habitrpg.android.habitica.events.commands.RefreshUserCommand; -import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand; import com.habitrpg.android.habitica.events.commands.UpdateTagCommand; import com.habitrpg.android.habitica.helpers.TagsHelper; import com.habitrpg.android.habitica.ui.activities.MainActivity; @@ -38,7 +31,6 @@ import com.habitrpg.android.habitica.ui.menu.EditTagsSectionDrawer; import com.habitrpg.android.habitica.ui.menu.EditTextDrawer; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.magicmicky.habitrpgwrapper.lib.models.Tag; -import com.magicmicky.habitrpgwrapper.lib.models.TaskDirection; import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; import com.mikepenz.materialdrawer.interfaces.OnCheckedChangeListener; import com.mikepenz.materialdrawer.model.SwitchDrawerItem; @@ -563,7 +555,8 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi } private void switchToTaskTab(String taskType) { - for (Map.Entry tabEntry : ViewFragmentsDictionary.entrySet()) { + HashMap dict = new HashMap<>(ViewFragmentsDictionary); + for (Map.Entry tabEntry : dict.entrySet()) { if (tabEntry.getValue().getClassName().equals(taskType)) { viewPager.setCurrentItem(tabEntry.getKey()); }