From: David A. Velasco <dvelasco@owncloud.com>
Date: Mon, 19 Jan 2015 12:44:30 +0000 (+0100)
Subject: Merge pull request #798 from LukeOwncloud/develop
X-Git-Tag: oc-android-1.7.0_signed~35
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b6e4f0f4ae761c0c30452baa2c717fb82256c4dc?hp=e99583ef686e04419d7c871c9e36a9b6167aadaa

Merge pull request #798 from LukeOwncloud/develop

On downgrading upload db, delete and re-create
---

diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java
index 717066b7..3682a7b2 100644
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/com/owncloud/android/db/DbHandler.java
@@ -114,7 +114,14 @@ public class DbHandler {
                 db.execSQL("ALTER TABLE " + TABLE_INSTANT_UPLOAD + " ADD COLUMN attempt INTEGER;");
             }
             db.execSQL("ALTER TABLE " + TABLE_INSTANT_UPLOAD + " ADD COLUMN message TEXT;");
-
+        }
+        
+        @Override
+        public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            //downgrading is the exception, so deleting and re-creating is acceptable.
+            //otherwise exception will be thrown (cannot downgrade) and oc app will crash.
+            db.execSQL("DROP TABLE IF EXISTS " + TABLE_INSTANT_UPLOAD + ";");
+            onCreate(db);
         }
     }
 }