X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=1fc4aa06a8962e1c07bf225e3024ee48a8a83518;hp=5965d27da8e768658ecdd02c2cc0b99a69a005e7;hb=73adeb59bc035a88a2c18d8cd79467e2f15825db;hpb=83cac114e375728080194fb09758b49c50a8119b diff --git a/app/src/main/java/net/ktnx/mobileledger/model/Data.java b/app/src/main/java/net/ktnx/mobileledger/model/Data.java index 5965d27d..1fc4aa06 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -17,6 +17,7 @@ package net.ktnx.mobileledger.model; +import net.ktnx.mobileledger.utils.LockHolder; import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.ObservableAtomicInteger; import net.ktnx.mobileledger.utils.ObservableList; @@ -27,7 +28,7 @@ import java.util.Date; import java.util.List; public final class Data { - public static TransactionList transactions = new TransactionList(); + public static ObservableList transactions = new ObservableList<>(new ArrayList<>()); public static ObservableList accounts = new ObservableList<>(new ArrayList<>()); public static ObservableAtomicInteger backgroundTaskCount = new ObservableAtomicInteger(0); @@ -41,12 +42,13 @@ public final class Data { profile.set(newProfile); } public static int getProfileIndex(MobileLedgerProfile profile) { + try(LockHolder lh = profiles.lockForReading()) { for (int i = 0; i < profiles.size(); i++) { MobileLedgerProfile p = profiles.get(i); if (p.equals(profile)) return i; + } + return -1; } - - return -1; } }