From 6631ab9406efabc3dd203ac587672181abec0fc0 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 12 Jun 2014 15:47:48 +0200 Subject: [PATCH 1/1] verify if pr has expired --- gui/qt/main_window.py | 7 +++++-- lib/paymentrequest.py | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index f165773..fdd9e72 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -1270,10 +1270,13 @@ class ElectrumWindow(QMainWindow): pr = PaymentRequest(self.config) pr.read_file(key) pr.domain = domain - pr.verify() self.gui_object.payment_request = pr self.prepare_for_payment_request() - self.payment_request_ok() + if pr.verify(): + self.payment_request_ok() + else: + self.payment_request_error() + def create_invoice_menu(self, position): item = self.invoices_list.itemAt(position) diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py index e00de7d..6cea063 100644 --- a/lib/paymentrequest.py +++ b/lib/paymentrequest.py @@ -259,9 +259,9 @@ class PaymentRequest: self.payment_url = self.details.payment_url - #if self.has_expired(): - # self.error = "ERROR: Payment Request has Expired." - # return False + if self.has_expired(): + self.error = "ERROR: Payment Request has Expired." + return False return True -- 1.7.1