fixes after rebase for DB upgrade routine

src/main/java/com/owncloud/android/datamodel/MediaFolder.java

@@ -27,10 +27,10 @@ import java.util.List;
  * Business object representing a media folder with all information that are gathered via media queries.
  */
 public class MediaFolder {
-    public static final Integer IMAGE = 0;
-    public static final Integer VIDEO = 1;
-    public static final Integer IMAGE_VIDEO = 2;
-    public static final Integer CUSTOM = 3;
+    public static final Integer CUSTOM = 0;
+    public static final Integer IMAGE = 1;
+    public static final Integer VIDEO = 2;
+    public static final Integer IMAGE_VIDEO = 3;
 
     /** name of the folder. */
     public String folderName;

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -939,14 +939,17 @@ public class FileContentProvider extends ContentProvider {
                 }
             }
 
+            if (!upgraded) {
+                Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
+            }
+
             if (oldVersion < 18 && newVersion >= 18) {
-                Log_OC.i(SQL, "Entering in the #18 ADD in onUpgrade");
+                Log_OC.i(SQL, "Entering in the #18 Adding external link column to capabilities");
                 db.beginTransaction();
                 try {
-                    // add type column default being IMAGE(0)
-                    db.execSQL(ALTER_TABLE + ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME +
-                            ADD_COLUMN + ProviderTableMeta.SYNCED_FOLDER_TYPE +
-                            " INTEGER " + " DEFAULT 0");
+                    db.execSQL(ALTER_TABLE + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
+                            ADD_COLUMN + ProviderTableMeta.CAPABILITIES_EXTERNAL_LINKS +
+                            " INTEGER " + " DEFAULT -1");
 
                     upgraded = true;
                     db.setTransactionSuccessful();
@@ -959,14 +962,11 @@ public class FileContentProvider extends ContentProvider {
                 Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
             }
 
-            if (oldVersion < 18 && newVersion >= 18) {
-                Log_OC.i(SQL, "Entering in the #18 Adding external link column to capabilities");
+            if (oldVersion < 19 && newVersion >= 19) {
+                Log_OC.i(SQL, "Entering in the #19 Adding external link column to capabilities");
                 db.beginTransaction();
                 try {
-                    db.execSQL(ALTER_TABLE + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
-                            ADD_COLUMN + ProviderTableMeta.CAPABILITIES_EXTERNAL_LINKS +
-                            " INTEGER " + " DEFAULT -1");
-
+                    createExternalLinksTable(db);
                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {
@@ -978,11 +978,15 @@ public class FileContentProvider extends ContentProvider {
                 Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
             }
 
-            if (oldVersion < 19 && newVersion >= 19) {
-                Log_OC.i(SQL, "Entering in the #19 Adding external link column to capabilities");
+            if (oldVersion < 20 && newVersion >= 20) {
+                Log_OC.i(SQL, "Entering in the #20 ADD in onUpgrade");
                 db.beginTransaction();
                 try {
-                    createExternalLinksTable(db);
+                    // add type column default being IMAGE(0)
+                    db.execSQL(ALTER_TABLE + ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME +
+                            ADD_COLUMN + ProviderTableMeta.SYNCED_FOLDER_TYPE +
+                            " INTEGER " + " DEFAULT 0");
+
                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {