Merge pull request #453 from owncloud/improve_action_bar_pr_392_with_develop

[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 3e4103a..89864fe 100644 (file)
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/com/owncloud/android/db/DbHandler.java
@@ -1,10 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011-2012  Bartek Przybylski
 /* ownCloud Android client application
  *   Copyright (C) 2011-2012  Bartek Przybylski

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

  *
  *   This program is free software: you can redistribute it and/or modify
  *
  *   This program is free software: you can redistribute it and/or modify

- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 2 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.

  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -17,12 +17,14 @@
  */
 package com.owncloud.android.db;
 
  */
 package com.owncloud.android.db;
 

+import com.owncloud.android.MainApp;
+import com.owncloud.android.utils.Log_OC;
+

 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;

-import android.util.Log;

 
 /**
  * Custom database helper for ownCloud
 
 /**
  * Custom database helper for ownCloud


@@ -33,8 +35,8 @@ import android.util.Log;
 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 int mDatabaseVersion = 2;
+    private final String mDatabaseName;
+    private final int mDatabaseVersion = 3;

 
     private final String TABLE_INSTANT_UPLOAD = "instant_upload";
 
 
     private final String TABLE_INSTANT_UPLOAD = "instant_upload";
 


@@ -42,6 +44,7 @@ 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();
     }


@@ -50,21 +53,23 @@ public class DbHandler {
         mDB.close();
     }
 
         mDB.close();
     }
 

-    public boolean putFileForLater(String filepath, String account) {
+    public boolean putFileForLater(String filepath, String account, String message) {

         ContentValues cv = new ContentValues();
         cv.put("path", filepath);
         cv.put("account", account);
         cv.put("attempt", UPLOAD_STATUS_UPLOAD_LATER);
         ContentValues cv = new ContentValues();
         cv.put("path", filepath);
         cv.put("account", account);
         cv.put("attempt", UPLOAD_STATUS_UPLOAD_LATER);

+        cv.put("message", message);

         long result = mDB.insert(TABLE_INSTANT_UPLOAD, null, cv);
         long result = mDB.insert(TABLE_INSTANT_UPLOAD, null, cv);

-        Log.d(TABLE_INSTANT_UPLOAD, "putFileForLater returns with: " + result + " for file: " + filepath);
+        Log_OC.d(TABLE_INSTANT_UPLOAD, "putFileForLater returns with: " + result + " for file: " + filepath);

         return result != -1;
     }
 
         return result != -1;
     }
 

-    public int updateFileState(String filepath, Integer status) {
+    public int updateFileState(String filepath, Integer status, String message) {

         ContentValues cv = new ContentValues();
         cv.put("attempt", status);
         ContentValues cv = new ContentValues();
         cv.put("attempt", status);

+        cv.put("message", message);

         int result = mDB.update(TABLE_INSTANT_UPLOAD, cv, "path=?", new String[] { filepath });
         int result = mDB.update(TABLE_INSTANT_UPLOAD, cv, "path=?", new String[] { filepath });

-        Log.d(TABLE_INSTANT_UPLOAD, "updateFileState returns with: " + result + " for file: " + filepath);
+        Log_OC.d(TABLE_INSTANT_UPLOAD, "updateFileState returns with: " + result + " for file: " + filepath);

         return result;
     }
 
         return result;
     }
 


@@ -87,7 +92,7 @@ public class DbHandler {
      */
     public boolean removeIUPendingFile(String localPath) {
         long result = mDB.delete(TABLE_INSTANT_UPLOAD, "path = ?", new String[] { localPath });
      */
     public boolean removeIUPendingFile(String localPath) {
         long result = mDB.delete(TABLE_INSTANT_UPLOAD, "path = ?", new String[] { localPath });

-        Log.d(TABLE_INSTANT_UPLOAD, "delete returns with: " + result + " for file: " + localPath);
+        Log_OC.d(TABLE_INSTANT_UPLOAD, "delete returns with: " + result + " for file: " + localPath);

         return result != 0;
 
     }
         return result != 0;
 
     }


@@ -100,12 +105,15 @@ public class DbHandler {
         @Override
         public void onCreate(SQLiteDatabase db) {
             db.execSQL("CREATE TABLE " + TABLE_INSTANT_UPLOAD + " (" + " _id INTEGER PRIMARY KEY, " + " path TEXT,"
         @Override
         public void onCreate(SQLiteDatabase db) {
             db.execSQL("CREATE TABLE " + TABLE_INSTANT_UPLOAD + " (" + " _id INTEGER PRIMARY KEY, " + " path TEXT,"

-                    + " account TEXT,attempt INTEGER);");
+                    + " account TEXT,attempt INTEGER,message TEXT);");

         }
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         }
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {

-            db.execSQL("ALTER TABLE " + TABLE_INSTANT_UPLOAD + " ADD COLUMN attempt;");
+            if (oldVersion < 2) {
+                db.execSQL("ALTER TABLE " + TABLE_INSTANT_UPLOAD + " ADD COLUMN attempt INTEGER;");
+            }
+            db.execSQL("ALTER TABLE " + TABLE_INSTANT_UPLOAD + " ADD COLUMN message TEXT;");

 
         }
     }
 
         }
     }