Merge pull request #192 from yevhenii-kanivets/188_fix_bug_connected_with_delete_account

188 fix bug connected with delete account

Author: bogdan-evtushenko

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();

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<Account> {
-    @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<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<>();
@@ -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()) {
@@ -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()) {
@@ -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());
@@ -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) {