tupdates for android - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ddef165e18295af558b5a1777afe0c286b78f943
DIR parent ee6b718ea48efd9135727586ff0f8bc7aaa7c468
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 9 Jun 2015 23:18:32 +0200
updates for android
Diffstat:
M contrib/make_android | 4 +---
M contrib/make_download | 7 +++----
M electrum | 4 ++--
3 files changed, 6 insertions(+), 9 deletions(-)
---
DIR diff --git a/contrib/make_android b/contrib/make_android
t@@ -34,7 +34,5 @@ if __name__ == '__main__':
# change filename because some 3G carriers do not allow users to download a zip file...
e4a_name = "e4a-%s.zip"%version
- e4a_name2 = e4a_name.replace(".","")
- os.system("mv %s %s"%(e4a_name, e4a_name2))
- print "dist/%s"%e4a_name2
+ print "dist/%s"%e4a_name
DIR diff --git a/contrib/make_download b/contrib/make_download
t@@ -55,10 +55,9 @@ from versions import android_template, android_page
with open(android_template) as f:
string = f.read()
-e4a_name = "e4a-%s.zip"%version
-e4a_zipname = e4a_name.replace(".","")
-string = string.replace("##VERSION##",version)
-string = string.replace("##ZIPNAME##",e4a_zipname)
+e4a_zipname = "e4a-%s.zip"%version
+string = string.replace("##VERSION##", version)
+string = string.replace("##ZIPNAME##", e4a_zipname)
with open(android_page,'w') as f:
f.write(string)
DIR diff --git a/electrum b/electrum
t@@ -370,7 +370,6 @@ if __name__ == '__main__':
# config is an object passed to the various constructors (wallet, interface, gui)
if is_android:
config_options = {
- 'portable': True,
'verbose': True,
'gui': 'android',
'auto_connect': True,
t@@ -398,7 +397,8 @@ if __name__ == '__main__':
gui_name = config.get('gui', 'qt') if args.cmd == 'gui' else 'cmdline'
# initialize plugins.
- init_plugins(config, is_bundle or is_local or is_android, gui_name)
+ if not is_android:
+ init_plugins(config, is_bundle or is_local or is_android, gui_name)
# call function attached to parser
args.func(config)