Merge branch 'master' of github.com:owncloud/android into setAsWallpaper

[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 bc59869..f15dd9e 100644 (file)
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -1,6 +1,9 @@
-/* ownCloud Android client application\r
+/**\r
+ *   ownCloud Android client application\r
+ *\r
+ *   @author Bartek Przybylski\r

  *   Copyright (C) 2011  Bartek Przybylski\r
  *   Copyright (C) 2011  Bartek Przybylski\r

- *   Copyright (C) 2012-2013 ownCloud Inc.\r
+ *   Copyright (C) 2015 ownCloud Inc.\r

  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License version 2,\r
  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License version 2,\r


@@ -24,14 +27,11 @@ import com.owncloud.android.MainApp;
 \r
 /**\r
  * Meta-Class that holds various static field information\r
 \r
 /**\r
  * Meta-Class that holds various static field information\r

- * \r
- * @author Bartek Przybylski\r
- * \r

  */\r
 public class ProviderMeta {\r
 \r
     public static final String DB_NAME = "filelist";\r
  */\r
 public class ProviderMeta {\r
 \r
     public static final String DB_NAME = "filelist";\r

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

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


@@ -71,6 +71,8 @@ public class ProviderMeta {
         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
         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

+        public static final String FILE_IS_DOWNLOADING= "is_downloading";\r
+        public static final String FILE_ETAG_IN_CONFLICT = "etag_in_conflict";\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


@@ -93,7 +95,7 @@ public class ProviderMeta {
         \r
         public static final String OCSHARES_DEFAULT_SORT_ORDER = OCSHARES_FILE_SOURCE \r
                 + " collate nocase asc";\r
         \r
         public static final String OCSHARES_DEFAULT_SORT_ORDER = OCSHARES_FILE_SOURCE \r
                 + " collate nocase asc";\r

-        \r
+\r

 \r
     }\r
 }\r
 \r
     }\r
 }\r