Changeset 321 for trunk

Timestamp:

05/31/09 13:13:02 (3 years ago)

Author:

ocjhb

Message:

coin transfer working again

Files:

• trunk/sandbox/jhb/mobile/ocwallet.py (modified) (4 diffs)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -387 +387 @@
         bt.send(self.wallet.listenSum(bt.receive()))
         self.feedback(u'Receive coins: receiving...')
-        bt.send(self.wallet.listenSpend(bt.receive(),transport))
+        bt.send(self.wallet.listenSpend(transport,bt.receive()))
         import e32
         e32.ao_sleep(1)    
@@ -555 +555 @@
 #Try to use a password on the data file. Repeat till its sucessfully loaded
 password = ''
+wbpath = storagepath+'wallet.bin'
+
 while 0: #don't use the password protected storage, too slow atm.
     password = appuifw.query(u'password','text')
@@ -563 +565 @@
     storage = oc2storage.CryptedStorage()
     storage.setPassword(password)
-    storage.setFilename(storagepath+'wallet.bin')
+    storage.setFilename(wbpath)
     try:
         storage.restore()
@@ -571 +573 @@
         pass
 storage = oc2storage.Storage()
-storage.setFilename(storagepath+'wallet.bin')
-tmp = open(storagepath+'wallet.bin')
-tmpcontent = tmp.read()
-tmp.close()
-if tmpcontent.startswith('salt'):
-    os.remove(storagepath+'wallet.bin')
+storage.setFilename(wbpath)
+if os.path.exists(wbpath):
+    tmp = open(wbpath)
+    tmpcontent = tmp.read()
+    tmp.close()
+    if tmpcontent.startswith('salt'):
+        os.remove(wbpath)
 storage.restore()