Fixed bug in creation of database after adding keep_in_sync column

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aed7a2f..debad1c 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.149B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.150B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/src/eu/alefzero/owncloud/providers/FileContentProvider.java b/src/eu/alefzero/owncloud/providers/FileContentProvider.java
index a6ffde6..a354be0 100644 (file)
--- a/src/eu/alefzero/owncloud/providers/FileContentProvider.java
+++ b/src/eu/alefzero/owncloud/providers/FileContentProvider.java
@@ -203,6 +203,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


@@ -214,17 +215,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
                     + ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER );");\r
         }\r
 \r
         @Override\r
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r

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

             if (oldVersion == 1 && newVersion >= 2) {\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
                 db.execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +\r
                            " ADD COLUMN " + ProviderTableMeta.FILE_KEEP_IN_SYNC  + " INTEGER " +\r
                            " DEFAULT 0");\r

-            }\r
+            } else Log.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);\r

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