Merge branch 'develop' into setup_buttons

[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 1f9cf9c..8f53562 100644 (file)
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/com/owncloud/android/db/DbHandler.java
@@ -18,6 +18,7 @@
 package com.owncloud.android.db;
 
 import com.owncloud.android.Log_OC;
 package com.owncloud.android.db;
 
 import com.owncloud.android.Log_OC;

+import com.owncloud.android.MainApp;

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


@@ -34,10 +35,10 @@ import android.database.sqlite.SQLiteOpenHelper;
 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; // = "ownCloud";

     private final int mDatabaseVersion = 3;
 
     private final int mDatabaseVersion = 3;
 

-    private final String TABLE_INSTANT_UPLOAD = "DbHandler";
+    private final String TABLE_INSTANT_UPLOAD = "instant_upload";

 
     public static final int UPLOAD_STATUS_UPLOAD_LATER = 0;
     public static final int UPLOAD_STATUS_UPLOAD_FAILED = 1;
 
     public static final int UPLOAD_STATUS_UPLOAD_LATER = 0;
     public static final int UPLOAD_STATUS_UPLOAD_FAILED = 1;


@@ -45,6 +46,7 @@ public class DbHandler {
     public DbHandler(Context context) {
         mHelper = new OpenerHelper(context);
         mDB = mHelper.getWritableDatabase();
     public DbHandler(Context context) {
         mHelper = new OpenerHelper(context);
         mDB = mHelper.getWritableDatabase();

+        mDatabaseName = MainApp.getDBName();

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