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=7687d237f2279da693d04d27a2448b0e02139b8d;hp=0902ced5f8d1771d9ad8c853321c15fd5c6b5bc9;hb=f397735f4ef56cc287e3345d23eac91909e3e2f3;hpb=23b8360d4f884bbdb20cc2de1825486ef42f37d6 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 0902ced5..7687d237 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -19,14 +19,22 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.os.AsyncTask; +import net.ktnx.mobileledger.App; +import net.ktnx.mobileledger.async.RetrieveTransactionsTask; +import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.LockHolder; +import net.ktnx.mobileledger.utils.Locker; +import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.ObservableList; import net.ktnx.mobileledger.utils.ObservableValue; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Locale; import java.util.concurrent.atomic.AtomicInteger; @@ -38,14 +46,16 @@ public final class Data { public static ObservableList transactions = new ObservableList<>(new ArrayList<>()); public static ObservableList accounts = new ObservableList<>(new ArrayList<>()); - private static AtomicInteger backgroundTaskCount = new AtomicInteger(0); public static MutableLiveData backgroundTasksRunning = new MutableLiveData<>(false); public static MutableLiveData lastUpdateDate = new MutableLiveData<>(); - public static ObservableValue profile = new ObservableValue<>(); - public static ObservableList profiles = - new ObservableList<>(new ArrayList<>()); + public static MutableLiveData profile = new MutableLiveData<>(); + public static MutableLiveData> profiles = + new MutableLiveData<>(null); public static ObservableValue optShowOnlyStarred = new ObservableValue<>(); public static MutableLiveData accountFilter = new MutableLiveData<>(); + private static AtomicInteger backgroundTaskCount = new AtomicInteger(0); + private static Locker profilesLocker = new Locker(); + private static RetrieveTransactionsTask retrieveTransactionsTask; public static void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); debug("data", @@ -62,12 +72,15 @@ public final class Data { } public static void setCurrentProfile(MobileLedgerProfile newProfile) { MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); - profile.set(newProfile); + stopTransactionsRetrieval(); + profile.postValue(newProfile); } public static int getProfileIndex(MobileLedgerProfile profile) { - try (LockHolder ignored = profiles.lockForReading()) { - for (int i = 0; i < profiles.size(); i++) { - MobileLedgerProfile p = profiles.get(i); + try (LockHolder ignored = profilesLocker.lockForReading()) { + List prList = profiles.getValue(); + assert prList != null; + for (int i = 0; i < prList.size(); i++) { + MobileLedgerProfile p = prList.get(i); if (p.equals(profile)) return i; } @@ -76,9 +89,11 @@ public final class Data { } @SuppressWarnings("WeakerAccess") public static int getProfileIndex(String profileUUID) { - try (LockHolder ignored = profiles.lockForReading()) { - for (int i = 0; i < profiles.size(); i++) { - MobileLedgerProfile p = profiles.get(i); + try (LockHolder ignored = profilesLocker.lockForReading()) { + List prList = profiles.getValue(); + assert prList != null; + for (int i = 0; i < prList.size(); i++) { + MobileLedgerProfile p = prList.get(i); if (p.getUuid().equals(profileUUID)) return i; } @@ -89,7 +104,7 @@ public final class Data { String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); if (profileUUID == null) return -1; - SQLiteDatabase db = MLDB.getDatabase(); + SQLiteDatabase db = App.getDatabase(); try (Cursor c = db .rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID})) { @@ -100,16 +115,37 @@ public final class Data { } public static MobileLedgerProfile getProfile(String profileUUID) { MobileLedgerProfile profile; - if (profiles.isEmpty()) { - profile = MobileLedgerProfile.loadAllFromDB(profileUUID); - } - else { - try (LockHolder ignored = profiles.lockForReading()) { + try (LockHolder readLock = profilesLocker.lockForReading()) { + List prList = profiles.getValue(); + if ((prList == null) || prList.isEmpty()) { + readLock.close(); + try (LockHolder ignored = profilesLocker.lockForWriting()) { + profile = MobileLedgerProfile.loadAllFromDB(profileUUID); + } + } + else { int i = getProfileIndex(profileUUID); if (i == -1) i = 0; - profile = profiles.get(i); + profile = prList.get(i); } } return profile; } + public synchronized static void scheduleTransactionListRetrieval(MainActivity activity) { + if (retrieveTransactionsTask != null) { + Logger.debug("db", "Ignoring request for transaction retrieval - already active"); + return; + } + retrieveTransactionsTask = + new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue()); + Logger.debug("db", "Created a background transaction retrieval task"); + + retrieveTransactionsTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + } + public static synchronized void stopTransactionsRetrieval() { + if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); + } + public static void transactionRetrievalDone() { + retrieveTransactionsTask = null; + } }