Quick patch to fix operations not ready for HTTPS

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / providers / FileContentProvider.java

diff --git a/src/eu/alefzero/owncloud/providers/FileContentProvider.java b/src/eu/alefzero/owncloud/providers/FileContentProvider.java
index b54aa21..7ed73a9 100644 (file)
--- a/src/eu/alefzero/owncloud/providers/FileContentProvider.java
+++ b/src/eu/alefzero/owncloud/providers/FileContentProvider.java
@@ -35,6 +35,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;\r
 import android.net.Uri;\r
 import android.text.TextUtils;\r
 import android.database.sqlite.SQLiteQueryBuilder;\r
 import android.net.Uri;\r
 import android.text.TextUtils;\r

+import android.util.Log;\r

 \r
 /**\r
  * The ContentProvider for the ownCloud App.\r
 \r
 /**\r
  * The ContentProvider for the ownCloud App.\r


@@ -68,6 +69,8 @@ public class FileContentProvider extends ContentProvider {
                 ProviderTableMeta.FILE_STORAGE_PATH);\r
         mProjectionMap.put(ProviderTableMeta.FILE_LAST_SYNC_DATE,\r
                 ProviderTableMeta.FILE_LAST_SYNC_DATE);\r
                 ProviderTableMeta.FILE_STORAGE_PATH);\r
         mProjectionMap.put(ProviderTableMeta.FILE_LAST_SYNC_DATE,\r
                 ProviderTableMeta.FILE_LAST_SYNC_DATE);\r

+        mProjectionMap.put(ProviderTableMeta.FILE_KEEP_IN_SYNC,\r
+                ProviderTableMeta.FILE_KEEP_IN_SYNC);\r

     }\r
 \r
     private static final int SINGLE_FILE = 1;\r
     }\r
 \r
     private static final int SINGLE_FILE = 1;\r


@@ -120,7 +123,9 @@ public class FileContentProvider extends ContentProvider {
 \r
     @Override\r
     public Uri insert(Uri uri, ContentValues values) {\r
 \r
     @Override\r
     public Uri insert(Uri uri, ContentValues values) {\r

-        if (mUriMatcher.match(uri) != SINGLE_FILE) {\r
+        if (mUriMatcher.match(uri) != SINGLE_FILE &&\r
+            mUriMatcher.match(uri) != ROOT_DIRECTORY) {\r
+            \r

             throw new IllegalArgumentException("Unknown uri id: " + uri);\r
         }\r
 \r
             throw new IllegalArgumentException("Unknown uri id: " + uri);\r
         }\r
 \r


@@ -200,6 +205,7 @@ public class FileContentProvider extends ContentProvider {
         @Override\r
         public void onCreate(SQLiteDatabase db) {\r
             // files table\r
         @Override\r
         public void onCreate(SQLiteDatabase db) {\r
             // files table\r

+            Log.i("SQL", "Entering in onCreate");\r

             db.execSQL("CREATE TABLE " + ProviderTableMeta.DB_NAME + "("\r
                     + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "\r
                     + ProviderTableMeta.FILE_NAME + " TEXT, "\r
             db.execSQL("CREATE TABLE " + ProviderTableMeta.DB_NAME + "("\r
                     + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "\r
                     + ProviderTableMeta.FILE_NAME + " TEXT, "\r


@@ -211,12 +217,19 @@ public class FileContentProvider extends ContentProvider {
                     + ProviderTableMeta.FILE_CONTENT_LENGTH + " INTEGER, "\r
                     + ProviderTableMeta.FILE_STORAGE_PATH + " TEXT, "\r
                     + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT, "\r
                     + ProviderTableMeta.FILE_CONTENT_LENGTH + " INTEGER, "\r
                     + ProviderTableMeta.FILE_STORAGE_PATH + " TEXT, "\r
                     + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT, "\r

-                    + ProviderTableMeta.FILE_LAST_SYNC_DATE + " INTEGER );");\r
+                    + ProviderTableMeta.FILE_LAST_SYNC_DATE + " INTEGER, "\r
+                    + ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER );");\r

         }\r
 \r
         @Override\r
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
         }\r
 \r
         @Override\r
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r

-\r
+            Log.i("SQL", "Entering in onUpgrade");\r
+            if (oldVersion == 1 && newVersion >= 2) {\r
+                Log.i("SQL", "Entering in the ADD in onUpgrade");\r
+                db.execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +\r
+                           " ADD COLUMN " + ProviderTableMeta.FILE_KEEP_IN_SYNC  + " INTEGER " +\r
+                           " DEFAULT 0");\r
+            } else Log.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);\r

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