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 889d1db..89864fe 100644 (file)
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/com/owncloud/android/db/DbHandler.java
@@ -17,7 +17,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.utils.Log_OC;

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


@@ -34,7 +35,7 @@ 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;

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


@@ -43,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();
     }