X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5a25a6a698c75d437f794f1993bbd1d281af75e9..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/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 788fec9f..89864fea 100644 --- 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 + * Copyright (C) 2012-2013 ownCloud Inc. * * 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 @@ -17,14 +17,14 @@ */ 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.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; /** * Custom database helper for ownCloud @@ -35,7 +35,7 @@ import android.util.Log; 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"; @@ -44,6 +44,7 @@ public class DbHandler { public static final int UPLOAD_STATUS_UPLOAD_FAILED = 1; public DbHandler(Context context) { + mDatabaseName = MainApp.getDBName(); mHelper = new OpenerHelper(context); mDB = mHelper.getWritableDatabase(); }