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=2559fd86f9f3aa702d7f50fb3108120d25995183;hp=d92ddef1c8c8ebba2bb3ba9588afab50309b5096;hb=8fd287a2b36f1d28ee1c1ca67687abaab4e95f2f;hpb=7165b89c8ff2b9d8f69e02354197127ec27a4a47

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 d92ddef1..2559fd86 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,9 @@
 
 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;
@@ -25,12 +28,10 @@ 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 ObservableList<LedgerAccount> accounts =
-            new ObservableList<>(new ArrayList<>());
+    public static ObservableList<TransactionListItem> transactions = new ObservableList<>(new ArrayList<>());
+    public static ObservableList<LedgerAccount> accounts = new ObservableList<>(new ArrayList<>());
     public static ObservableAtomicInteger backgroundTaskCount = new ObservableAtomicInteger(0);
     public static ObservableValue<Date> lastUpdateDate = new ObservableValue<>();
     public static ObservableValue<MobileLedgerProfile> profile = new ObservableValue<>();
@@ -42,7 +43,7 @@ public final class Data {
         profile.set(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
-        try(LockHolder lh = profiles.lockForReading()) {
+        try (LockHolder lh = profiles.lockForReading()) {
             for (int i = 0; i < profiles.size(); i++) {
                 MobileLedgerProfile p = profiles.get(i);
                 if (p.equals(profile)) return i;
@@ -51,4 +52,25 @@ public final class Data {
             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;
+
+        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;
+    }
 }