X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=60fb9239898e41daa9252c496acbd62d8e8089bf;hb=2c15d517fcad8958e9dab705fbc3acce0143c010;hp=ffad647315411cd9a4ad96e7f327201b59ab7f65;hpb=9e8a289a85a65d372b47ccd2c2261299972ae4dd;p=mobile-ledger-staging.git
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 ffad6473..60fb9239 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -1,22 +1,26 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.model;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import net.ktnx.mobileledger.utils.LockHolder;
import net.ktnx.mobileledger.utils.MLDB;
import net.ktnx.mobileledger.utils.ObservableAtomicInteger;
import net.ktnx.mobileledger.utils.ObservableList;
@@ -24,28 +28,48 @@ import net.ktnx.mobileledger.utils.ObservableValue;
import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
public final class Data {
- public static TransactionList transactions = new TransactionList();
- public static ObservableValue> accounts =
- new ObservableValue<>(new ArrayList<>());
+ public static ObservableList transactions = new ObservableList<>(new ArrayList<>());
+ public static ObservableList accounts = new ObservableList<>(new ArrayList<>());
public static ObservableAtomicInteger backgroundTaskCount = new ObservableAtomicInteger(0);
public static ObservableValue lastUpdateDate = new ObservableValue<>();
public static ObservableValue profile = new ObservableValue<>();
public static ObservableList profiles =
new ObservableList<>(new ArrayList<>());
public static ObservableValue optShowOnlyStarred = new ObservableValue<>();
+ public static ObservableValue accountFilter = new ObservableValue<>();
public static void setCurrentProfile(MobileLedgerProfile newProfile) {
MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
profile.set(newProfile);
}
public static int getProfileIndex(MobileLedgerProfile profile) {
- List list = profiles.getList();
+ 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;
+ }
+ }
+ public static int getProfileIndex(String profileUUID) {
+ try (LockHolder lh = profiles.lockForReading()) {
+ for (int i = 0; i < profiles.size(); i++) {
+ MobileLedgerProfile p = profiles.get(i);
+ if (p.getUuid().equals(profileUUID)) return i;
+ }
+
+ return -1;
+ }
+ }
+ public static int retrieveCurrentThemeIdFromDb() {
+ String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
+ if (profileUUID == null) return -1;
- for (int i = 0; i < list.size(); i++) {
- MobileLedgerProfile p = list.get(i);
- if (p.equals(profile)) return i;
+ SQLiteDatabase db = MLDB.getDatabase();
+ try(Cursor c = db.rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID})) {
+ if (c.moveToNext()) return c.getInt(0);
}
return -1;