OC-2459: Ask for pincode, when click on an instant upload notification

[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 b8058b8..8701ebd 100644 (file)
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -17,6 +17,8 @@
  */\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


@@ -28,10 +30,12 @@ import android.provider.BaseColumns;
  */\r
 public class ProviderMeta {\r
 \r
  */\r
 public class ProviderMeta {\r
 \r

-    public static final String AUTHORITY_FILES = "org.owncloud";\r
-    public static final String DB_FILE = "owncloud.db";\r
+    /* These constants are now in MainApp\r
+        public static final String AUTHORITY_FILES = "org.owncloud";\r
+        public static final String DB_FILE = "owncloud.db";\r
+    */\r

     public static final String DB_NAME = "filelist";\r
     public static final String DB_NAME = "filelist";\r

-    public static final int DB_VERSION = 4;\r
+    public static final int DB_VERSION = 5;\r

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


@@ -39,11 +43,11 @@ public class ProviderMeta {
     static public class ProviderTableMeta implements BaseColumns {\r
         public static final String DB_NAME = "filelist";\r
         public static final Uri CONTENT_URI = Uri.parse("content://"\r
     static public class ProviderTableMeta implements BaseColumns {\r
         public static final String DB_NAME = "filelist";\r
         public static final Uri CONTENT_URI = Uri.parse("content://"\r

-                + AUTHORITY_FILES + "/");\r
+                + MainApp.getAuthority() + "/");\r

         public static final Uri CONTENT_URI_FILE = Uri.parse("content://"\r
         public static final Uri CONTENT_URI_FILE = Uri.parse("content://"\r

-                + AUTHORITY_FILES + "/file");\r
+                + MainApp.getAuthority() + "/file");\r

         public static final Uri CONTENT_URI_DIR = Uri.parse("content://"\r
         public static final Uri CONTENT_URI_DIR = Uri.parse("content://"\r

-                + AUTHORITY_FILES + "/dir");\r
+                + MainApp.getAuthority() + "/dir");\r

 \r
         public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.owncloud.file";\r
         public static final String CONTENT_TYPE_ITEM = "vnd.android.cursor.item/vnd.owncloud.file";\r
 \r
         public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.owncloud.file";\r
         public static final String CONTENT_TYPE_ITEM = "vnd.android.cursor.item/vnd.owncloud.file";\r


@@ -61,6 +65,7 @@ public class ProviderMeta {
         public static final String FILE_LAST_SYNC_DATE = "last_sync_date";  // _for_properties, but let's keep it as it is\r
         public static final String FILE_LAST_SYNC_DATE_FOR_DATA = "last_sync_date_for_data";\r
         public static final String FILE_KEEP_IN_SYNC = "keep_in_sync";\r
         public static final String FILE_LAST_SYNC_DATE = "last_sync_date";  // _for_properties, but let's keep it as it is\r
         public static final String FILE_LAST_SYNC_DATE_FOR_DATA = "last_sync_date_for_data";\r
         public static final String FILE_KEEP_IN_SYNC = "keep_in_sync";\r

+        public static final String FILE_ETAG = "etag";\r

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