after restore do not create new account, but show first in DB

mtotschnig · Mar 2, 2012 · 2c506e2 · 2c506e2
1 parent 88a8376
commit 2c506e2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/org/totschnig/myexpenses/ExpensesDbAdapter.java b/src/org/totschnig/myexpenses/ExpensesDbAdapter.java
@@ -692,6 +692,18 @@ public int getAccountCountWithCurrency(String currency) {
     return result;
   }
 
+  public Long getFirstAccountId() {
+    Cursor mCursor = mDb.rawQuery("select min(_id) from accounts",null);
+    mCursor.moveToFirst();
+    Long result;
+    if (mCursor.isNull(0))
+      result = null;
+    else
+      result = mCursor.getLong(0);
+    mCursor.close();
+    return result;
+  }
+
   /**
    * PAYEES
    */

diff --git a/src/org/totschnig/myexpenses/MyExpenses.java b/src/org/totschnig/myexpenses/MyExpenses.java
@@ -517,14 +517,18 @@ public void newVersionCheck() {
     if (pref_version == current_version)
       return;
     if (pref_version == -1) {
-      Account account = new Account(
-          mDbHelper,
-          getString(R.string.app_name),
-          0,
-          getString(R.string.default_account_description),
-          Currency.getInstance(Locale.getDefault())
-      );
-      long account_id = account.save();
+      //we check if we already have an account
+      Long account_id = mDbHelper.getFirstAccountId();
+      if (account_id == null) {
+                Account account = new Account(
+            mDbHelper,
+            getString(R.string.app_name),
+            0,
+            getString(R.string.default_account_description),
+            Currency.getInstance(Locale.getDefault())
+        );
+        account_id = account.save();
+      }
       edit.putLong("current_account", account_id).commit();
       edit.putInt("currentversion", current_version).commit();
     } else if (pref_version != current_version) {