#33[30m]. Fix NPE with removed accounts.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AddRecordActivity.java

@@ -102,13 +102,15 @@ protected void initViews() {
         //Add texts to dialog if it's edit dialog
         if (mode == Mode.MODE_EDIT) {
             etTitle.setText(record.getTitle());
-            etCategory.setText(record.getCategory().getName());
+            if (record.getCategory() != null) etCategory.setText(record.getCategory().getName());
             etPrice.setText(Integer.toString(record.getPrice()));
 
-            for (int i = 0; i < accountList.size(); i++) {
-                Account account = accountList.get(i);
-                if (account.getId() == record.getAccount().getId()) {
-                    spinnerAccount.setSelection(i);
+            if (record.getAccount() != null) {
+                for (int i = 0; i < accountList.size(); i++) {
+                    Account account = accountList.get(i);
+                    if (account.getId() == record.getAccount().getId()) {
+                        spinnerAccount.setSelection(i);
+                    }
                 }
             }
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/AccountController.java

@@ -23,7 +23,7 @@ public AccountController(IRepo<Account> accountRepo) {
     }
 
     public boolean recordAdded(@Nullable Record record) {
-        if (record == null) return false;
+        if (record == null || record.getAccount() == null) return false;
 
         Account account = repo.read(record.getAccount().getId());
         if (account == null) return false;
@@ -47,7 +47,7 @@ public boolean recordAdded(@Nullable Record record) {
     }
 
     public boolean recordDeleted(@Nullable Record record) {
-        if (record == null) return false;
+        if (record == null || record.getAccount() == null) return false;
 
         Account account = repo.read(record.getAccount().getId());
         if (account == null) return false;

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/RecordController.java

@@ -89,8 +89,13 @@ public List<Record> readWithCondition(String condition, String[] args) {
         // Data read from DB through Repo layer doesn't contain right nested objects, so construct them
         List<Record> completedRecordList = new ArrayList<>();
         for (Record record : recordList) {
-            Category category = categoryController.read(record.getCategory().getId());
-            Account account = accountController.read(record.getAccount().getId());
+            Category category = null;
+            if (record.getCategory() != null)
+                category = categoryController.read(record.getCategory().getId());
+
+            Account account = null;
+            if (record.getAccount() != null)
+                account = accountController.read(record.getAccount().getId());
 
             completedRecordList.add(new Record(record.getId(), record.getTime(), record.getType(),
                     record.getTitle(), category, record.getPrice(), account, record.getCurrency()));
@@ -132,7 +137,11 @@ public List<String> getRecordsForExport(long fromDate, long toDate) {
             sb.append(record.getId()).append(DELIMITER);
             sb.append(record.getTime()).append(DELIMITER);
             sb.append(record.getTitle()).append(DELIMITER);
-            Category category = categoryController.read(record.getCategory().getId());
+
+            Category category = null;
+            if (record.getCategory() != null)
+                category = categoryController.read(record.getCategory().getId());
+
             sb.append(category == null ? "NONE" : category.getName()).append(DELIMITER);
             sb.append(record.getType() == 0 ? record.getPrice() : -record.getPrice());
 
@@ -143,6 +152,8 @@ public List<String> getRecordsForExport(long fromDate, long toDate) {
     }
 
     private Record validateRecord(Record record) {
+        if (record.getCategory() == null) return record;
+
         Category category = categoryController.readOrCreate(record.getCategory().getName());
 
         return new Record(record.getId(), record.getTime(), record.getType(), record.getTitle(),

app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/Record.java

@@ -2,6 +2,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.Nullable;
 
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.entity.base.BaseEntity;
@@ -91,6 +92,7 @@ public String getTitle() {
         return title;
     }
 
+    @Nullable
     public Category getCategory() {
         return category;
     }
@@ -107,6 +109,7 @@ public boolean isIncome() {
         return type == 0;
     }
 
+    @Nullable
     public Account getAccount() {
         return account;
     }