From 90900858b3092ade507dd1ea490ddffe35bceb9a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 14 Apr 2017 15:16:32 +0200
Subject: [PATCH] fix task reordering

---
 .../habitica/ui/fragments/preferences/PreferencesFragment.java | 3 ++-
 .../habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index d31e4407b..826f4f6cf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
@@ -74,7 +75,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ((HabiticaApplication) getActivity().getApplication()).getComponent().inject(this);
+        HabiticaBaseApplication.getComponent().inject(this);
         context = getActivity();
 
         String userID = getPreferenceManager().getSharedPreferences().getString(context.getString(R.string.SP_userID), null);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
index 3e3e851f0..4fd17edca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
@@ -200,7 +200,6 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
             }
 
             public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
-                swipeRefreshLayout.setEnabled(true);
                 if (mFromPosition == null) mFromPosition = viewHolder.getAdapterPosition();
                 ((ItemTouchHelperAdapter) recyclerAdapter).onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
                 return true;
@@ -220,6 +219,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
             @Override
             public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
                 super.clearView(recyclerView, viewHolder);
+                swipeRefreshLayout.setEnabled(true);
 
                 viewHolder.itemView.setBackgroundColor(Color.WHITE);
                 if (mFromPosition != null) {