From f0426b98dcf5cfddd9c8cfa6cbfcedab0e82cebb Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sat, 23 Nov 2019 14:29:10 +0100 Subject: [PATCH] Cleanup --- .../card_locker/CardShortcutConfigure.java | 2 +- .../card_locker/CsvDatabaseExporter.java | 2 +- .../java/protect/card_locker/DBHelper.java | 36 +++++++++++-------- .../protect/card_locker/MainActivity.java | 2 +- .../protect/card_locker/DatabaseTest.java | 2 +- .../protect/card_locker/ImportExportTest.java | 2 +- .../LoyaltyCardCursorAdapterTest.java | 6 ++-- 7 files changed, 29 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java index 8f8117aa0..3e2c8f639 100644 --- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java +++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java @@ -44,7 +44,7 @@ public class CardShortcutConfigure extends AppCompatActivity final ListView cardList = findViewById(R.id.list); cardList.setVisibility(View.VISIBLE); - Cursor cardCursor = db.getLoyaltyCardCursor(""); + Cursor cardCursor = db.getLoyaltyCardCursor(); final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor); cardList.setAdapter(adapter); diff --git a/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java b/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java index fa5226a09..a5aac91f0 100644 --- a/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java +++ b/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java @@ -27,7 +27,7 @@ public class CsvDatabaseExporter implements DatabaseExporter DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR, DBHelper.LoyaltyCardDbIds.BARCODE_TYPE); - Cursor cursor = db.getLoyaltyCardCursor(""); + Cursor cursor = db.getLoyaltyCardCursor(); while(cursor.moveToNext()) { diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java index 9b7b42f07..6952accae 100644 --- a/app/src/main/java/protect/card_locker/DBHelper.java +++ b/app/src/main/java/protect/card_locker/DBHelper.java @@ -144,6 +144,18 @@ public class DBHelper extends SQLiteOpenHelper return (rowsDeleted == 1); } + public Cursor getLoyaltyCardCursor() + { + // An empty string will match everything + return getLoyaltyCardCursor(""); + } + + /** + * Returns a cursor to all loyalty cards with the filter text in either the store or note. + * + * @param filter + * @return Cursor + */ public Cursor getLoyaltyCardCursor(final String filter) { String actualFilter = String.format("%%%s%%", filter); @@ -160,23 +172,17 @@ public class DBHelper extends SQLiteOpenHelper public int getLoyaltyCardCount() { - SQLiteDatabase db = getReadableDatabase(); - Cursor data = db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIds.TABLE, null); - - int numItems = 0; - - if(data.getCount() == 1) - { - data.moveToFirst(); - numItems = data.getInt(0); - } - - data.close(); - - return numItems; + // An empty string will match everything + return getLoyaltyCardCount(""); } - public int getFilteredLoyaltyCardCount(String filter) + /** + * Returns the amount of loyalty cards with the filter text in either the store or note. + * + * @param filter + * @return Integer + */ + public int getLoyaltyCardCount(String filter) { String actualFilter = String.format("%%%s%%", filter); String[] selectionArgs = { actualFilter, actualFilter }; diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java index 9913370d2..2aba320d0 100644 --- a/app/src/main/java/protect/card_locker/MainActivity.java +++ b/app/src/main/java/protect/card_locker/MainActivity.java @@ -95,7 +95,7 @@ public class MainActivity extends AppCompatActivity filter.setVisibility(View.VISIBLE); cardList.setVisibility(View.VISIBLE); helpText.setVisibility(View.GONE); - if(db.getFilteredLoyaltyCardCount(filterText) > 0) + if(db.getLoyaltyCardCount(filterText) > 0) { noMatchingCardsText.setVisibility(View.GONE); } diff --git a/app/src/test/java/protect/card_locker/DatabaseTest.java b/app/src/test/java/protect/card_locker/DatabaseTest.java index e78f6958d..a19771dd2 100644 --- a/app/src/test/java/protect/card_locker/DatabaseTest.java +++ b/app/src/test/java/protect/card_locker/DatabaseTest.java @@ -122,7 +122,7 @@ public class DatabaseTest assertEquals(CARDS_TO_ADD, db.getLoyaltyCardCount()); - Cursor cursor = db.getLoyaltyCardCursor(""); + Cursor cursor = db.getLoyaltyCardCursor(); assertNotNull(cursor); assertEquals(CARDS_TO_ADD, cursor.getCount()); diff --git a/app/src/test/java/protect/card_locker/ImportExportTest.java b/app/src/test/java/protect/card_locker/ImportExportTest.java index 202b74bd3..dd182e712 100644 --- a/app/src/test/java/protect/card_locker/ImportExportTest.java +++ b/app/src/test/java/protect/card_locker/ImportExportTest.java @@ -83,7 +83,7 @@ public class ImportExportTest */ private void checkLoyaltyCards() { - Cursor cursor = db.getLoyaltyCardCursor(""); + Cursor cursor = db.getLoyaltyCardCursor(); int index = 1; while(cursor.moveToNext()) diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java index d9ac77fff..225dfb369 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java @@ -86,7 +86,7 @@ public class LoyaltyCardCursorAdapterTest db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE); LoyaltyCard card = db.getLoyaltyCard(1); - Cursor cursor = db.getLoyaltyCardCursor(""); + Cursor cursor = db.getLoyaltyCardCursor(); cursor.moveToFirst(); View view = createView(cursor); @@ -100,7 +100,7 @@ public class LoyaltyCardCursorAdapterTest db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE); LoyaltyCard card = db.getLoyaltyCard(1); - Cursor cursor = db.getLoyaltyCardCursor(""); + Cursor cursor = db.getLoyaltyCardCursor(); cursor.moveToFirst(); View view = createView(cursor); @@ -114,7 +114,7 @@ public class LoyaltyCardCursorAdapterTest db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE); LoyaltyCard card = db.getLoyaltyCard(1); - Cursor cursor = db.getLoyaltyCardCursor(""); + Cursor cursor = db.getLoyaltyCardCursor(); cursor.moveToFirst(); setFontSizes(1, 2);