X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftemplates%2FTemplateDetailsViewModel.java;h=414340cce7d73b5d29c2a183ab098909ade2be5d;hb=860e0419d619210bb59bcae1b64d8c5db90eef70;hp=e1143c463cfb58e5735db1479429a5c4c373e1c6;hpb=300a857888f8139304b5b863cedb2d3fa3a89d0f;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java
index e1143c46..414340cc 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java
@@ -17,14 +17,13 @@
 
 package net.ktnx.mobileledger.ui.templates;
 
-import android.os.AsyncTask;
-
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModel;
 
 import net.ktnx.mobileledger.BuildConfig;
+import net.ktnx.mobileledger.dao.BaseDAO;
 import net.ktnx.mobileledger.dao.TemplateAccountDAO;
 import net.ktnx.mobileledger.dao.TemplateHeaderDAO;
 import net.ktnx.mobileledger.db.DB;
@@ -33,6 +32,7 @@ import net.ktnx.mobileledger.db.TemplateHeader;
 import net.ktnx.mobileledger.db.TemplateWithAccounts;
 import net.ktnx.mobileledger.model.TemplateDetailsItem;
 import net.ktnx.mobileledger.utils.Logger;
+import net.ktnx.mobileledger.utils.Misc;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -42,18 +42,19 @@ import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class TemplateDetailsViewModel extends ViewModel {
+    static final String TAG = "template-details-model";
+    static final String DB_TAG = TAG + "-db";
     private final MutableLiveData<List<TemplateDetailsItem>> items =
             new MutableLiveData<>(Collections.emptyList());
+    private final AtomicInteger syntheticItemId = new AtomicInteger(0);
     private Long mPatternId;
-    private String mDefaultPatternName;
+    private String mDefaultTemplateName;
     private boolean itemsLoaded = false;
-    private final AtomicInteger syntheticItemId = new AtomicInteger(0);
-
-    public String getDefaultPatternName() {
-        return mDefaultPatternName;
+    public String getDefaultTemplateName() {
+        return mDefaultTemplateName;
     }
-    public void setDefaultPatternName(String name) {
-        mDefaultPatternName = name;
+    public void setDefaultTemplateName(String name) {
+        mDefaultTemplateName = name;
     }
 
     public void resetItems() {
@@ -73,10 +74,10 @@ public class TemplateDetailsViewModel extends ViewModel {
 
         srcList = Collections.unmodifiableList(srcList);
 
-        {
-            Logger.debug("tmpl", "Considering old list");
+        if (BuildConfig.DEBUG) {
+            Logger.debug(TAG, "Considering old list");
             for (TemplateDetailsItem item : srcList)
-                Logger.debug("tmpl", String.format(Locale.US, " id %d pos %d", item.getId(),
+                Logger.debug(TAG, String.format(Locale.US, " id %d pos %d", item.getId(),
                         item.getPosition()));
         }
 
@@ -86,7 +87,6 @@ public class TemplateDetailsViewModel extends ViewModel {
 
         if (srcList.size() < 1) {
             final TemplateDetailsItem.Header header = TemplateDetailsItem.createHeader();
-            header.setName(mDefaultPatternName);
             header.setId(0);
             newList.add(header);
             changes = true;
@@ -136,7 +136,7 @@ public class TemplateDetailsViewModel extends ViewModel {
         }
 
         if (changes) {
-            Logger.debug("tmpl", "Changes detected, applying new list");
+            Logger.debug(TAG, "Changes detected, applying new list");
 
             if (async)
                 items.postValue(newList);
@@ -144,7 +144,7 @@ public class TemplateDetailsViewModel extends ViewModel {
                 items.setValue(newList);
         }
         else
-            Logger.debug("tmpl", "No changes, ignoring new list");
+            Logger.debug(TAG, "No changes, ignoring new list");
     }
     public int genItemId() {
         return syntheticItemId.decrementAndGet();
@@ -173,7 +173,7 @@ public class TemplateDetailsViewModel extends ViewModel {
                 ArrayList<TemplateDetailsItem> l = new ArrayList<>();
 
                 TemplateDetailsItem header = TemplateDetailsItem.fromRoomObject(src.header);
-                Logger.debug("tmpl-db", "Got header template item with id of " + header.getId());
+                Logger.debug(DB_TAG, "Got header template item with id of " + header.getId());
                 l.add(header);
                 Collections.sort(src.accounts,
                         (o1, o2) -> Long.compare(o1.getPosition(), o2.getPosition()));
@@ -182,7 +182,7 @@ public class TemplateDetailsViewModel extends ViewModel {
                 }
 
                 for (TemplateDetailsItem i : l) {
-                    Logger.debug("tmpl-db", "Loaded pattern item " + i);
+                    Logger.debug(DB_TAG, "Loaded pattern item " + i);
                 }
                 applyList(l, true);
                 itemsLoaded = true;
@@ -207,16 +207,22 @@ public class TemplateDetailsViewModel extends ViewModel {
         Logger.debug("flow", "PatternDetailsViewModel.onSavePattern(); model=" + this);
         final List<TemplateDetailsItem> list = Objects.requireNonNull(items.getValue());
 
-        AsyncTask.execute(() -> {
+        BaseDAO.runAsync(() -> {
             boolean newPattern = mPatternId == null || mPatternId <= 0;
 
             TemplateDetailsItem.Header modelHeader = list.get(0)
                                                          .asHeaderItem();
+
+            modelHeader.setName(Misc.trim(modelHeader.getName()));
+            if (modelHeader.getName()
+                           .isEmpty())
+                modelHeader.setName(getDefaultTemplateName());
+
             TemplateHeaderDAO headerDAO = DB.get()
                                             .getTemplateDAO();
             TemplateHeader dbHeader = modelHeader.toDBO();
             if (newPattern) {
-                dbHeader.setId(null);
+                dbHeader.setId(0L);
                 dbHeader.setId(mPatternId = headerDAO.insertSync(dbHeader));
             }
             else
@@ -237,7 +243,7 @@ public class TemplateDetailsViewModel extends ViewModel {
                 dbAccount.setTemplateId(mPatternId);
                 dbAccount.setPosition(i);
                 if (dbAccount.getId() < 0) {
-                    dbAccount.setId(null);
+                    dbAccount.setId(0);
                     dbAccount.setId(taDAO.insertSync(dbAccount));
                 }
                 else
@@ -253,6 +259,10 @@ public class TemplateDetailsViewModel extends ViewModel {
     }
     private ArrayList<TemplateDetailsItem> copyItems() {
         List<TemplateDetailsItem> oldList = items.getValue();
+
+        if (oldList == null)
+            return new ArrayList<>();
+
         ArrayList<TemplateDetailsItem> result = new ArrayList<>(oldList.size());
 
         for (TemplateDetailsItem item : oldList) {
@@ -317,7 +327,7 @@ public class TemplateDetailsViewModel extends ViewModel {
         items.setValue(newList);
     }
     public void removeItem(int position) {
-        Logger.debug("tmpl", "Removing item at position " + position);
+        Logger.debug(TAG, "Removing item at position " + position);
         ArrayList<TemplateDetailsItem> newList = copyItems();
         newList.remove(position);
         for (int i = position; i < newList.size(); i++)