Skip to content

Commit 3cf78f0

Browse files
committed
Move code to recover from no active book issue to BooksDbAdapter
1 parent fa8f90d commit 3cf78f0

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

app/src/main/java/org/gnucash/android/app/GnuCashApplication.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public static void initializeDatabaseAdapters() {
150150
mDbHelper = new DatabaseHelper(getAppContext(),
151151
mBooksDbAdapter.getActiveBookUID());
152152
} catch (BooksDbAdapter.NoActiveBookFoundException e) {
153-
fixBooksDatabase();
153+
mBooksDbAdapter.fixBooksDatabase();
154154
mDbHelper = new DatabaseHelper(getAppContext(),
155155
mBooksDbAdapter.getActiveBookUID());
156156
}
@@ -174,13 +174,6 @@ public static void initializeDatabaseAdapters() {
174174
mBudgetsDbAdapter = new BudgetsDbAdapter(mainDb, mBudgetAmountsDbAdapter, mRecurrenceDbAdapter);
175175
}
176176

177-
/** Sets the first book in the database as active. */
178-
private static void fixBooksDatabase() {
179-
Book firstBook = BooksDbAdapter.getInstance().getAllRecords().get(0);
180-
firstBook.setActive(true);
181-
BooksDbAdapter.getInstance().addRecord(firstBook);
182-
}
183-
184177
public static AccountsDbAdapter getAccountsDbAdapter() {
185178
return mAccountsDbAdapter;
186179
}

app/src/main/java/org/gnucash/android/db/adapter/BooksDbAdapter.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,13 @@ public NoActiveBookFoundException(String message) {
190190
}
191191
}
192192

193+
/** Sets the first book in the database as active. */
194+
public void fixBooksDatabase() {
195+
Book firstBook = getAllRecords().get(0);
196+
firstBook.setActive(true);
197+
BooksDbAdapter.getInstance().addRecord(firstBook);
198+
}
199+
193200
public @NonNull List<String> getAllBookUIDs(){
194201
List<String> bookUIDs = new ArrayList<>();
195202
try (Cursor cursor = mDb.query(true, mTableName, new String[]{BookEntry.COLUMN_UID},

0 commit comments

Comments
 (0)