From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sun, 31 Jan 2021 21:28:34 +0000 (+0200)
Subject: fix selecting from multiple matching patterns
X-Git-Tag: v0.17.0~179
X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=commitdiff_plain;h=ba4f53c7a3a5b55eaa7a7c5ed1076c3588fe1800

fix selecting from multiple matching patterns
---

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java
index 140b3a74..6be1bd37 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java
@@ -148,7 +148,7 @@ public class NewTransactionFragment extends QRScanCapableFragment {
         });
     }
     private void choosePattern(ArrayList<PatternHeader> matchingPatterns, String matchedText) {
-        final String patternNameColumn = getString(R.string.pattern_name);
+        final String patternNameColumn = "name";
         AbstractCursor cursor = new AbstractCursor() {
             @Override
             public int getCount() {
@@ -156,44 +156,54 @@ public class NewTransactionFragment extends QRScanCapableFragment {
             }
             @Override
             public String[] getColumnNames() {
-                return new String[]{patternNameColumn};
+                return new String[]{"_id", patternNameColumn};
             }
             @Override
             public String getString(int column) {
+                if (column == 0)
+                    return String.valueOf(getPosition());
                 return matchingPatterns.get(getPosition())
                                        .getName();
             }
             @Override
             public short getShort(int column) {
+                if (column == 0)
+                    return (short) getPosition();
                 return -1;
             }
             @Override
             public int getInt(int column) {
-                return -1;
+                return getShort(column);
             }
             @Override
             public long getLong(int column) {
-                return -1;
+                return getShort(column);
             }
             @Override
             public float getFloat(int column) {
-                return -1;
+                return getShort(column);
             }
             @Override
             public double getDouble(int column) {
-                return -1;
+                return getShort(column);
             }
             @Override
             public boolean isNull(int column) {
                 return false;
             }
+            @Override
+            public int getColumnCount() {
+                return 2;
+            }
         };
 
         MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
         builder.setCancelable(true)
                .setTitle(R.string.choose_pattern_to_apply)
-               .setSingleChoiceItems(cursor, -1, patternNameColumn,
-                       (dialog, which) -> applyPattern(matchingPatterns.get(which), matchedText))
+               .setSingleChoiceItems(cursor, -1, patternNameColumn, (dialog, which) -> {
+                   applyPattern(matchingPatterns.get(which), matchedText);
+                   dialog.dismiss();
+               })
                .create()
                .show();
     }