Resolve address when lost focus.
This commit is contained in:
parent
540adeb22c
commit
090816998e
|
@ -98,6 +98,36 @@ class Plugin(BasePlugin):
|
||||||
def settings_widget(self, window):
|
def settings_widget(self, window):
|
||||||
return EnterButton(_('Settings'), self.settings_dialog)
|
return EnterButton(_('Settings'), self.settings_dialog)
|
||||||
|
|
||||||
|
@hook
|
||||||
|
def timer_actions(self):
|
||||||
|
if self.win.payto_e.hasFocus():
|
||||||
|
return
|
||||||
|
if self.win.payto_e.is_multiline(): # only supports single line entries atm
|
||||||
|
return
|
||||||
|
url = str(self.win.payto_e.toPlainText())
|
||||||
|
if url == self.win.previous_payto_e:
|
||||||
|
return
|
||||||
|
self.win.previous_payto_e = url
|
||||||
|
url = url.replace('@', '.') # support email-style addresses, per the OA standard
|
||||||
|
|
||||||
|
if ('.' in url) and (not '<' in url) and (not ' ' in url):
|
||||||
|
if not OA_READY: # handle a failed DNSPython load
|
||||||
|
QMessageBox.warning(self.win, _('Error'), 'Could not load DNSPython libraries, please ensure they are available and/or Electrum has been built correctly', _('OK'))
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
return
|
||||||
|
|
||||||
|
data = self.resolve(url)
|
||||||
|
|
||||||
|
if not data:
|
||||||
|
self.win.previous_payto_e = url
|
||||||
|
return True
|
||||||
|
|
||||||
|
(address, name) = data
|
||||||
|
new_url = url + ' <' + address + '>'
|
||||||
|
self.win.payto_e.setText(new_url)
|
||||||
|
self.win.previous_payto_e = new_url
|
||||||
|
|
||||||
@hook
|
@hook
|
||||||
def before_send(self):
|
def before_send(self):
|
||||||
'''
|
'''
|
||||||
|
@ -109,28 +139,20 @@ class Plugin(BasePlugin):
|
||||||
|
|
||||||
if self.win.payto_e.is_multiline(): # only supports single line entries atm
|
if self.win.payto_e.is_multiline(): # only supports single line entries atm
|
||||||
return False
|
return False
|
||||||
url = str(self.win.payto_e.toPlainText())
|
payto_e = str(self.win.payto_e.toPlainText())
|
||||||
|
regex = re.compile(r'^([^\s]+) <([A-Za-z0-9]+)>') # only do that for converted addresses
|
||||||
url = url.replace('@', '.') # support email-style addresses, per the OA standard
|
try:
|
||||||
|
(url, address) = regex.search(payto_e).groups()
|
||||||
if ('.' in url) and (not '<' in url) and (not ' ' in url):
|
except AttributeError:
|
||||||
if not OA_READY: # handle a failed DNSPython load
|
|
||||||
QMessageBox.warning(self.win, _('Error'), 'Could not load DNSPython libraries, please ensure they are available and/or Electrum has been built correctly', _('OK'))
|
|
||||||
return False
|
|
||||||
else:
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
data = self.resolve(url)
|
if not OA_READY: # handle a failed DNSPython load
|
||||||
|
QMessageBox.warning(self.win, _('Error'), 'Could not load DNSPython libraries, please ensure they are available and/or Electrum has been built correctly', _('OK'))
|
||||||
if not data:
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
(address, name) = data
|
|
||||||
self.win.payto_e.setText(url + ' <' + address + '>')
|
|
||||||
|
|
||||||
if not self.validate_dnssec(url):
|
if not self.validate_dnssec(url):
|
||||||
msgBox = QMessageBox()
|
msgBox = QMessageBox()
|
||||||
msgBox.setText(_('WARNING: the address ' + address + ' could not be validated via an additional security check, DNSSEC, and thus may not be correct.'))
|
msgBox.setText(_('WARNING: the address ' + address + ' could not be validated via an additional security check, DNSSEC, and thus may not be correct.'))
|
||||||
msgBox.setInformativeText(_('Do you wish to continue?'))
|
msgBox.setInformativeText(_('Do you wish to continue?'))
|
||||||
msgBox.setStandardButtons(QMessageBox.Cancel | QMessageBox.Ok)
|
msgBox.setStandardButtons(QMessageBox.Cancel | QMessageBox.Ok)
|
||||||
msgBox.setDefaultButton(QMessageBox.Cancel)
|
msgBox.setDefaultButton(QMessageBox.Cancel)
|
||||||
|
@ -200,7 +222,7 @@ class Plugin(BasePlugin):
|
||||||
|
|
||||||
if not self.validate_dnssec(url):
|
if not self.validate_dnssec(url):
|
||||||
msgBox = QMessageBox()
|
msgBox = QMessageBox()
|
||||||
msgBox.setText(_('WARNING: the address ' + address + ' could not be validated via an additional security check, DNSSEC, and thus may not be correct.'))
|
msgBox.setText(_('WARNING: the address ' + address + ' could not be validated via an additional security check, DNSSEC, and thus may not be correct.'))
|
||||||
msgBox.setInformativeText("Do you wish to continue?")
|
msgBox.setInformativeText("Do you wish to continue?")
|
||||||
msgBox.setStandardButtons(QMessageBox.Cancel | QMessageBox.Ok)
|
msgBox.setStandardButtons(QMessageBox.Cancel | QMessageBox.Ok)
|
||||||
msgBox.setDefaultButton(QMessageBox.Cancel)
|
msgBox.setDefaultButton(QMessageBox.Cancel)
|
||||||
|
@ -274,7 +296,7 @@ class Plugin(BasePlugin):
|
||||||
except DNSException:
|
except DNSException:
|
||||||
err = _('Unhandled exception.')
|
err = _('Unhandled exception.')
|
||||||
continue
|
continue
|
||||||
except Exception,e:
|
except Exception, e:
|
||||||
err = _('Unexpected error: ' + str(e))
|
err = _('Unexpected error: ' + str(e))
|
||||||
continue
|
continue
|
||||||
break
|
break
|
||||||
|
@ -337,6 +359,6 @@ class Plugin(BasePlugin):
|
||||||
dns.dnssec.validate(answer[0], answer[1], {name: answer[0]})
|
dns.dnssec.validate(answer[0], answer[1], {name: answer[0]})
|
||||||
except dns.dnssec.ValidationFailure:
|
except dns.dnssec.ValidationFailure:
|
||||||
return 0
|
return 0
|
||||||
except Exception,e:
|
except Exception, e:
|
||||||
return 0
|
return 0
|
||||||
return 1
|
return 1
|
Loading…
Reference in New Issue