From b0629e46e88a98f895e1803889160f71abb44643 Mon Sep 17 00:00:00 2001
From: m2049r <miner2049er@women-at-work.org>
Date: Mon, 17 Sep 2018 17:56:04 +0200
Subject: [PATCH] correct address entry message (#409)

---
 .../java/com/m2049r/xmrwallet/data/BarcodeData.java | 13 ++++++++++---
 .../fragment/send/SendAddressWizardFragment.java    |  6 +++---
 .../com/m2049r/xmrwallet/util/OpenAliasHelper.java  |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java b/app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java
index 10b13b2..8d4e9b9 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import timber.log.Timber;
 
 public class BarcodeData {
+
     public static final String XMR_SCHEME = "monero:";
     public static final String XMR_PAYMENTID = "tx_payment_id";
     public static final String XMR_AMOUNT = "tx_amount";
@@ -43,13 +44,19 @@ public class BarcodeData {
         XMR, BTC
     }
 
+    public enum Security {
+        NORMAL,
+        OA_NO_DNSSEC,
+        OA_DNSSEC
+    }
+
     public Asset asset = null;
     public String addressName = null;
     public String address = null;
     public String paymentId = null;
     public String amount = null;
     public String description = null;
-    public boolean isSecure = true;
+    public Security security = Security.NORMAL;
 
     public BarcodeData(String uri) {
         this.asset = asset;
@@ -86,8 +93,8 @@ public class BarcodeData {
         addressName = name;
     }
 
-    public void isSecure(boolean isSecure) {
-        this.isSecure = isSecure;
+    public void setSecurity(Security security) {
+        this.security = security;
     }
 
     public Uri getUri() {
diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java
index 8b54116..b4f76de 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java
@@ -252,7 +252,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                     BarcodeData barcodeData = dataMap.get(BarcodeData.Asset.XMR);
                     if (barcodeData == null) barcodeData = dataMap.get(BarcodeData.Asset.BTC);
                     if (barcodeData != null) {
-                        Timber.d("DNSSEC=%b, %s", barcodeData.isSecure, barcodeData.address);
+                        Timber.d("Security=%s, %s", barcodeData.security.toString(), barcodeData.address);
                         processScannedData(barcodeData);
                         etDummy.requestFocus();
                         Helper.hideKeyboard(getActivity());
@@ -388,9 +388,9 @@ public class SendAddressWizardFragment extends SendWizardFragment {
             if (scannedAddress != null) {
                 etAddress.getEditText().setText(scannedAddress);
                 if (checkAddress()) {
-                    if (!barcodeData.isSecure)
+                    if (barcodeData.security == BarcodeData.Security.OA_NO_DNSSEC)
                         etAddress.setError(getString(R.string.send_address_no_dnssec));
-                    else
+                    else if (barcodeData.security == BarcodeData.Security.OA_DNSSEC)
                         etAddress.setError(getString(R.string.send_address_openalias));
                 }
             } else {
diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/OpenAliasHelper.java b/app/src/main/java/com/m2049r/xmrwallet/util/OpenAliasHelper.java
index 13b82d3..56fa330 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/util/OpenAliasHelper.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/util/OpenAliasHelper.java
@@ -142,7 +142,7 @@ public class OpenAliasHelper {
                     for (String txt : txts) {
                         BarcodeData bc = BarcodeData.parseOpenAlias(txt);
                         if (bc != null) {
-                            bc.isSecure(dnssec);
+                            bc.setSecurity(dnssec ? BarcodeData.Security.OA_DNSSEC : BarcodeData.Security.OA_NO_DNSSEC);
                             if (!dataMap.containsKey(bc.asset)) {
                                 dataMap.put(bc.asset, bc);
                             }