Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

188 fix bug connected with delete account #192

Merged
bogdan-evtushenko merged 2 commits into from
Sep 13, 2019
Merged

188 fix bug connected with delete account #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
373d78b
#188. Add small refactor.
bogdan-evtushenko Sep 13, 2019
9a38076
#188. Fix bug connected with delete account. Format code.
bogdan-evtushenko Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
28 changes: 19 additions & 9 deletions ...src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
* @author Evgenii Kanivets
*/
public class AccountController extends BaseController<Account> {
@SuppressWarnings("unused") private static final String TAG = "AccountController";
@SuppressWarnings("unused")
private static final String TAG = "AccountController";

private final PreferenceController preferenceController;

Expand All @@ -30,11 +31,15 @@ public AccountController(IRepo<Account> 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<Account> readAll() {
@NonNull
@Override
public List<Account> readAll() {
List<Account> accountList = super.readAll();

List<Account> result = new ArrayList<>();
Expand All @@ -45,7 +50,8 @@ public AccountController(IRepo<Account> accountRepo, PreferenceController prefer
return result;
}

@NonNull public List<Account> readActiveAccounts() {
@NonNull
public List<Account> readActiveAccounts() {
List<Account> result = new ArrayList<>();

for (Account account : readAll()) {
Expand All @@ -57,7 +63,8 @@ public AccountController(IRepo<Account> accountRepo, PreferenceController prefer
return result;
}

@NonNull public List<Account> readArchivedAccounts() {
@NonNull
public List<Account> readArchivedAccounts() {
List<Account> result = new ArrayList<>();

for (Account account : readAll()) {
Expand All @@ -69,7 +76,7 @@ public AccountController(IRepo<Account> 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());
Expand All @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down