From f566be4436c76ac123caf120f0af6dbc37440754 Mon Sep 17 00:00:00 2001
From: George Venios <veniosg@gmail.com>
Date: Mon, 7 Sep 2015 01:28:16 +0100
Subject: [PATCH] Renamed FoldersFragment.

---
 .../test/activities/MainActivityTest.java          |  5 ++---
 .../syncthingandroid/activities/MainActivity.java  | 14 +++++++-------
 ...oldersFragment.java => FolderListFragment.java} |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename src/main/java/com/nutomic/syncthingandroid/fragments/{FoldersFragment.java => FolderListFragment.java} (97%)

diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/activities/MainActivityTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/activities/MainActivityTest.java
index 41da5f39..18b075ff 100644
--- a/src/androidTest/java/com/nutomic/syncthingandroid/test/activities/MainActivityTest.java
+++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/activities/MainActivityTest.java
@@ -1,11 +1,10 @@
 package com.nutomic.syncthingandroid.test.activities;
 
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import com.nutomic.syncthingandroid.activities.MainActivity;
 import com.nutomic.syncthingandroid.fragments.DevicesFragment;
-import com.nutomic.syncthingandroid.fragments.FoldersFragment;
+import com.nutomic.syncthingandroid.fragments.FolderListFragment;
 import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder;
 import com.nutomic.syncthingandroid.test.MockSyncthingService;
 
@@ -20,7 +19,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     public void testOnServiceConnected() {
         getActivity().onServiceConnected(null, new SyncthingServiceBinder(mService));
         assertTrue(mService.containsListenerInstance(MainActivity.class));
-        assertTrue(mService.containsListenerInstance(FoldersFragment.class));
+        assertTrue(mService.containsListenerInstance(FolderListFragment.class));
         assertTrue(mService.containsListenerInstance(DevicesFragment.class));
     }
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
index 61000982..826ca373 100644
--- a/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
@@ -35,7 +35,7 @@ import android.widget.TextView;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.fragments.DevicesFragment;
 import com.nutomic.syncthingandroid.fragments.DrawerFragment;
-import com.nutomic.syncthingandroid.fragments.FoldersFragment;
+import com.nutomic.syncthingandroid.fragments.FolderListFragment;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 
@@ -44,7 +44,7 @@ import java.util.Date;
 import static java.lang.Math.min;
 
 /**
- * Shows {@link com.nutomic.syncthingandroid.fragments.FoldersFragment} and
+ * Shows {@link FolderListFragment} and
  * {@link com.nutomic.syncthingandroid.fragments.DevicesFragment} in different tabs, and
  * {@link com.nutomic.syncthingandroid.fragments.DrawerFragment} in the navigation drawer.
  */
@@ -187,7 +187,7 @@ public class MainActivity extends SyncthingActivity
                 }
             };
 
-    private FoldersFragment mFolderFragment;
+    private FolderListFragment mFolderFragment;
 
     private DevicesFragment mDevicesFragment;
 
@@ -216,15 +216,15 @@ public class MainActivity extends SyncthingActivity
 
         if (savedInstanceState != null) {
             FragmentManager fm = getSupportFragmentManager();
-            mFolderFragment = (FoldersFragment) fm.getFragment(
-                    savedInstanceState, FoldersFragment.class.getName());
+            mFolderFragment = (FolderListFragment) fm.getFragment(
+                    savedInstanceState, FolderListFragment.class.getName());
             mDevicesFragment = (DevicesFragment) fm.getFragment(
                     savedInstanceState, DevicesFragment.class.getName());
             mDrawerFragment = (DrawerFragment) fm.getFragment(
                     savedInstanceState, DrawerFragment.class.getName());
             mViewPager.setCurrentItem(savedInstanceState.getInt("currentTab"));
         } else {
-            mFolderFragment = new FoldersFragment();
+            mFolderFragment = new FolderListFragment();
             mDevicesFragment = new DevicesFragment();
             mDrawerFragment = new DrawerFragment();
         }
@@ -269,7 +269,7 @@ public class MainActivity extends SyncthingActivity
         // Avoid crash if called during startup.
         if (mFolderFragment != null && mDevicesFragment != null && mDrawerFragment != null) {
             FragmentManager fm = getSupportFragmentManager();
-            fm.putFragment(outState, FoldersFragment.class.getName(), mFolderFragment);
+            fm.putFragment(outState, FolderListFragment.class.getName(), mFolderFragment);
             fm.putFragment(outState, DevicesFragment.class.getName(), mDevicesFragment);
             fm.putFragment(outState, DrawerFragment.class.getName(), mDrawerFragment);
             outState.putInt("currentTab", mViewPager.getCurrentItem());
diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/FoldersFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java
similarity index 97%
rename from src/main/java/com/nutomic/syncthingandroid/fragments/FoldersFragment.java
rename to src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java
index bdacc7b0..79e41763 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/FoldersFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java
@@ -23,7 +23,7 @@ import java.util.TimerTask;
 /**
  * Displays a list of all existing folders.
  */
-public class FoldersFragment extends ListFragment implements SyncthingService.OnApiChangeListener,
+public class FolderListFragment extends ListFragment implements SyncthingService.OnApiChangeListener,
         AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener {
 
     private FoldersAdapter mAdapter;