Adapter の ID を Enum にして Page の順番と分離した

13 files changed, 93 insertions, 108 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
index c79c6a7b..67f5a04c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
@@ -38,6 +38,7 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.WindowManager;
+import android.widget.Adapter;
 import android.widget.ImageView;
 
 import net.lacolaco.smileessence.Application;
@@ -53,9 +54,7 @@ import net.lacolaco.smileessence.notification.NotificationType;
 import net.lacolaco.smileessence.notification.Notificator;
 import net.lacolaco.smileessence.preference.AppPreferenceHelper;
 import net.lacolaco.smileessence.preference.UserPreferenceHelper;
-import net.lacolaco.smileessence.twitter.OAuthSession;
-import net.lacolaco.smileessence.twitter.StatusFilter;
-import net.lacolaco.smileessence.twitter.TwitterApi;
+import net.lacolaco.smileessence.twitter.*;
 import net.lacolaco.smileessence.twitter.UserStreamListener;
 import net.lacolaco.smileessence.twitter.task.*;
 import net.lacolaco.smileessence.twitter.util.TwitterUtils;
@@ -63,11 +62,8 @@ import net.lacolaco.smileessence.util.*;
 import net.lacolaco.smileessence.view.*;
 import net.lacolaco.smileessence.view.adapter.*;
 import net.lacolaco.smileessence.view.dialog.ConfirmDialogFragment;
-import net.lacolaco.smileessence.viewmodel.MessageViewModel;
-import net.lacolaco.smileessence.viewmodel.StatusViewModel;
-import net.lacolaco.smileessence.viewmodel.UserListListAdapter;
+import net.lacolaco.smileessence.viewmodel.*;
 import net.lacolaco.smileessence.viewmodel.menu.MainActivityMenuHelper;
-
 import twitter4j.*;
 
 import java.util.Collection;
