Merge branch 'develop' into setup_buttons

[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 279f2ba..a082a84 100644 (file)
--- 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.\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 as published by\r
- *   the Free Software Foundation, either version 2 of the License, or\r
- *   (at your option) any later version.\r
+ *   it under the terms of the GNU General Public License version 2,\r
+ *   as published by the Free Software Foundation.\r
  *\r
  *   This program is distributed in the hope that it will be useful,\r
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
@@ -18,6 +17,8 @@
  */\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
@@ -29,8 +30,10 @@ import android.provider.BaseColumns;
  */\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 int DB_VERSION = 4;\r
 \r
@@ -40,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
-                + AUTHORITY_FILES + "/");\r
+                + MainApp.getAuthority() + "/");\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
-                + 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