r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Moving away from raw query and cleaned up query code

Browse Source
This commit is contained in:
anthony restaino 2017-04-07 20:45:59 -04:00
parent 1f1d1e7f32
commit 8e0d3c1b52
1 changed files with 65 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java
View File

@ -11,6 +11,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -19,8 +20,9 @@ import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import acr.browser.lightning.R; import acr.browser.lightning.R;
import acr.browser.lightning.app.BrowserApp;
@SuppressWarnings("unused")
@WorkerThread
@Singleton @Singleton
public class HistoryDatabase extends SQLiteOpenHelper { public class HistoryDatabase extends SQLiteOpenHelper {
@ -40,31 +42,21 @@ public class HistoryDatabase extends SQLiteOpenHelper {
private static final String KEY_TITLE = "title"; private static final String KEY_TITLE = "title";
private static final String KEY_TIME_VISITED = "time"; private static final String KEY_TIME_VISITED = "time";
@Nullable private SQLiteDatabase mDatabase; @Nullable
private SQLiteDatabase mDatabase;
@Inject @Inject
public HistoryDatabase(@NonNull Context context) { public HistoryDatabase(@NonNull Context context) {
super(context.getApplicationContext(), DATABASE_NAME, null, DATABASE_VERSION); super(context.getApplicationContext(), DATABASE_NAME, null, DATABASE_VERSION);
initialize(); mDatabase = HistoryDatabase.this.getWritableDatabase();
}
private void initialize() {
BrowserApp.getTaskThread().execute(new Runnable() {
@Override
public void run() {
synchronized (HistoryDatabase.this) {
mDatabase = HistoryDatabase.this.getWritableDatabase();
}
}
});
} }
// Creating Tables // Creating Tables
@Override @Override
public void onCreate(@NonNull SQLiteDatabase db) { public void onCreate(@NonNull SQLiteDatabase db) {
String CREATE_HISTORY_TABLE = "CREATE TABLE " + TABLE_HISTORY + '(' + KEY_ID String CREATE_HISTORY_TABLE = "CREATE TABLE " + TABLE_HISTORY + '(' + KEY_ID
+ " INTEGER PRIMARY KEY," + KEY_URL + " TEXT," + KEY_TITLE + " TEXT," + " INTEGER PRIMARY KEY," + KEY_URL + " TEXT," + KEY_TITLE + " TEXT,"
+ KEY_TIME_VISITED + " INTEGER" + ')'; + KEY_TIME_VISITED + " INTEGER" + ')';
db.execSQL(CREATE_HISTORY_TABLE); db.execSQL(CREATE_HISTORY_TABLE);
} }
@ -77,13 +69,6 @@ public class HistoryDatabase extends SQLiteOpenHelper {
onCreate(db); onCreate(db);
} }
public synchronized void deleteHistory() {
mDatabase = openIfNecessary();
mDatabase.delete(TABLE_HISTORY, null, null);
mDatabase.close();
mDatabase = this.getWritableDatabase();
}
@Override @Override
public synchronized void close() { public synchronized void close() {
if (mDatabase != null) { if (mDatabase != null) {
@ -93,6 +78,7 @@ public class HistoryDatabase extends SQLiteOpenHelper {
super.close(); super.close();
} }
@WorkerThread
@NonNull @NonNull
private SQLiteDatabase openIfNecessary() { private SQLiteDatabase openIfNecessary() {
if (mDatabase == null || !mDatabase.isOpen()) { if (mDatabase == null || !mDatabase.isOpen()) {
@ -101,26 +87,40 @@ public class HistoryDatabase extends SQLiteOpenHelper {
return mDatabase; return mDatabase;
} }
@WorkerThread
public synchronized void deleteHistory() {
mDatabase = openIfNecessary();
mDatabase.delete(TABLE_HISTORY, null, null);
mDatabase.close();
mDatabase = this.getWritableDatabase();
}
@WorkerThread
public synchronized void deleteHistoryItem(@NonNull String url) { public synchronized void deleteHistoryItem(@NonNull String url) {
mDatabase = openIfNecessary(); mDatabase = openIfNecessary();
mDatabase.delete(TABLE_HISTORY, KEY_URL + " = ?", new String[]{url}); mDatabase.delete(TABLE_HISTORY, KEY_URL + " = ?", new String[]{url});
} }
@WorkerThread
public synchronized void visitHistoryItem(@NonNull String url, @Nullable String title) { public synchronized void visitHistoryItem(@NonNull String url, @Nullable String title) {
mDatabase = openIfNecessary(); mDatabase = openIfNecessary();
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(KEY_TITLE, title == null ? "" : title); values.put(KEY_TITLE, title == null ? "" : title);
values.put(KEY_TIME_VISITED, System.currentTimeMillis()); values.put(KEY_TIME_VISITED, System.currentTimeMillis());
Cursor q = mDatabase.query(false, TABLE_HISTORY, new String[]{KEY_URL},
KEY_URL + " = ?", new String[]{url}, null, null, null, "1"); Cursor cursor = mDatabase.query(false, TABLE_HISTORY, new String[]{KEY_URL},
if (q.getCount() > 0) { KEY_URL + " = ?", new String[]{url}, null, null, null, "1");
if (cursor.getCount() > 0) {
mDatabase.update(TABLE_HISTORY, values, KEY_URL + " = ?", new String[]{url}); mDatabase.update(TABLE_HISTORY, values, KEY_URL + " = ?", new String[]{url});
} else { } else {
addHistoryItem(new HistoryItem(url, title == null ? "" : title)); addHistoryItem(new HistoryItem(url, title == null ? "" : title));
} }
q.close();
cursor.close();
} }
@WorkerThread
private synchronized void addHistoryItem(@NonNull HistoryItem item) { private synchronized void addHistoryItem(@NonNull HistoryItem item) {
mDatabase = openIfNecessary(); mDatabase = openIfNecessary();
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
@ -130,11 +130,12 @@ public class HistoryDatabase extends SQLiteOpenHelper {
mDatabase.insert(TABLE_HISTORY, null, values); mDatabase.insert(TABLE_HISTORY, null, values);
} }
@WorkerThread
@Nullable @Nullable
synchronized String getHistoryItem(@NonNull String url) { synchronized String getHistoryItem(@NonNull String url) {
mDatabase = openIfNecessary(); mDatabase = openIfNecessary();
Cursor cursor = mDatabase.query(TABLE_HISTORY, new String[]{KEY_ID, KEY_URL, KEY_TITLE}, Cursor cursor = mDatabase.query(TABLE_HISTORY, new String[]{KEY_ID, KEY_URL, KEY_TITLE},
KEY_URL + " = ?", new String[]{url}, null, null, null, null); KEY_URL + " = ?", new String[]{url}, null, null, null, "1");
String m = null; String m = null;
if (cursor != null) { if (cursor != null) {
cursor.moveToFirst(); cursor.moveToFirst();
@ -145,6 +146,7 @@ public class HistoryDatabase extends SQLiteOpenHelper {
return m; return m;
} }
@WorkerThread
@NonNull @NonNull
public synchronized List<HistoryItem> findItemsContaining(@Nullable String search) { public synchronized List<HistoryItem> findItemsContaining(@Nullable String search) {
mDatabase = openIfNecessary(); mDatabase = openIfNecessary();
@ -152,79 +154,68 @@ public class HistoryDatabase extends SQLiteOpenHelper {
if (search == null) { if (search == null) {
return itemList; return itemList;
} }
search = DatabaseUtils.sqlEscapeString('%' + search + '%');
String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " WHERE " + KEY_TITLE + " LIKE " search = '%' + search + '%';
+ search + " OR " + KEY_URL + " LIKE " + search + " ORDER BY "
+ KEY_TIME_VISITED + " DESC LIMIT 5";
Cursor cursor = mDatabase.rawQuery(selectQuery, null);
int n = 0; Cursor cursor = mDatabase.query(TABLE_HISTORY, null, KEY_TITLE + " LIKE ? OR " + KEY_URL + " LIKE ?",
if (cursor.moveToFirst()) { new String[]{search, search}, null, null, KEY_TIME_VISITED + " DESC", "5");
do {
HistoryItem item = new HistoryItem(); while (cursor.moveToNext()) {
item.setUrl(cursor.getString(1)); HistoryItem item = new HistoryItem();
item.setTitle(cursor.getString(2)); item.setUrl(cursor.getString(1));
item.setImageId(R.drawable.ic_history); item.setTitle(cursor.getString(2));
itemList.add(item); item.setImageId(R.drawable.ic_history);
n++; itemList.add(item);
} while (cursor.moveToNext() && n < 5);
} }
cursor.close(); cursor.close();
return itemList; return itemList;
} }
@WorkerThread
@NonNull @NonNull
public synchronized List<HistoryItem> getLastHundredItems() { public synchronized List<HistoryItem> getLastHundredItems() {
mDatabase = openIfNecessary(); mDatabase = openIfNecessary();
List<HistoryItem> itemList = new ArrayList<>(100); List<HistoryItem> itemList = new ArrayList<>(100);
String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " ORDER BY " + KEY_TIME_VISITED Cursor cursor = mDatabase.query(TABLE_HISTORY, null, null, null, null, null, KEY_TIME_VISITED + " DESC", "100");
+ " DESC";
Cursor cursor = mDatabase.rawQuery(selectQuery, null); while (cursor.moveToNext()) {
int counter = 0; HistoryItem item = new HistoryItem();
if (cursor.moveToFirst()) { item.setUrl(cursor.getString(1));
do { item.setTitle(cursor.getString(2));
HistoryItem item = new HistoryItem(); item.setImageId(R.drawable.ic_history);
item.setUrl(cursor.getString(1)); itemList.add(item);
item.setTitle(cursor.getString(2));
item.setImageId(R.drawable.ic_history);
itemList.add(item);
counter++;
} while (cursor.moveToNext() && counter < 100);
} }
cursor.close(); cursor.close();
return itemList; return itemList;
} }
@WorkerThread
@NonNull @NonNull
public synchronized List<HistoryItem> getAllHistoryItems() { public synchronized List<HistoryItem> getAllHistoryItems() {
mDatabase = openIfNecessary(); mDatabase = openIfNecessary();
List<HistoryItem> itemList = new ArrayList<>(); List<HistoryItem> itemList = new ArrayList<>();
String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " ORDER BY " + KEY_TIME_VISITED
+ " DESC";
Cursor cursor = mDatabase.rawQuery(selectQuery, null); Cursor cursor = mDatabase.query(TABLE_HISTORY, null, null, null, null, null, KEY_TIME_VISITED + " DESC");
if (cursor.moveToFirst()) { while (cursor.moveToNext()) {
do { HistoryItem item = new HistoryItem();
HistoryItem item = new HistoryItem(); item.setUrl(cursor.getString(1));
item.setUrl(cursor.getString(1)); item.setTitle(cursor.getString(2));
item.setTitle(cursor.getString(2)); item.setImageId(R.drawable.ic_history);
item.setImageId(R.drawable.ic_history); itemList.add(item);
itemList.add(item);
} while (cursor.moveToNext());
} }
cursor.close(); cursor.close();
return itemList; return itemList;
} }
public synchronized int getHistoryItemsCount() { @WorkerThread
mDatabase = openIfNecessary(); public synchronized long getHistoryItemsCount() {
String countQuery = "SELECT * FROM " + TABLE_HISTORY; return DatabaseUtils.queryNumEntries(mDatabase, TABLE_HISTORY);
Cursor cursor = mDatabase.rawQuery(countQuery, null);
int n = cursor.getCount();
cursor.close();
return n;
} }
} }