diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java index fba501b..1d27ed9 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java @@ -104,9 +104,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { break; case REQUEST_TRANSFER: - update(); - setResult(RESULT_OK); - break; case REQUEST_EDIT_ACCOUNT: update(); diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountController.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountController.java index f383cd7..e633460 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountController.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountController.java @@ -21,7 +21,8 @@ * @author Evgenii Kanivets */ public class AccountController extends BaseController { - @SuppressWarnings("unused") private static final String TAG = "AccountController"; + @SuppressWarnings("unused") + private static final String TAG = "AccountController"; private final PreferenceController preferenceController; @@ -30,11 +31,15 @@ public AccountController(IRepo accountRepo, PreferenceController prefer this.preferenceController = preferenceController; } - @Nullable @Override public Account read(long id) { + @Nullable + @Override + public Account read(long id) { return substituteCurrency(super.read(id)); } - @NonNull @Override public List readAll() { + @NonNull + @Override + public List readAll() { List accountList = super.readAll(); List result = new ArrayList<>(); @@ -45,7 +50,8 @@ public AccountController(IRepo accountRepo, PreferenceController prefer return result; } - @NonNull public List readActiveAccounts() { + @NonNull + public List readActiveAccounts() { List result = new ArrayList<>(); for (Account account : readAll()) { @@ -57,7 +63,8 @@ public AccountController(IRepo accountRepo, PreferenceController prefer return result; } - @NonNull public List readArchivedAccounts() { + @NonNull + public List readArchivedAccounts() { List result = new ArrayList<>(); for (Account account : readAll()) { @@ -69,7 +76,7 @@ public AccountController(IRepo accountRepo, PreferenceController prefer return result; } - public boolean recordAdded(@Nullable Record record) { + boolean recordAdded(@Nullable Record record) { if (record == null || record.getAccount() == null) return false; Account account = repo.read(record.getAccount().getId()); @@ -93,8 +100,10 @@ public boolean recordAdded(@Nullable Record record) { return true; } - public boolean recordDeleted(@Nullable Record record) { - if (record == null || record.getAccount() == null) return false; + boolean recordDeleted(@Nullable Record record) { + if (record == null) return false; + + if (record.getAccount() == null) return true; Account account = repo.read(record.getAccount().getId()); if (account == null) return false; @@ -141,7 +150,8 @@ public boolean transferDone(@Nullable Transfer transfer) { return true; } - @Nullable public Account readDefaultAccount() { + @Nullable + public Account readDefaultAccount() { long defaultAccountId = preferenceController.readDefaultAccountId(); if (defaultAccountId == -1) {