From 9975282fa80b1ffd6274d5c7fcff4494375e3f9b Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sun, 30 Dec 2018 10:06:53 +0000
Subject: GUI: If BIP70 is disabled, attempt to fall back to BIP21 parsing

---
 src/qt/paymentserver.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index b1ec90ad36..9e8afc8aa4 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -292,9 +292,9 @@ void PaymentServer::handleURIOrFile(const QString& s)
     else if (s.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // bitcoin: URI
     {
         QUrlQuery uri((QUrl(s)));
+#ifdef ENABLE_BIP70
         if (uri.hasQueryItem("r")) // payment request URI
         {
-#ifdef ENABLE_BIP70
             Q_EMIT message(tr("URI handling"),
                 tr("You are using a BIP70 URL which will be unsupported in the future."),
                 CClientUIInterface::ICON_WARNING);
@@ -315,19 +315,23 @@ void PaymentServer::handleURIOrFile(const QString& s)
                     tr("Payment request fetch URL is invalid: %1").arg(fetchUrl.toString()),
                     CClientUIInterface::ICON_WARNING);
             }
-#else
-            Q_EMIT message(tr("URI handling"),
-                tr("Cannot process payment request because BIP70 support was not compiled in."),
-                CClientUIInterface::ICON_WARNING);
-#endif
             return;
         }
-        else // normal URI
+        else
+#endif
+        // normal URI
         {
             SendCoinsRecipient recipient;
             if (GUIUtil::parseBitcoinURI(s, &recipient))
             {
                 if (!IsValidDestinationString(recipient.address.toStdString())) {
+#ifndef ENABLE_BIP70
+                    if (uri.hasQueryItem("r")) {  // payment request
+                        Q_EMIT message(tr("URI handling"),
+                            tr("Cannot process payment request because BIP70 support was not compiled in."),
+                            CClientUIInterface::ICON_WARNING);
+                    }
+#endif
                     Q_EMIT message(tr("URI handling"), tr("Invalid payment address %1").arg(recipient.address),
                         CClientUIInterface::MSG_ERROR);
                 }
-- 
cgit v1.2.3


From 113f0004bec2dd203502f2a9bcba93676d5b9cda Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 31 Dec 2018 02:48:46 +0000
Subject: GUI: If BIP70 is disabled, give a proper error when trying to open a
 payment request file

---
 src/qt/paymentserver.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 9e8afc8aa4..43dccec4ea 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -347,9 +347,9 @@ void PaymentServer::handleURIOrFile(const QString& s)
         }
     }
 
-#ifdef ENABLE_BIP70
     if (QFile::exists(s)) // payment request file
     {
+#ifdef ENABLE_BIP70
         PaymentRequestPlus request;
         SendCoinsRecipient recipient;
         if (!readPaymentRequestFromFile(s, request))
@@ -362,8 +362,12 @@ void PaymentServer::handleURIOrFile(const QString& s)
             Q_EMIT receivedPaymentRequest(recipient);
 
         return;
-    }
+#else
+        Q_EMIT message(tr("Payment request file handling"),
+            tr("Cannot process payment request because BIP70 support was not compiled in."),
+            CClientUIInterface::ICON_WARNING);
 #endif
+    }
 }
 
 void PaymentServer::handleURIConnection()
-- 
cgit v1.2.3