X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/77ddd1ccb62e8b70580b8f410dda703a269f224f..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/src/com/owncloud/android/db/ProviderMeta.java?ds=inline

diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java
index 279f2ba8..8701ebd2 100644
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -3,9 +3,8 @@
  *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 2 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +17,8 @@
  */
 package com.owncloud.android.db;
 
+import com.owncloud.android.MainApp;
+
 import android.net.Uri;
 import android.provider.BaseColumns;
 
@@ -29,10 +30,12 @@ import android.provider.BaseColumns;
  */
 public class ProviderMeta {
 
-    public static final String AUTHORITY_FILES = "org.owncloud";
-    public static final String DB_FILE = "owncloud.db";
+    /* These constants are now in MainApp
+        public static final String AUTHORITY_FILES = "org.owncloud";
+        public static final String DB_FILE = "owncloud.db";
+    */
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 4;
+    public static final int DB_VERSION = 5;
 
     private ProviderMeta() {
     }
@@ -40,11 +43,11 @@ public class ProviderMeta {
     static public class ProviderTableMeta implements BaseColumns {
         public static final String DB_NAME = "filelist";
         public static final Uri CONTENT_URI = Uri.parse("content://"
-                + AUTHORITY_FILES + "/");
+                + MainApp.getAuthority() + "/");
         public static final Uri CONTENT_URI_FILE = Uri.parse("content://"
-                + AUTHORITY_FILES + "/file");
+                + MainApp.getAuthority() + "/file");
         public static final Uri CONTENT_URI_DIR = Uri.parse("content://"
-                + AUTHORITY_FILES + "/dir");
+                + MainApp.getAuthority() + "/dir");
 
         public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.owncloud.file";
         public static final String CONTENT_TYPE_ITEM = "vnd.android.cursor.item/vnd.owncloud.file";
@@ -62,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
         public static final String FILE_LAST_SYNC_DATE_FOR_DATA = "last_sync_date_for_data";
         public static final String FILE_KEEP_IN_SYNC = "keep_in_sync";
+        public static final String FILE_ETAG = "etag";
 
         public static final String DEFAULT_SORT_ORDER = FILE_NAME
                 + " collate nocase asc";