AccountRow: set position from DB

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / TemplateDetailsItem.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/TemplateDetailsItem.java b/app/src/main/java/net/ktnx/mobileledger/model/TemplateDetailsItem.java
index 822f743880f52b2fcac77be209d490511d75b6e6..7c33386670cd72619cde97179579fd7adc428876 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/TemplateDetailsItem.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/TemplateDetailsItem.java
@@ -37,7 +37,6 @@ import net.ktnx.mobileledger.utils.Misc;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -103,6 +102,7 @@ abstract public class TemplateDetailsItem {
             TemplateAccount pa = (TemplateAccount) p;
             AccountRow acc = createAccountRow();
             acc.setId(pa.getId());
+            acc.setPosition(pa.getPosition());
 
             if (pa.getAccountNameMatchGroup() == null)
                 acc.setAccountName(Misc.nullIsEmpty(pa.getAccountName()));
@@ -655,12 +655,11 @@ abstract public class TemplateDetailsItem {
                         SpannableString ss = new SpannableString(testText);
                         Matcher m = compiledPattern.matcher(testText);
                         if (m.find()) {
-                            ArrayList<String> notMatched = new ArrayList<>();
                             if (m.start() > 0)
                                 ss.setSpan(notMatchedSpan(), 0, m.start(),
                                         Spanned.SPAN_INCLUSIVE_INCLUSIVE);
                             if (m.end() < testText.length() - 1)
-                                ss.setSpan(notMatchedSpan(), m.end(), testText.length() - 1,
+                                ss.setSpan(notMatchedSpan(), m.end(), testText.length(),
                                         Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
                             ss.setSpan(matchedSpan(), m.start(0), m.end(0),