AaronFiore/electrum
1
0
Fork 0
Code Activity

changes for new toolchain

Browse Source
This commit is contained in:
ThomasV
2016-06-16 09:48:30 +02:00
parent 07c5f02639
commit 67780bb8b9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/kivy/main_window.py
View File

@@ -358,7 +358,7 @@ class ElectrumWindow(App):
sendIntent.setAction(Intent.ACTION_SEND) sendIntent.setAction(Intent.ACTION_SEND)
sendIntent.setType("text/plain") sendIntent.setType("text/plain")
sendIntent.putExtra(Intent.EXTRA_TEXT, JS(data)) sendIntent.putExtra(Intent.EXTRA_TEXT, JS(data))
PythonActivity = autoclass('org.renpy.android.PythonActivity') PythonActivity = autoclass('org.kivy.android.PythonActivity')
currentActivity = cast('android.app.Activity', PythonActivity.mActivity) currentActivity = cast('android.app.Activity', PythonActivity.mActivity)
it = Intent.createChooser(sendIntent, cast('java.lang.CharSequence', JS(title))) it = Intent.createChooser(sendIntent, cast('java.lang.CharSequence', JS(title)))
currentActivity.startActivity(it) currentActivity.startActivity(it)

9
lib/bitcoin.py
View File

@@ -26,6 +26,7 @@
import hashlib import hashlib
import base64 import base64
import os
import re import re
import hmac import hmac
@@ -208,9 +209,11 @@ def i2o_ECPublicKey(pubkey, compressed=False):
############ functions from pywallet ##################### ############ functions from pywallet #####################
def hash_160(public_key): def hash_160(public_key):
#md = hashlib.new('ripemd') if 'ANDROID_DATA' in os.environ:
from Crypto.Hash import RIPEMD from Crypto.Hash import RIPEMD
md = RIPEMD.new() md = RIPEMD.new()
else:
md = hashlib.new('ripemd')
md.update(sha256(public_key)) md.update(sha256(public_key))
return md.digest() return md.digest()