Uploads over settings in navigation drawer

res/values/drawer_resources.xml

@@ -24,8 +24,8 @@
         <!--<item>@string/prefs_accounts</item>-->
         <item>@string/drawer_item_all_files</item>
         <!--<item>@string/drawer_item_on_device</item>-->
-        <item>@string/actionbar_settings</item>
         <item>@string/drawer_item_uploads_list</item>
+        <item>@string/actionbar_settings</item>
         <item>@string/actionbar_logger</item>
     </string-array>
 
@@ -35,8 +35,8 @@
         <!--<item>@string/drawer_item_accounts</item>-->
         <item>@string/drawer_item_all_files</item>
         <!--<item>@string/drawer_item_on_device</item>-->
-        <item>@string/drawer_item_settings</item>
         <item>@string/drawer_item_uploads_list</item>
+        <item>@string/drawer_item_settings</item>
         <item>@string/drawer_item_logs</item>
     </string-array>
 

src/com/owncloud/android/ui/activity/FileActivity.java

@@ -399,14 +399,14 @@ public class FileActivity extends AppCompatActivity
         //mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2],
         //        mDrawerContentDescriptions[2]));
 
-        // Settings
-        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[1], mDrawerContentDescriptions[1],
-                R.drawable.ic_settings));
-
         // Uploads
-        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2], mDrawerContentDescriptions[2],
+        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[1], mDrawerContentDescriptions[2],
                 R.drawable.ic_uploads));
 
+        // Settings
+        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2], mDrawerContentDescriptions[1],
+                R.drawable.ic_settings));
+
         // Logs
         if (BuildConfig.DEBUG) {
             mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[3],
@@ -1036,14 +1036,7 @@ public class FileActivity extends AppCompatActivity
 //                    mDrawerLayout.closeDrawers();
 //                    break;
 
-                case 1: // Settings
-                    Intent settingsIntent = new Intent(getApplicationContext(),
-                            Preferences.class);
-                    startActivity(settingsIntent);
-                    mDrawerLayout.closeDrawers();
-                    break;
-
-                case 2: // Uploads
+                case 1: // Uploads
                     Intent uploadListIntent = new Intent(getApplicationContext(),
                             UploadListActivity.class);
                     uploadListIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -1051,6 +1044,13 @@ public class FileActivity extends AppCompatActivity
                     mDrawerLayout.closeDrawers();
                     break;
 
+                case 2: // Settings
+                    Intent settingsIntent = new Intent(getApplicationContext(),
+                            Preferences.class);
+                    startActivity(settingsIntent);
+                    mDrawerLayout.closeDrawers();
+                    break;
+
                 case 3: // Logs
                     Intent loggerIntent = new Intent(getApplicationContext(),
                             LogHistoryActivity.class);

src/com/owncloud/android/utils/ConnectivityUtils.java

@@ -20,7 +20,6 @@
 package com.owncloud.android.utils;
 
 import android.content.Context;
-import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;