yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 02:09:35 +02:00
Code Issues Releases Wiki Activity

cleanup: some static calls have been removed

Browse source
This commit is contained in:
Nikolay Pultsin 2010-11-23 08:05:03 +00:00
parent 141c313f9b
commit 4832d00472
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
View file

@ -28,24 +28,24 @@ import android.database.SQLException;
import android.database.Cursor;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager;
import org.geometerplus.zlibrary.core.options.ZLStringOption;
import org.geometerplus.zlibrary.core.options.ZLIntegerOption;
import org.geometerplus.zlibrary.core.config.ZLConfig;
import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;
import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
import org.geometerplus.fbreader.library.*;
import org.geometerplus.android.util.AndroidUtil;
public final class SQLiteBooksDatabase extends BooksDatabase {
private final String myInstanceId;
private final SQLiteDatabase myDatabase;
public SQLiteBooksDatabase(String instanceId) {
public SQLiteBooksDatabase(Context context, String instanceId) {
myInstanceId = instanceId;
myDatabase = ZLAndroidApplication.Instance().openOrCreateDatabase("books.db", Context.MODE_PRIVATE, null);
migrate();
myDatabase = context.openOrCreateDatabase("books.db", Context.MODE_PRIVATE, null);
migrate(context);
}
protected void executeAsATransaction(Runnable actions) {
@ -58,13 +58,13 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
}
}
private void migrate() {
private void migrate(Context context) {
final int version = myDatabase.getVersion();
final int currentVersion = 10;
if (version >= currentVersion) {
return;
}
ZLDialogManager.Instance().wait((version == 0) ? "creatingBooksDatabase" : "updatingBooksDatabase", new Runnable() {
AndroidUtil.wait((version == 0) ? "creatingBooksDatabase" : "updatingBooksDatabase", new Runnable() {
public void run() {
myDatabase.beginTransaction();
@ -96,7 +96,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
myDatabase.execSQL("VACUUM");
myDatabase.setVersion(currentVersion);
}
});
}, context);
}
private static void bindString(SQLiteStatement statement, int index, String value) {