Filter only '/' character in user input when version of server is 8.1 or later

[pub/Android/ownCloud.git] / src / com / owncloud / android / db / DbHandler.java

diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java
index 8f53562..6611306 100644 (file)
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/com/owncloud/android/db/DbHandler.java
@@ -1,6 +1,9 @@
-/* ownCloud Android client application
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartek Przybylski

  *   Copyright (C) 2011-2012  Bartek Przybylski
  *   Copyright (C) 2011-2012  Bartek Przybylski

- *   Copyright (C) 2012-2013 ownCloud Inc.
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -17,8 +20,8 @@
  */
 package com.owncloud.android.db;
 
  */
 package com.owncloud.android.db;
 

-import com.owncloud.android.Log_OC;

 import com.owncloud.android.MainApp;
 import com.owncloud.android.MainApp;

+import com.owncloud.android.lib.common.utils.Log_OC;

 
 import android.content.ContentValues;
 import android.content.Context;
 
 import android.content.ContentValues;
 import android.content.Context;


@@ -28,14 +31,11 @@ import android.database.sqlite.SQLiteOpenHelper;
 
 /**
  * Custom database helper for ownCloud
 
 /**
  * Custom database helper for ownCloud

- * 
- * @author Bartek Przybylski
- * 

  */
 public class DbHandler {
     private SQLiteDatabase mDB;
     private OpenerHelper mHelper;
  */
 public class DbHandler {
     private SQLiteDatabase mDB;
     private OpenerHelper mHelper;

-    private final String mDatabaseName; // = "ownCloud";
+    private final String mDatabaseName;

     private final int mDatabaseVersion = 3;
 
     private final String TABLE_INSTANT_UPLOAD = "instant_upload";
     private final int mDatabaseVersion = 3;
 
     private final String TABLE_INSTANT_UPLOAD = "instant_upload";


@@ -44,9 +44,9 @@ public class DbHandler {
     public static final int UPLOAD_STATUS_UPLOAD_FAILED = 1;
 
     public DbHandler(Context context) {
     public static final int UPLOAD_STATUS_UPLOAD_FAILED = 1;
 
     public DbHandler(Context context) {

+        mDatabaseName = MainApp.getDBName();

         mHelper = new OpenerHelper(context);
         mDB = mHelper.getWritableDatabase();
         mHelper = new OpenerHelper(context);
         mDB = mHelper.getWritableDatabase();

-        mDatabaseName = MainApp.getDBName();

     }
 
     public void close() {
     }
 
     public void close() {


@@ -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;");
                 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);

         }
     }
 }
         }
     }
 }