change domains, kivy base unit
This commit is contained in:
parent
d641f98ec6
commit
287675ebf7
|
@ -154,7 +154,7 @@ class ElectrumWindow(App):
|
||||||
self._trigger_update_history()
|
self._trigger_update_history()
|
||||||
|
|
||||||
def _get_bu(self):
|
def _get_bu(self):
|
||||||
return self.electrum_config.get('base_unit', 'mZEC')
|
return self.electrum_config.get('base_unit', 'ZEC')
|
||||||
|
|
||||||
def _set_bu(self, value):
|
def _set_bu(self, value):
|
||||||
assert value in base_units.keys()
|
assert value in base_units.keys()
|
||||||
|
|
|
@ -165,20 +165,20 @@ class ScannerAndroid(NFCBase):
|
||||||
def create_AAR(self):
|
def create_AAR(self):
|
||||||
'''Create the record responsible for linking our application to the tag.
|
'''Create the record responsible for linking our application to the tag.
|
||||||
'''
|
'''
|
||||||
return NdefRecord.createApplicationRecord(JString("org.electrum-zcash.kivy"))
|
return NdefRecord.createApplicationRecord(JString("cash.z.electrum.kivy"))
|
||||||
|
|
||||||
def create_TNF_EXTERNAL(self, data):
|
def create_TNF_EXTERNAL(self, data):
|
||||||
'''Create our actual payload record.
|
'''Create our actual payload record.
|
||||||
'''
|
'''
|
||||||
if BUILDVERSION >= 14:
|
if BUILDVERSION >= 14:
|
||||||
domain = "org.electrum-zcash"
|
domain = "cash.z.electrum"
|
||||||
stype = "externalType"
|
stype = "externalType"
|
||||||
extRecord = NdefRecord.createExternal(domain, stype, data)
|
extRecord = NdefRecord.createExternal(domain, stype, data)
|
||||||
else:
|
else:
|
||||||
# Creating the NdefRecord manually:
|
# Creating the NdefRecord manually:
|
||||||
extRecord = NdefRecord(
|
extRecord = NdefRecord(
|
||||||
NdefRecord.TNF_EXTERNAL_TYPE,
|
NdefRecord.TNF_EXTERNAL_TYPE,
|
||||||
"org.electrum-zcash:externalType",
|
"cash.z.electrum:externalType",
|
||||||
'',
|
'',
|
||||||
data)
|
data)
|
||||||
return extRecord
|
return extRecord
|
||||||
|
@ -213,7 +213,7 @@ class ScannerAndroid(NFCBase):
|
||||||
# Create record
|
# Create record
|
||||||
ndef_record = NdefRecord(
|
ndef_record = NdefRecord(
|
||||||
NdefRecord.TNF_MIME_MEDIA,
|
NdefRecord.TNF_MIME_MEDIA,
|
||||||
'org.electrum-zcash.kivy', '', data)
|
'cash.z.electrum.kivy', '', data)
|
||||||
|
|
||||||
# Create message
|
# Create message
|
||||||
ndef_message = NdefMessage([ndef_record])
|
ndef_message = NdefMessage([ndef_record])
|
||||||
|
|
|
@ -7,7 +7,7 @@ title = Electrum-Zcash
|
||||||
package.name = Electrum-Zcash
|
package.name = Electrum-Zcash
|
||||||
|
|
||||||
# (str) Package domain (needed for android/ios packaging)
|
# (str) Package domain (needed for android/ios packaging)
|
||||||
package.domain = org.electrum-zcash
|
package.domain = cash.z.electrum
|
||||||
|
|
||||||
# (str) Source code where the main.py live
|
# (str) Source code where the main.py live
|
||||||
source.dir = .
|
source.dir = .
|
||||||
|
|
|
@ -26,10 +26,10 @@ Popup:
|
||||||
size_hint_x: 0.4
|
size_hint_x: 0.4
|
||||||
TopLabel:
|
TopLabel:
|
||||||
markup: True
|
markup: True
|
||||||
text: '[color=6666ff][ref=x]https://electrum-zcash.org[/ref][/color]'
|
text: '[color=6666ff][ref=x]https://electrum.z.cash[/ref][/color]'
|
||||||
on_ref_press:
|
on_ref_press:
|
||||||
import webbrowser
|
import webbrowser
|
||||||
webbrowser.open("https://electrum-zcash.org")
|
webbrowser.open("https://electrum.z.cash")
|
||||||
size_hint_x: 0.6
|
size_hint_x: 0.6
|
||||||
TopLabel:
|
TopLabel:
|
||||||
text: _('Developers')
|
text: _('Developers')
|
||||||
|
|
|
@ -750,10 +750,10 @@ config_variables = {
|
||||||
'requests_dir': 'directory where a bip70 file will be written.',
|
'requests_dir': 'directory where a bip70 file will be written.',
|
||||||
'ssl_privkey': 'Path to your SSL private key, needed to sign the request.',
|
'ssl_privkey': 'Path to your SSL private key, needed to sign the request.',
|
||||||
'ssl_chain': 'Chain of SSL certificates, needed for signed requests. Put your certificate at the top and the root CA at the end',
|
'ssl_chain': 'Chain of SSL certificates, needed for signed requests. Put your certificate at the top and the root CA at the end',
|
||||||
'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of zcash: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.org/\')\"',
|
'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of zcash: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.z.cash/\')\"',
|
||||||
},
|
},
|
||||||
'listrequests':{
|
'listrequests':{
|
||||||
'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of zcash: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.org/\')\"',
|
'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of zcash: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.z.cash/\')\"',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -313,7 +313,7 @@ def android_data_dir():
|
||||||
return PythonActivity.mActivity.getFilesDir().getPath() + '/data'
|
return PythonActivity.mActivity.getFilesDir().getPath() + '/data'
|
||||||
|
|
||||||
def android_headers_dir():
|
def android_headers_dir():
|
||||||
d = android_ext_dir() + '/org.electrum-zcash.electrum-zcash'
|
d = android_ext_dir() + '/cash.z.electrum.electrum_zcash'
|
||||||
if not os.path.exists(d):
|
if not os.path.exists(d):
|
||||||
os.mkdir(d)
|
os.mkdir(d)
|
||||||
return d
|
return d
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -84,6 +84,6 @@ setup(
|
||||||
author="Thomas Voegtlin",
|
author="Thomas Voegtlin",
|
||||||
author_email="thomasv@electrum.org",
|
author_email="thomasv@electrum.org",
|
||||||
license="MIT License",
|
license="MIT License",
|
||||||
url="https://electrum-zcash.org",
|
url="https://github.com/zebra-lucky/electrum-zcash",
|
||||||
long_description="""Lightweight Zcash Wallet"""
|
long_description="""Lightweight Zcash Wallet"""
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue