X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftemplates%2FTemplateDetailsViewModel.java;h=c49e44d092f75d0b49490492136ebdcb2f474501;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;hp=988d1bb86e8f07c4176938514c7219be46369612;hpb=936c7f5f095871cd317ce1d8b3ca55d368031849;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 988d1bb8..c49e44d0 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
@@ -33,6 +33,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;
@@ -46,13 +47,13 @@ public class TemplateDetailsViewModel extends ViewModel {
             new MutableLiveData<>(Collections.emptyList());
     private final AtomicInteger syntheticItemId = new AtomicInteger(0);
     private Long mPatternId;
-    private String mDefaultPatternName;
+    private String mDefaultTemplateName;
     private boolean itemsLoaded = false;
-    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() {
@@ -85,7 +86,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;
@@ -211,11 +211,14 @@ public class TemplateDetailsViewModel extends ViewModel {
 
             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
@@ -236,7 +239,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
@@ -252,6 +255,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) {