Merge remote-tracking branch 'upstream/develop' into

[pub/Android/ownCloud.git] / src / com / owncloud / android / db / ProviderMeta.java

diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java
index 2101a68..bc59869 100644 (file)
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -17,11 +17,11 @@
  */\r
 package com.owncloud.android.db;\r
 \r
  */\r
 package com.owncloud.android.db;\r
 \r

-import com.owncloud.android.MainApp;\r
-\r

 import android.net.Uri;\r
 import android.provider.BaseColumns;\r
 \r
 import android.net.Uri;\r
 import android.provider.BaseColumns;\r
 \r

+import com.owncloud.android.MainApp;\r
+\r

 /**\r
  * Meta-Class that holds various static field information\r
  * \r
 /**\r
  * Meta-Class that holds various static field information\r
  * \r


@@ -31,7 +31,7 @@ import android.provider.BaseColumns;
 public class ProviderMeta {\r
 \r
     public static final String DB_NAME = "filelist";\r
 public class ProviderMeta {\r
 \r
     public static final String DB_NAME = "filelist";\r

-    public static final int DB_VERSION = 6;\r
+    public static final int DB_VERSION = 8;\r

 \r
     private ProviderMeta() {\r
     }\r
 \r
     private ProviderMeta() {\r
     }\r


@@ -68,6 +68,9 @@ public class ProviderMeta {
         public static final String FILE_ETAG = "etag";\r
         public static final String FILE_SHARE_BY_LINK = "share_by_link";\r
         public static final String FILE_PUBLIC_LINK = "public_link";\r
         public static final String FILE_ETAG = "etag";\r
         public static final String FILE_SHARE_BY_LINK = "share_by_link";\r
         public static final String FILE_PUBLIC_LINK = "public_link";\r

+        public static final String FILE_PERMISSIONS = "permissions";\r
+        public static final String FILE_REMOTE_ID = "remote_id";\r
+        public static final String FILE_UPDATE_THUMBNAIL = "update_thumbnail";\r

 \r
         public static final String FILE_DEFAULT_SORT_ORDER = FILE_NAME\r
                 + " collate nocase asc";\r
 \r
         public static final String FILE_DEFAULT_SORT_ORDER = FILE_NAME\r
                 + " collate nocase asc";\r