Files uploaded in the past are copied to the local ownCloud directory during account...

[pub/Android/ownCloud.git] / src / com / owncloud / android / providers / FileContentProvider.java

diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index 6605d89..c99616e 100644 (file)
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -70,8 +70,12 @@ 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_LAST_SYNC_DATE_FOR_DATA,\r
+                ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA);\r

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

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

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


@@ -219,18 +223,31 @@ public class FileContentProvider extends ContentProvider {
                     + ProviderTableMeta.FILE_STORAGE_PATH + " TEXT, "\r
                     + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT, "\r
                     + ProviderTableMeta.FILE_LAST_SYNC_DATE + " INTEGER, "\r
                     + ProviderTableMeta.FILE_STORAGE_PATH + " TEXT, "\r
                     + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT, "\r
                     + ProviderTableMeta.FILE_LAST_SYNC_DATE + " INTEGER, "\r

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

         }\r
 \r
         @Override\r
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
             Log.i("SQL", "Entering in onUpgrade");\r
         }\r
 \r
         @Override\r
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
             Log.i("SQL", "Entering in onUpgrade");\r

+            boolean upgraded = false; \r

             if (oldVersion == 1 && newVersion >= 2) {\r
             if (oldVersion == 1 && newVersion >= 2) {\r

-                Log.i("SQL", "Entering in the ADD in onUpgrade");\r
+                Log.i("SQL", "Entering in the #1 ADD in onUpgrade");\r

                 db.execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +\r
                            " ADD COLUMN " + ProviderTableMeta.FILE_KEEP_IN_SYNC  + " INTEGER " +\r
                            " DEFAULT 0");\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
+                upgraded = true;\r
+            }\r
+            if (oldVersion < 3 && newVersion >= 3) {\r
+                Log.i("SQL", "Entering in the #2 ADD in onUpgrade");\r
+                db.execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +\r
+                           " ADD COLUMN " + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA  + " INTEGER " +\r
+                           " DEFAULT 0");\r
+                upgraded = true;\r
+            }\r
+            if (!upgraded)\r
+                Log.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);\r

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