@@ -78,30 +74,38 @@ public class MainActivity extends Activity {
 
     // ------------------------------ FIELDS ------------------------------
 
+    public enum AdapterID {
+        Home,
+        Mentions,
+        History,
+        Messages,
+        Search,
+        UserList;
+
+        public static AdapterID get(int ordinal) {
+            return values()[ordinal];
+        }
+    }
+
     public static final int REQUEST_OAUTH = 10;
     public static final int REQUEST_GET_PICTURE_FROM_GALLERY = 11;
     public static final int REQUEST_GET_PICTURE_FROM_CAMERA = 12;
-    public static final int PAGE_GONE = -1;
-    public static final int PAGE_POST = 0;
-    public static final int ADAPTER_HOME = 1;
-    public static final int ADAPTER_MENTIONS = 2;
-    public static final int ADAPTER_HISTORY = 3;
-    public static final int ADAPTER_MESSAGES = 4;
-    public static final int ADAPTER_SEARCH = 5;
-    public static final int ADAPTER_USERLIST = 6;
     private static final String KEY_LAST_USED_SEARCH_QUERY = "lastUsedSearchQuery";
     private static final String KEY_LAST_USED_ACCOUNT_ID = "lastUsedAccountID";
     private static final String KEY_LAST_USER_LIST = "lastUsedUserList";
-    private int pageIndexMessages;
+    public static final int PAGE_INDEX_GONE = -1;
+    private int pageIndexPost;
+    private int pageIndexHome;
+    private int pageIndexMentions;
     private int pageIndexHistory;
+    private int pageIndexMessages;
     private int pageIndexSearch;
     private int pageIndexUserlist;
     private ViewPager viewPager;
     private PageListAdapter pagerAdapter;
-    private OAuthSession oauthSession;
     private Account currentAccount;
     private TwitterStream stream;
-    private HashMap<Integer, CustomListAdapter<?>> adapterMap = new HashMap<>();
+    private HashMap<AdapterID, CustomListAdapter<?>> adapterMap = new HashMap<>();
     private boolean streaming = false;
     private Uri cameraTempFilePath;
 
@@ -138,7 +142,7 @@ public class MainActivity extends Activity {
     private long getLastUsedAccountID() {
         String id = getAppPreferenceHelper().getValue(KEY_LAST_USED_ACCOUNT_ID, "");
         if (TextUtils.isEmpty(id)) {
-            return PAGE_GONE;
+            return -1;
         } else {
             return Long.parseLong(id);
         }
@@ -156,8 +160,8 @@ public class MainActivity extends Activity {
         return adapterMap.values();
     }
 
-    public int getPageHome() {
-        return ADAPTER_HOME;
+    public int getPageIndexHome() {
+        return pageIndexHome;
     }
 
     public int getPageIndexHistory() {
@@ -176,14 +180,6 @@ public class MainActivity extends Activity {
         return pageIndexUserlist;
     }
 
-    public int getPageMentions() {
-        return ADAPTER_MENTIONS;
-    }
-
-    public int getPagePost() {
-        return PAGE_POST;
-    }
-
     public PageListAdapter getPagerAdapter() {
         return pagerAdapter;
     }
@@ -249,8 +245,8 @@ public class MainActivity extends Activity {
     public void finish() {
         if (viewPager == null) {
             forceFinish();
-        } else if (viewPager.getCurrentItem() != ADAPTER_HOME) {
-            viewPager.setCurrentItem(ADAPTER_HOME, true);
+        } else if (viewPager.getCurrentItem() != getPageIndexHome()) {
+            viewPager.setCurrentItem(getPageIndexHome(), true);
         } else {
             ConfirmDialogFragment.show(this, getString(R.string.dialog_confirm_finish_app), new Runnable() {
 
@@ -336,37 +332,36 @@ public class MainActivity extends Activity {
 
     // -------------------------- OTHER METHODS --------------------------
 
-    public int addListPage(String name, Class<? extends CustomListFragment> fragmentClass, CustomListAdapter<?> adapter, int adapterIndex, boolean visible) {
+    public int addListPage(String name, Class<? extends CustomListFragment> fragmentClass, CustomListAdapter<?> adapter, AdapterID adapterId, boolean visible) {
         if (visible) {
             Bundle args = new Bundle();
-            args.putInt(CustomListFragment.ADAPTER_INDEX, adapterIndex);
-            addPage(name, fragmentClass, args, false);
-            adapterMap.put(adapterIndex, adapter);
-            return pagerAdapter.getCount() - 1;
+            args.putInt(CustomListFragment.ADAPTER_INDEX, adapterId.ordinal());
+            adapterMap.put(adapterId, adapter);
+            return addPage(name, fragmentClass, args, false);
         } else {
-            adapterMap.put(adapterIndex, adapter);
-            return PAGE_GONE;
+            return PAGE_INDEX_GONE;
         }
     }
 
-    public boolean addPage(String name, Class<? extends Fragment> fragmentClass, Bundle args, boolean withNotify) {
+    public int addPage(String name, Class<? extends Fragment> fragmentClass, Bundle args, boolean withNotify) {
         if (withNotify) {
-            return this.pagerAdapter.addPage(name, fragmentClass, args);
+            pagerAdapter.addPage(name, fragmentClass, args);
         } else {
-            return this.pagerAdapter.addPageWithoutNotify(name, fragmentClass, args);
+            pagerAdapter.addPageWithoutNotify(name, fragmentClass, args);
         }
+        return pagerAdapter.getCount() - 1;
     }
 
     public void forceFinish() {
         super.finish();
     }
 
-    public CustomListAdapter<?> getListAdapter(int i) {
-        return adapterMap.get(i);
+    public CustomListAdapter<?> getListAdapter(AdapterID adapterId) {
+        return adapterMap.get(adapterId);
     }
 
     public void openPostPage() {
-        setSelectedPageIndex(MainActivity.PAGE_POST);
+        setSelectedPageIndex(pageIndexPost);
     }
 
     public void openPostPageWithImage(Uri uri) {
@@ -409,10 +404,6 @@ public class MainActivity extends Activity {
         getAppPreferenceHelper().putValue(KEY_LAST_USER_LIST, lastUserList);
     }
 
-    public void setListAdapter(int adapterIndex, CustomListAdapter<?> adapter) {
-        adapterMap.put(adapterIndex, adapter);
-    }
-
     public void setSelectedPageIndex(final int position, final boolean smooth) {
         new UIHandler() {
             @Override
@@ -431,7 +422,7 @@ public class MainActivity extends Activity {
     public void startNewSearch(final Twitter twitter, final String query) {
         setLastSearch(query);
         if (!TextUtils.isEmpty(query)) {
-            final SearchListAdapter adapter = (SearchListAdapter) getListAdapter(ADAPTER_SEARCH);
+            final SearchListAdapter adapter = (SearchListAdapter) getListAdapter(AdapterID.Search);
             adapter.initSearch(query);
             adapter.clear();
             adapter.updateForce();
@@ -507,46 +498,46 @@ public class MainActivity extends Activity {
         userTask.execute();
     }
 
-    private void addHistoryPage() {
-        boolean visible = getUserPreferenceHelper().getValue(R.string.key_page_history_visibility, true);
-        getUserPreferenceHelper().putValue(R.string.key_page_history_visibility, visible);
-        EventListAdapter historyAdapter = new EventListAdapter(this);
-        pageIndexHistory = addListPage(getString(R.string.page_name_history), HistoryFragment.class, historyAdapter, ADAPTER_HISTORY, visible);
+    private void addPostPage() {
+        pageIndexPost = addPage(getString(R.string.page_name_post), PostFragment.class, null, true);
     }
 
     private void addHomePage() {
         StatusListAdapter homeAdapter = new StatusListAdapter(this);
-        addListPage(getString(R.string.page_name_home), HomeFragment.class, homeAdapter, ADAPTER_HOME, true);
+        pageIndexHome = addListPage(getString(R.string.page_name_home), HomeFragment.class, homeAdapter, AdapterID.Home, true);
     }
 
     private void addMentionsPage() {
         StatusListAdapter mentionsAdapter = new StatusListAdapter(this);
-        addListPage(getString(R.string.page_name_mentions), MentionsFragment.class, mentionsAdapter, ADAPTER_MENTIONS, true);
+        pageIndexMentions = addListPage(getString(R.string.page_name_mentions), MentionsFragment.class, mentionsAdapter, AdapterID.Mentions, true);
+    }
+
+    private void addHistoryPage() {
+        boolean visible = getUserPreferenceHelper().getValue(R.string.key_page_history_visibility, true);
+        getUserPreferenceHelper().putValue(R.string.key_page_history_visibility, visible);
+        EventListAdapter historyAdapter = new EventListAdapter(this);
+        pageIndexHistory = addListPage(getString(R.string.page_name_history), HistoryFragment.class, historyAdapter, AdapterID.History, visible);
     }
 
     private void addMessagesPage() {
         boolean visible = getUserPreferenceHelper().getValue(R.string.key_page_messages_visibility, true);
         getUserPreferenceHelper().putValue(R.string.key_page_messages_visibility, visible);
         MessageListAdapter messagesAdapter = new MessageListAdapter(this);
-        pageIndexMessages = addListPage(getString(R.string.page_name_messages), MessagesFragment.class, messagesAdapter, ADAPTER_MESSAGES, visible);
-    }
-
-    private void addPostPage() {
-        addPage(getString(R.string.page_name_post), PostFragment.class, null, true);
+        pageIndexMessages = addListPage(getString(R.string.page_name_messages), MessagesFragment.class, messagesAdapter, AdapterID.Messages, visible);
     }
 
     private void addSearchPage() {
         boolean visible = getUserPreferenceHelper().getValue(R.string.key_page_search_visibility, true);
         getUserPreferenceHelper().putValue(R.string.key_page_search_visibility, visible);
         SearchListAdapter searchAdapter = new SearchListAdapter(this);
-        pageIndexSearch = addListPage(getString(R.string.page_name_search), SearchFragment.class, searchAdapter, ADAPTER_SEARCH, visible);
+        pageIndexSearch = addListPage(getString(R.string.page_name_search), SearchFragment.class, searchAdapter, AdapterID.Search, visible);
     }
 
     private void addUserListPage() {
         boolean visible = getUserPreferenceHelper().getValue(R.string.key_page_list_visibility, true);
         getUserPreferenceHelper().putValue(R.string.key_page_list_visibility, visible);
         UserListListAdapter userListAdapter = new UserListListAdapter(this);
-        pageIndexUserlist = addListPage(getString(R.string.page_name_list), UserListFragment.class, userListAdapter, ADAPTER_USERLIST, visible);
+        pageIndexUserlist = addListPage(getString(R.string.page_name_list), UserListFragment.class, userListAdapter, AdapterID.UserList, visible);
     }
 
     private void getImageUri(int requestCode, int resultCode, Intent data) {
@@ -577,7 +568,7 @@ public class MainActivity extends Activity {
             @Override
             protected void onPostExecute(twitter4j.Status[] statuses) {
                 super.onPostExecute(statuses);
-                StatusListAdapter adapter = (StatusListAdapter) getListAdapter(ADAPTER_HOME);
+                StatusListAdapter adapter = (StatusListAdapter) getListAdapter(AdapterID.Home);
                 for (twitter4j.Status status : statuses) {
                     StatusViewModel statusViewModel = new StatusViewModel(status, currentAccount);
                     adapter.addToBottom(statusViewModel);
@@ -598,7 +589,7 @@ public class MainActivity extends Activity {
             @Override
             protected void onPostExecute(twitter4j.Status[] statuses) {
                 super.onPostExecute(statuses);
-                StatusListAdapter adapter = (StatusListAdapter) getListAdapter(ADAPTER_MENTIONS);
+                StatusListAdapter adapter = (StatusListAdapter) getListAdapter(AdapterID.Mentions);
                 for (twitter4j.Status status : statuses) {
                     adapter.addToBottom(new StatusViewModel(status, currentAccount));
                 }
@@ -608,14 +599,14 @@ public class MainActivity extends Activity {
     }
 
     private void initMessages(final Twitter twitter, final Paging paging) {
-        if (pageIndexMessages == PAGE_GONE) {
+        if (pageIndexMessages == PAGE_INDEX_GONE) {
             return;
         }
         new DirectMessagesTask(twitter, this, paging) {
             @Override
             protected void onPostExecute(DirectMessage[] directMessages) {
                 super.onPostExecute(directMessages);
-                MessageListAdapter adapter = (MessageListAdapter) getListAdapter(ADAPTER_MESSAGES);
+                MessageListAdapter adapter = (MessageListAdapter) getListAdapter(AdapterID.Messages);
                 for (DirectMessage message : directMessages) {
                     adapter.addToBottom(new MessageViewModel(message, currentAccount));
                 }
@@ -626,7 +617,7 @@ public class MainActivity extends Activity {
             @Override
             protected void onPostExecute(DirectMessage[] directMessages) {
                 super.onPostExecute(directMessages);
-                MessageListAdapter adapter = (MessageListAdapter) getListAdapter(ADAPTER_MESSAGES);
+                MessageListAdapter adapter = (MessageListAdapter) getListAdapter(AdapterID.Messages);
                 for (DirectMessage message : directMessages) {
                     adapter.addToBottom(new MessageViewModel(message, currentAccount));
                 }
@@ -640,7 +631,7 @@ public class MainActivity extends Activity {
     }
 
     private void initSearch(Twitter twitter) {
-        if (pageIndexSearch == PAGE_GONE) {
+        if (pageIndexSearch == PAGE_INDEX_GONE) {
             return;
         }
         String lastUsedSearchQuery = getLastSearch();
@@ -650,7 +641,7 @@ public class MainActivity extends Activity {
     }
 
     private void initUserList(Twitter twitter) {
-        if (pageIndexUserlist == PAGE_GONE) {
+        if (pageIndexUserlist == PAGE_INDEX_GONE) {
             return;
         }
         String lastUserList = getLastUserList();
@@ -675,7 +666,7 @@ public class MainActivity extends Activity {
         pagerAdapter.refreshListNavigation();
         viewPager.setOffscreenPageLimit(pagerAdapter.getCount());
         initPostState();
-        setSelectedPageIndex(ADAPTER_HOME, false);
+        setSelectedPageIndex(pageIndexHome, false);
     }
 
     public void initializeView() {
@@ -725,7 +716,7 @@ public class MainActivity extends Activity {
 
     private void startUserList(Twitter twitter, String listFullName) {
         saveLastUserList(listFullName);
-        final UserListListAdapter adapter = (UserListListAdapter) getListAdapter(ADAPTER_USERLIST);
+        final UserListListAdapter adapter = (UserListListAdapter) getListAdapter(AdapterID.UserList);
         adapter.setListFullName(listFullName);
         adapter.clear();
         adapter.updateForce();
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenSearch.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenSearch.java
index 0877bb55..1f911c82 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenSearch.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenSearch.java
@@ -56,7 +56,7 @@ public class CommandOpenSearch extends Command {
     @Override
     public boolean isEnabled() {
         MainActivity activity = (MainActivity) getActivity();
-        return activity.getPageIndexSearch() != MainActivity.PAGE_GONE;
+        return activity.getPageIndexSearch() != MainActivity.PAGE_INDEX_GONE;
     }
 
     // -------------------------- OTHER METHODS --------------------------
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java
index a2d2fd27..93169bfe 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java
@@ -51,7 +51,7 @@ public class CommandSearchOnTwitter extends Command {
 
     @Override
     public boolean isEnabled() {
-        return ((MainActivity) getActivity()).getPageIndexSearch() != MainActivity.PAGE_GONE;
+        return ((MainActivity) getActivity()).getPageIndexSearch() != MainActivity.PAGE_INDEX_GONE;
     }
 
     // -------------------------- OTHER METHODS --------------------------
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java b/app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java
index 855be687..986055d7 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java
@@ -53,7 +53,7 @@ public class StatusFilter {
     }
 
     private static void addToMentions(MainActivity activity, StatusViewModel status) {
-        StatusListAdapter adapter = (StatusListAdapter) activity.getListAdapter(MainActivity.ADAPTER_MENTIONS);
+        StatusListAdapter adapter = (StatusListAdapter) activity.getListAdapter(MainActivity.AdapterID.Mentions);
         adapter.addToTop(status);
         adapter.update();
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java b/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java
index 02ca4c7d..41cabcc9 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java
@@ -140,7 +140,7 @@ public class UserStreamListener implements twitter4j.UserStreamListener, Connect
 
     @Override
     public void onDeletionNotice(long directMessageId, long userId) {
-        MessageListAdapter messages = (MessageListAdapter) activity.getListAdapter(MainActivity.ADAPTER_MESSAGES);
+        MessageListAdapter messages = (MessageListAdapter) activity.getListAdapter(MainActivity.AdapterID.Messages);
         messages.removeByMessageID(directMessageId);
         messages.updateForce();
         DirectMessageCache.getInstance().remove(directMessageId);
@@ -158,8 +158,8 @@ public class UserStreamListener implements twitter4j.UserStreamListener, Connect
         }
         if (isMe(source)) {
             FavoriteCache.getInstance().put(favoritedStatus, true);
-            activity.getListAdapter(MainActivity.ADAPTER_HOME).update();
-            activity.getListAdapter(MainActivity.ADAPTER_MENTIONS).update();
+            activity.getListAdapter(MainActivity.AdapterID.Home).update();
+            activity.getListAdapter(MainActivity.AdapterID.Mentions).update();
         }
     }
 
@@ -172,8 +172,8 @@ public class UserStreamListener implements twitter4j.UserStreamListener, Connect
         }
         if (isMe(source)) {
             FavoriteCache.getInstance().put(unfavoritedStatus, false);
-            activity.getListAdapter(MainActivity.ADAPTER_HOME).update();
-            activity.getListAdapter(MainActivity.ADAPTER_MENTIONS).update();
+            activity.getListAdapter(MainActivity.AdapterID.Home).update();
+            activity.getListAdapter(MainActivity.AdapterID.Mentions).update();
         }
     }
 
@@ -271,26 +271,26 @@ public class UserStreamListener implements twitter4j.UserStreamListener, Connect
     }
 
     private void addToHistory(EventViewModel mentioned) {
-        EventListAdapter history = (EventListAdapter) activity.getListAdapter(MainActivity.ADAPTER_HISTORY);
+        EventListAdapter history = (EventListAdapter) activity.getListAdapter(MainActivity.AdapterID.History);
         Notificator.publish(activity, mentioned.getFormattedString(activity));
         history.addToTop(mentioned);
         history.update();
     }
 
     private void addToHome(StatusViewModel viewModel) {
-        StatusListAdapter home = (StatusListAdapter) activity.getListAdapter(MainActivity.ADAPTER_HOME);
+        StatusListAdapter home = (StatusListAdapter) activity.getListAdapter(MainActivity.AdapterID.Home);
         home.addToTop(viewModel);
         home.update();
     }
 
     private void addToMentions(StatusViewModel viewModel) {
-        StatusListAdapter mentions = (StatusListAdapter) activity.getListAdapter(MainActivity.ADAPTER_MENTIONS);
+        StatusListAdapter mentions = (StatusListAdapter) activity.getListAdapter(MainActivity.AdapterID.Mentions);
         mentions.addToTop(viewModel);
         mentions.update();
     }
 
     private void addToMessages(MessageViewModel message) {
-        MessageListAdapter messages = (MessageListAdapter) activity.getListAdapter(MainActivity.ADAPTER_MESSAGES);
+        MessageListAdapter messages = (MessageListAdapter) activity.getListAdapter(MainActivity.AdapterID.Messages);
         messages.addToTop(message);
         messages.update();
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/CustomListFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/CustomListFragment.java
index f6a683fe..91a77cbc 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/CustomListFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/CustomListFragment.java
@@ -49,7 +49,7 @@ public class CustomListFragment extends Fragment implements AbsListView.OnScroll
     public static final String ADAPTER_INDEX = "fragmentIndex";
     public static final int SCROLL_DURATION = 1500;
 
-    private int fragmentIndex;
+    private MainActivity.AdapterID fragmentIndex;
 
     // --------------------- GETTER / SETTER METHODS ---------------------
 
@@ -77,7 +77,7 @@ public class CustomListFragment extends Fragment implements AbsListView.OnScroll
     @Override
     public void onScrollStateChanged(AbsListView absListView, int scrollState) {
         Bundle args = getArguments();
-        fragmentIndex = args.getInt(ADAPTER_INDEX);
+        fragmentIndex = MainActivity.AdapterID.get(args.getInt(ADAPTER_INDEX));
         CustomListAdapter<?> adapter = getListAdapter(fragmentIndex);
         adapter.setNotifiable(false);
 
@@ -98,14 +98,14 @@ public class CustomListFragment extends Fragment implements AbsListView.OnScroll
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Bundle args = getArguments();
-        fragmentIndex = args.getInt(ADAPTER_INDEX);
+        fragmentIndex = MainActivity.AdapterID.get(args.getInt(ADAPTER_INDEX));
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View page = inflater.inflate(R.layout.fragment_list, container, false);
         Bundle args = getArguments();
-        int fragmentIndex = args.getInt(ADAPTER_INDEX);
+        MainActivity.AdapterID fragmentIndex = MainActivity.AdapterID.get(args.getInt(ADAPTER_INDEX));
         PullToRefreshListView listView = getListView(page);
         ListAdapter adapter = getListAdapter(fragmentIndex);
         listView.setAdapter(adapter);
@@ -118,18 +118,18 @@ public class CustomListFragment extends Fragment implements AbsListView.OnScroll
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(ADAPTER_INDEX, fragmentIndex);
+        outState.putInt(ADAPTER_INDEX, fragmentIndex.ordinal());
     }
 
     @Override
     public void onViewStateRestored(Bundle savedInstanceState) {
         super.onViewStateRestored(savedInstanceState);
         if (savedInstanceState != null) {
-            fragmentIndex = savedInstanceState.getInt(ADAPTER_INDEX);
+            fragmentIndex = MainActivity.AdapterID.get(savedInstanceState.getInt(ADAPTER_INDEX));
         }
     }
 
-    protected CustomListAdapter<?> getListAdapter(int fragmentIndex) {
+    protected CustomListAdapter<?> getListAdapter(MainActivity.AdapterID fragmentIndex) {
         return ((MainActivity) getActivity()).getListAdapter(fragmentIndex);
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/HomeFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/HomeFragment.java
index 0cc3b77f..f4af80ec 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/HomeFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/HomeFragment.java
@@ -118,6 +118,6 @@ public class HomeFragment extends CustomListFragment {
     }
 
     private StatusListAdapter getListAdapter(MainActivity activity) {
-        return (StatusListAdapter) activity.getListAdapter(MainActivity.ADAPTER_HOME);
+        return (StatusListAdapter) activity.getListAdapter(MainActivity.AdapterID.Home);
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java
index d47d9552..3a453a7a 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java
@@ -101,6 +101,6 @@ public class MentionsFragment extends CustomListFragment {
     }
 
     private StatusListAdapter getListAdapter(MainActivity activity) {
-        return (StatusListAdapter) activity.getListAdapter(MainActivity.ADAPTER_MENTIONS);
+        return (StatusListAdapter) activity.getListAdapter(MainActivity.AdapterID.Mentions);
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/MessagesFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/MessagesFragment.java
index eccea631..f4968c7d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/MessagesFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/MessagesFragment.java
@@ -104,6 +104,6 @@ public class MessagesFragment extends CustomListFragment {
     }
 
     private MessageListAdapter getListAdapter(MainActivity activity) {
-        return (MessageListAdapter) activity.getListAdapter(MainActivity.ADAPTER_MESSAGES);
+        return (MessageListAdapter) activity.getListAdapter(MainActivity.AdapterID.Messages);
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
index 22a3fa31..23358f46 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
@@ -382,6 +382,6 @@ public class PostFragment extends Fragment implements TextWatcher, View.OnFocusC
         TweetTask tweetTask = new TweetTask(TwitterApi.getTwitter(mainActivity.getCurrentAccount()), statusUpdate, state.getMediaFilePath(), mainActivity);
         tweetTask.execute();
         PostState.newState().beginTransaction().commit();
-        mainActivity.setSelectedPageIndex(MainActivity.ADAPTER_HOME);
+        mainActivity.setSelectedPageIndex(mainActivity.getPageIndexHome());
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
index 1b1d2fe7..bf847653 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
@@ -72,8 +72,8 @@ public class SearchFragment extends CustomListFragment implements View.OnClickLi
 
     // --------------------- GETTER / SETTER METHODS ---------------------
 
-    private int getAdapterIndex() {
-        return getArguments().getInt(ADAPTER_INDEX);
+    private MainActivity.AdapterID getAdapterIndex() {
+        return MainActivity.AdapterID.get(getArguments().getInt(ADAPTER_INDEX));
     }
 
     private MainActivity getMainActivity() {
@@ -233,7 +233,7 @@ public class SearchFragment extends CustomListFragment implements View.OnClickLi
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View page = inflater.inflate(R.layout.fragment_search, container, false);
-        int fragmentIndex = getAdapterIndex();
+        MainActivity.AdapterID fragmentIndex = getAdapterIndex();
         PullToRefreshListView listView = getListView(page);
         SearchListAdapter adapter = (SearchListAdapter) getListAdapter(fragmentIndex);
         listView.setAdapter(adapter);
@@ -287,7 +287,7 @@ public class SearchFragment extends CustomListFragment implements View.OnClickLi
     }
 
     private SearchListAdapter getListAdapter(MainActivity activity) {
-        return (SearchListAdapter) activity.getListAdapter(MainActivity.ADAPTER_SEARCH);
+        return (SearchListAdapter) activity.getListAdapter(MainActivity.AdapterID.Search);
     }
 
     private ImageButton getQueriesButton(View page) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java
index 05b60649..82163102 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java
@@ -186,7 +186,7 @@ public class UserListFragment extends CustomListFragment implements View.OnClick
     }
 
     private UserListListAdapter getListAdapter(MainActivity activity) {
-        return (UserListListAdapter) getListAdapter(MainActivity.ADAPTER_USERLIST);
+        return (UserListListAdapter) getListAdapter(MainActivity.AdapterID.UserList);
     }
 
     private TextView getTextListName(View page) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
index 5d597e0c..3f4acbb6 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
@@ -75,6 +75,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
 
     private static final String KEY_USER_ID = "userID";
     private static final int ADAPTER_INDEX = 100;
+    private StatusListAdapter adapter;
     private TextView textViewScreenName;
     private TextView textViewName;
     private TextView textViewURL;
@@ -171,7 +172,6 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
         final MainActivity activity = (MainActivity) getActivity();
         final Account currentAccount = activity.getCurrentAccount();
         Twitter twitter = TwitterApi.getTwitter(currentAccount);
-        final StatusListAdapter adapter = getListAdapter(activity);
         Paging paging = TwitterUtils.getPaging(TwitterUtils.getPagingCount(activity));
         if (adapter.getCount() > 0) {
             paging.setSinceId(adapter.getTopID());
@@ -195,7 +195,6 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
         final MainActivity activity = (MainActivity) getActivity();
         final Account currentAccount = activity.getCurrentAccount();
         Twitter twitter = TwitterApi.getTwitter(currentAccount);
-        final StatusListAdapter adapter = getListAdapter(activity);
         Paging paging = TwitterUtils.getPaging(TwitterUtils.getPagingCount(activity));
         if (adapter.getCount() > 0) {
             paging.setMaxId(adapter.getLastID() - 1);
@@ -302,10 +301,6 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
         return html;
     }
 
-    private StatusListAdapter getListAdapter(MainActivity activity) {
-        return (StatusListAdapter) activity.getListAdapter(ADAPTER_INDEX);
-    }
-
     private void initUserData(User user, final Account account) {
         textViewName.setText(user.getName());
         textViewScreenName.setText(user.getScreenName());
@@ -330,10 +325,9 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
         ImageCache.getInstance().setImageToView(user.getBiggerProfileImageURL(), imageViewIcon);
         ImageCache.getInstance().setImageToView(user.getProfileBannerURL(), imageViewHeader);
         MainActivity activity = (MainActivity) getActivity();
-        final StatusListAdapter adapter = new StatusListAdapter(activity);
+        adapter = new StatusListAdapter(activity);
         listViewTimeline.setAdapter(adapter);
         listViewTimeline.setOnRefreshListener(this);
-        activity.setListAdapter(ADAPTER_INDEX, adapter);
         executeUserTimelineTask(user, account, adapter);
         updateRelationship(activity, user.getId());
     }