merge

2012-04-29 18:43:11 +02:00 · 2012-04-29 18:43:11 +02:00 · fc288a67cb
parent 26b19ad6bb 2df4d6de5a
commit fc288a67cb
3 changed files with 61 additions and 34 deletions
--- a/client/ANDROID
+++ b/client/ANDROID
@ -1,33 +0,0 @@
-INSTALLATION INSTRUCTIONS FOR ANDROID
-
-
-1. Install sl4a and py4a : you will need at least revision r5x12 of sl4a
-
-To install these APKs, just visit the links below with your phone and
-click on the apk link, or scan the qr code
-
-sl4a: http://code.google.com/p/android-scripting/wiki/Unofficial
-py4a: http://code.google.com/p/python-for-android/downloads/detail?name=PythonForAndroid_r5.apk
-
-
-
-2. copy the following files in /sdcard/sl4a/scripts:
-
-bmp.py
-electrum4a.py
-interface.py
-mnemonic.py
-msqr.py
-pyqrnative.py
-ripemd.py
-version.py
-wallet.py
-aes (directory)
-ecdsa (directory)
-
-Note: The aes and ecdsa directories are not included in the git
-repository.  You will have to find them on your system, or you can
-find them in the distributed version, Electrum tar.gz or Electrum.zip
-
-
-3. to run the application, open sl4a and click on electrum4a.py
--- a/client/docs/android.html
+++ b/client/docs/android.html
@ -0,0 +1,60 @@
+<html>
+<body>
+<div style="width:35em;margin-left:5em;">
+<h2>Electrum for Android</h2>
+
+This page explains how to install Electrum on Android devices.<br/><br/> 
+
+Please note that Electrum is not distributed as a binary package, but
+as python source code; this gives users the possibility to see what
+the code is doing, and to check that it does not contain malware. The
+downside is that installation is slightly more complicated than
+downloading an app on the Android market, but it remains very
+simple. <br/><br/>
+
+It is possible to print this page on paper and to install everything from
+QR codes.  If you encounter problems, you may find help at
+<a href="http://maketecheasier.com/install-applications-without-the-market/2011/01/28">
+this link</a>.
+
+
+<h3>1. Download and install Google Scripting Layer for Android</h3>
+
+You can get
+it <a href="http://code.google.com/p/android-scripting/wiki/Unofficial">here</a>,
+or by scanning the following qr code: <br/>
+<img src="http://chart.apis.google.com/chart?cht=qr&chs=150x150&chld=L&choe=UTF-8&chl=http%3A%2F%2Fwww.mithril.com.au%2Fandroid%2Fsl4a_r5x.apk"
+/>
+
+
+<h3>2. Download and install Python for Android</h3>
+
+You can get
+it <a href="http://code.google.com/p/python-for-android/downloads/detail?name=PythonForAndroid_r5.apk">here</a>,
+or by scanning the following qr code: <br/>
+<img src="http://chart.apis.google.com/chart?cht=qr&chs=200x200&chld=L&choe=UTF-8&chl=http%3A%2F%2Fpython-for-android.googlecode.com%2Ffiles%2FPythonForAndroid_r5.apk"/>
+<br/>
+Once you have installed the apk, launch the Python for Android application and click 'install'
+
+<h3>3. Download the Electrum install script</h3>
+
+Download <a href="e4a_install.py">e4a_install.py</a> and install it in your sl4a/scripts directory.
+You can do it manually, or from QR code, as follows:
+<pre>
+1. Launch SL4A.
+2. Press the Menu button.
+3. Tap Add.
+4. Tap Scan Barcode.
+5. Scan the following QRcode:
+</pre>
+<img src="http://chart.apis.google.com/chart?cht=qr&chs=300x300&chld=L&choe=UTF-8&chl=e4a_install.py%0Aimport+urllib%2C+zipfile%2C+os%0Ap%3D%22http%3A%2F%2Fecdsa.org%2Felectrum%2Fe4a%22%0An%3D%22Electrum-0.43d%22%0Anz%3Dn%2B%22.zip%22%0Aurllib.urlretrieve(p%2Cnz)%0Azipfile.ZipFile(nz).extractall()%0Aos.rename(n%2C'scripts%2F'%2Bn)"
+/>
+<pre>This will install a script named e4a_install.py</pre>
+
+<h3>4. Download and install Electrum</h3>
+<pre>
+1. Tap e4a_install.py: it will download and install a directory named "Electrum-0.43d"
+2. To launch Electrum, visit the "Electrum-0.43d" directory and tap 'electrum4a.py'
+</pre>
+</body>
+</html>
--- a/client/mnemonic.py
+++ b/client/mnemonic.py
@ -1675,7 +1675,7 @@ def mn_decode( wlist ):
        w2 = (words.index(word2))%n
        w3 = (words.index(word3))%n
        x = w1 +n*((w2-w1)%n) +n*n*((w3-w2)%n)
-        out += '%x'%x
+        out += '%08x'%x
    return out