Fixed check of modifications applied in server (still based on modification date)

[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 c99616e..5d4f9b8 100644 (file)
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -62,6 +62,8 @@ public class FileContentProvider extends ContentProvider {
                 ProviderTableMeta.FILE_CREATION);\r
         mProjectionMap.put(ProviderTableMeta.FILE_MODIFIED,\r
                 ProviderTableMeta.FILE_MODIFIED);\r
                 ProviderTableMeta.FILE_CREATION);\r
         mProjectionMap.put(ProviderTableMeta.FILE_MODIFIED,\r
                 ProviderTableMeta.FILE_MODIFIED);\r

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

         mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_LENGTH,\r
                 ProviderTableMeta.FILE_CONTENT_LENGTH);\r
         mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_TYPE,\r
         mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_LENGTH,\r
                 ProviderTableMeta.FILE_CONTENT_LENGTH);\r
         mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_TYPE,\r


@@ -224,7 +226,8 @@ public class FileContentProvider extends ContentProvider {
                     + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT, "\r
                     + ProviderTableMeta.FILE_LAST_SYNC_DATE + " INTEGER, "\r
                     + ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER, "\r
                     + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT, "\r
                     + ProviderTableMeta.FILE_LAST_SYNC_DATE + " INTEGER, "\r
                     + ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER, "\r

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

                     );\r
         }\r
 \r
                     );\r
         }\r
 \r


@@ -246,6 +249,13 @@ public class FileContentProvider extends ContentProvider {
                            " DEFAULT 0");\r
                 upgraded = true;\r
             }\r
                            " DEFAULT 0");\r
                 upgraded = true;\r
             }\r

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