X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionActivity.java;h=9a630f811d2b5f54ae8a22061c2104ba8966df0e;hb=c0c5b839b2b2ecd8cfcf69a31a5fcc88b6bea778;hp=51f872f6fef08c612c0c1d24d1b2436b1b9105fe;hpb=311cb018cc9cd6be1f189e2fc674a517ff4d47fc;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java index 51f872f6..9a630f81 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java @@ -198,7 +198,7 @@ public class NewTransactionActivity extends ProfileThemedActivity getResources().getDisplayMetrics())); } @Override - public void done(String error, Object arg) { + public void onTransactionSaveDone(String error, Object arg) { Bundle b = new Bundle(); if (error != null) { b.putString("error", error); @@ -362,17 +362,13 @@ public class NewTransactionActivity extends ProfileThemedActivity TransactionDAO trDao = DB.get() .getTransactionDAO(); - TransactionWithAccounts tr; + TransactionWithAccounts tr = null; - if (Misc.emptyIsNull(accFilter) != null) { + if (Misc.emptyIsNull(accFilter) != null) tr = trDao.getFirstByDescriptionHavingAccountSync(description, accFilter); - if (tr != null) { - model.loadTransactionIntoModel(tr); - return; - } - } + if (tr == null) + tr = trDao.getFirstByDescriptionSync(description); - tr = trDao.getFirstByDescriptionSync(description); if (tr != null) model.loadTransactionIntoModel(tr); });