GUI: If BIP70 is disabled, give a proper error when trying to open a payment request file

luke-jr · luke-jr · commit 113f0004bec2 · 2019-02-11T15:08:41.000Z
diff --git 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()

Original file line number	Diff line number	Diff line change
`@@ -347,9 +347,9 @@ void PaymentServer::handleURIOrFile(const QString& s)`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`
`350`		`-#ifdef ENABLE_BIP70`
`351`	`350`	`if (QFile::exists(s)) // payment request file`
`352`	`351`	`{`
	`352`	`+#ifdef ENABLE_BIP70`
`353`	`353`	`PaymentRequestPlus request;`
`354`	`354`	`SendCoinsRecipient recipient;`
`355`	`355`	`if (!readPaymentRequestFromFile(s, request))`
`@@ -362,8 +362,12 @@ void PaymentServer::handleURIOrFile(const QString& s)`
`362`	`362`	`Q_EMIT receivedPaymentRequest(recipient);`
`363`	`363`
`364`	`364`	`return;`
`365`		`- }`
	`365`	`+#else`
	`366`	`+ Q_EMIT message(tr("Payment request file handling"),`
	`367`	`+ tr("Cannot process payment request because BIP70 support was not compiled in."),`
	`368`	`+ CClientUIInterface::ICON_WARNING);`
`366`	`369`	`#endif`
	`370`	`+ }`
`367`	`371`	`}`
`368`	`372`
`369`	`373`	`void PaymentServer::handleURIConnection()`