Changeset 320 for trunk/sandbox/jhb/mobile/ocwallet.py

Timestamp:

05/28/09 14:30:52 (3 years ago)

Author:

ocjhb

Message:

dont remember all I did

Files:

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

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -1 +1 @@
 import appuifw,e32,os,sys
+
+def error_catched(f):
+    def error_handled(*args,**kwargs):
+        try:
+            f(*args,**kwargs)
+        except:
+            appuifw.note(u'cought error','error') 
+    return error_handled        
+
 
 class WalletClient:
@@ -131 +140 @@
         url = appuifw.query(u'url','text',u'http://baach.de:9090')
         self.todo['url'] = url
-        transport = self.getHTTPTransport(url) 
+        transport = self.getHTTPTransport(url)
+        if not transport:
+            self.displayActionMenu()
+            return
         self.wallet.addCurrency(transport)
         self.displayWalletMenu()
@@ -160 +172 @@
 
         transport = self.getHTTPTransport(url)
+        if not transport:
+            self.displayActionMenu()
+            return
+ 
         self.wallet.mintCoins(transport,amount,target)
         coinsound.play() 
@@ -178 +194 @@
 
         transport = self.getHTTPTransport(url)
+        if not transport:
+            self.displayActionMenu()
+            return
+ 
         self.wallet.redeemCoins(transport,amount,target)
         self.displayWalletMenu()
@@ -185 +205 @@
         cdd,alreadythere = self.getCurrentCurrency()
         transport = self.getHTTPTransport(cdd.issuerServiceLocation)
+        if not transport:
+            self.displayActionMenu()
+            return
+ 
         self.wallet.freshenUp(transport,cdd)
-        coinsound.play() 
+        #coinsound.play() 
         self.displayWalletMenu()
 
@@ -197 +221 @@
         if method ==0:
             transport = self.getHTTPTransport(cdd.issuerServiceLocation)
+            if not transport:
+                self.displayActionMenu()
+                return
+ 
             self.receiveCoinsBT(transport)
+ 
         else:
             transport = self.getHTTPTransport(cdd.issuerServiceLocation)
+            if not transport:
+                self.displayActionMenu()
+                return
+ 
             self.receiveCoinsHTTP(transport,walletport)
 
@@ -208 +241 @@
 
     def getHTTPTransport(self,url):
-        self.startInternet()
+        if not self.startInternet():
+            return 
         transport = transports.HTTPTransport(url)
         return transport
@@ -255 +289 @@
                     answer = self.wallet.listenSum(message)
                 if message.header == 'SpendRequest':
-                    answer = self.wallet.listenSpend(message,transport)
+                    answer = self.wallet.listenSpend(transport,message)
                 self.send_response(200)
                 self.send_header("Content-type", "text/plain")
@@ -265 +299 @@
 
         OCHandler.wallet = self.wallet
-        self.startInternet()
+        if not self.startInternet():
+            return
         
         self.httpd = StoppableHTTPServer(("",port),OCHandler)
@@ -380 +415 @@
                 url = 'http://%s:%s' % (url,walletport)
             transport = self.getHTTPTransport(url)
+            if not transport:
+                self.displayActionMenu()
+                return
             self.wallet.spendCoins(transport,cdd.currencyId,amount,target)
         else:
@@ -413 +451 @@
                 aps.sort()
                 apid = appuifw.popup_menu(aps,u'select access point')
+                if apid == None:
+                    return None
                 self.feedback(u'Preparing internet access:setting access point')
 
@@ -426 +466 @@
             s.connect(('www.google.com',80))
             self.ip = s.getsockname()[0]
-
+        return True
     
 
@@ -515 +555 @@
 #Try to use a password on the data file. Repeat till its sucessfully loaded
 password = ''
-while 1:
+while 0: #don't use the password protected storage, too slow atm.
     password = appuifw.query(u'password','text')
 
@@ -530 +570 @@
         appuifw.note(u'wrong password','error')
         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.restore()    
+
+
+
+
+
 
 #Load the rest of the libs