#153. Substitute NON currency in AccountController.

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

@@ -97,7 +97,7 @@ private void setupDefaultAccountPref() {
             nonSubstitutionCurrencyPref.setEntries(currencyList.toArray(new String[0]));
             nonSubstitutionCurrencyPref.setEntryValues(currencyList.toArray(new String[0]));
 
-            String nonSubstitutionCurrency = currencyController.readNonSubstitutionCurrency();
+            String nonSubstitutionCurrency = preferenceController.readNonSubstitutionCurrency();
             nonSubstitutionCurrencyPref.setDefaultValue(nonSubstitutionCurrency);
             nonSubstitutionCurrencyPref.setSummary(nonSubstitutionCurrency);
         }

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

@@ -51,16 +51,6 @@ public CurrencyController(AccountController accountController, PreferenceControl
         return currency;
     }
 
-    @NonNull public String readNonSubstitutionCurrency() {
-        // First of all read from Prefs
-        String currency = preferenceController.readNonSubstitutionCurrency();
-
-        // If don't have default currency, use NON
-        if (currency == null) currency = DbHelper.DEFAULT_ACCOUNT_CURRENCY;
-
-        return currency;
-    }
-
     @NonNull private List<String> fetchCurrencies() {
         Set<Currency> toret = new HashSet<>();
         Locale[] locs = Locale.getAvailableLocales();

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

@@ -8,6 +8,7 @@
 
 import com.blogspot.e_kanivets.moneytracker.R;
 
+import com.blogspot.e_kanivets.moneytracker.repo.DbHelper;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -130,7 +131,7 @@ public long readDefaultAccountId() {
         String nonSubstitutionCurrencyPref = context.getString(R.string.pref_non_substitution_currency);
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
 
-        return preferences.getString(nonSubstitutionCurrencyPref, null);
+        return preferences.getString(nonSubstitutionCurrencyPref, DbHelper.DEFAULT_ACCOUNT_CURRENCY);
     }
 
     public long readFirstTs() {

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

@@ -8,6 +8,7 @@
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Transfer;
+import com.blogspot.e_kanivets.moneytracker.repo.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.repo.base.IRepo;
 
 import java.util.ArrayList;
@@ -20,8 +21,7 @@
  * @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,8 +30,22 @@ public AccountController(IRepo<Account> accountRepo, PreferenceController prefer
         this.preferenceController = preferenceController;
     }
 
-    @NonNull
-    public List<Account> readActiveAccounts() {
+    @Nullable @Override public Account read(long id) {
+        return substituteCurrency(super.read(id));
+    }
+
+    @NonNull @Override public List<Account> readAll() {
+        List<Account> accountList = super.readAll();
+
+        List<Account> result = new ArrayList<>();
+        for (Account account : accountList) {
+            result.add(substituteCurrency(account));
+        }
+
+        return result;
+    }
+
+    @NonNull public List<Account> readActiveAccounts() {
         List<Account> result = new ArrayList<>();
 
         for (Account account : readAll()) {
@@ -43,8 +57,7 @@ public List<Account> readActiveAccounts() {
         return result;
     }
 
-    @NonNull
-    public List<Account> readArchivedAccounts() {
+    @NonNull public List<Account> readArchivedAccounts() {
         List<Account> result = new ArrayList<>();
 
         for (Account account : readAll()) {
@@ -128,15 +141,18 @@ public boolean transferDone(@Nullable Transfer transfer) {
         return true;
     }
 
-    @Nullable
-    public Account readDefaultAccount() {
+    @Nullable public Account readDefaultAccount() {
         long defaultAccountId = preferenceController.readDefaultAccountId();
 
-        if (defaultAccountId == -1) return getFirstAccount();
-        else {
+        if (defaultAccountId == -1) {
+            return getFirstAccount();
+        } else {
             Account account = read(defaultAccountId);
-            if (account == null) return getFirstAccount();
-            else return account;
+            if (account == null) {
+                return getFirstAccount();
+            } else {
+                return account;
+            }
         }
     }
 
@@ -162,7 +178,23 @@ public boolean restore(@Nullable Account account) {
 
     private Account getFirstAccount() {
         List<Account> accountList = readAll();
-        if (accountList.size() == 0) return null;
-        else return accountList.get(0);
+        if (accountList.size() == 0) {
+            return null;
+        } else {
+            return accountList.get(0);
+        }
+    }
+
+    private Account substituteCurrency(Account account) {
+        if (account == null) {
+            return null;
+        } else {
+            String currency = account.getCurrency();
+            if (DbHelper.DEFAULT_ACCOUNT_CURRENCY.equals(currency)) {
+                currency = preferenceController.readNonSubstitutionCurrency();
+            }
+            return new Account(account.getId(), account.getTitle(), account.getCurSum(), currency,
+                    account.getDecimals(), account.getGoal(), account.isArchived(), account.getColor());
+        }
     }
 }

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

@@ -3,7 +3,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController;
+import com.blogspot.e_kanivets.moneytracker.controller.PreferenceController;
 import com.blogspot.e_kanivets.moneytracker.repo.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.controller.base.BaseController;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
@@ -27,14 +27,14 @@ public class RecordController extends BaseController<Record> {
 
     private final CategoryController categoryController;
     private final AccountController accountController;
-    private final CurrencyController currencyController;
+    private final PreferenceController preferenceController;
 
     public RecordController(IRepo<Record> recordRepo, CategoryController categoryController,
-            AccountController accountController, CurrencyController currencyController) {
+            AccountController accountController, PreferenceController preferenceController) {
         super(recordRepo);
         this.categoryController = categoryController;
         this.accountController = accountController;
-        this.currencyController = currencyController;
+        this.preferenceController = preferenceController;
     }
 
     @Override @SuppressWarnings("SimplifiableIfStatement") public Record create(@Nullable Record record) {
@@ -110,7 +110,7 @@ record = validateRecord(record);
 
             String currency = record.getCurrency();
             if (DbHelper.DEFAULT_ACCOUNT_CURRENCY.equals(currency)) {
-                currency = currencyController.readNonSubstitutionCurrency();
+                currency = preferenceController.readNonSubstitutionCurrency();
             }
 
             completedRecordList.add(

app/src/main/java/com/blogspot/e_kanivets/moneytracker/di/module/ControllerModule.java

@@ -57,8 +57,8 @@ public ExchangeRateController providesExchangeRateController(IRepo<ExchangeRate>
 
     @Provides @NonNull @Singleton
     public RecordController providesRecordController(IRepo<Record> recordRepo, CategoryController categoryController,
-            AccountController accountController, CurrencyController currencyController) {
-        return new RecordController(recordRepo, categoryController, accountController, currencyController);
+            AccountController accountController, PreferenceController preferenceController) {
+        return new RecordController(recordRepo, categoryController, accountController, preferenceController);
     }
 
     @Provides @NonNull @Singleton public TransferController providesTransferController(IRepo<Transfer> transferRepo,