X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=d183c4c8094b65401c82284f5a89949cc4322804;hb=e9f0dc7fe24c6e58615a9913a6450897d0a3b7b9;hp=f58b62529d1b4adead07c87e236b38cbd0f05fba;hpb=6993727d9b09a792f28e750e9a3aa7eb84e66d05;p=mobile-ledger.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 f58b6252..d183c4c8 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -19,7 +19,6 @@ package net.ktnx.mobileledger.model;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 
 import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.MLDB;
@@ -32,6 +31,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import androidx.lifecycle.MutableLiveData;
 
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
 public final class Data {
     public static ObservableList<TransactionListItem> transactions =
             new ObservableList<>(new ArrayList<>());
@@ -46,12 +47,12 @@ public final class Data {
     public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
     public static void backgroundTaskStarted() {
         int cnt = backgroundTaskCount.incrementAndGet();
-        Log.d("data", String.format("background task count is %d after incrementing", cnt));
+        debug("data", String.format("background task count is %d after incrementing", cnt));
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void backgroundTaskFinished() {
         int cnt = backgroundTaskCount.decrementAndGet();
-        Log.d("data", String.format("background task count is %d after decrementing", cnt));
+        debug("data", String.format("background task count is %d after decrementing", cnt));
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void setCurrentProfile(MobileLedgerProfile newProfile) {
@@ -59,7 +60,7 @@ public final class Data {
         profile.set(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
-        try (LockHolder lh = profiles.lockForReading()) {
+        try (LockHolder ignored = profiles.lockForReading()) {
             for (int i = 0; i < profiles.size(); i++) {
                 MobileLedgerProfile p = profiles.get(i);
                 if (p.equals(profile)) return i;
@@ -69,7 +70,7 @@ public final class Data {
         }
     }
     public static int getProfileIndex(String profileUUID) {
-        try (LockHolder lh = profiles.lockForReading()) {
+        try (LockHolder ignored = profiles.lockForReading()) {
             for (int i = 0; i < profiles.size(); i++) {
                 MobileLedgerProfile p = profiles.get(i);
                 if (p.getUuid().equals(profileUUID)) return i;
@@ -83,7 +84,9 @@ public final class Data {
         if (profileUUID == null) return -1;
 
         SQLiteDatabase db = MLDB.getDatabase();
-        try(Cursor c = db.rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID})) {
+        try (Cursor c = db
+                .rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID}))
+        {
             if (c.moveToNext()) return c.getInt(0);
         }
 
@@ -95,7 +98,7 @@ public final class Data {
             profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
         }
         else {
-            try (LockHolder lh = profiles.lockForReading()) {
+            try (LockHolder ignored = profiles.lockForReading()) {
                 int i = getProfileIndex(profileUUID);
                 if (i == -1) i = 0;
                 profile = profiles.get(i);