Improved UTF-8 treatment in messages

dtmilano · dtmilano · commit ad4c33ea60ea · 2013-09-29T22:01:16.000-04:00
- Version 4.4.2
diff --git a/AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py b/AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py
@@ -17,7 +17,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '4.4.1'
+__version__ = '4.4.2'
 
 import sys
 import warnings        
@@ -128,7 +128,8 @@ def __send(self, msg, checkok=True, reconnect=False):
                 self.__setTransport()
         else:
             self.checkConnected()
-        self.socket.send('%04X%s' % (len(msg), msg))
+        b = bytearray(msg, 'utf-8')
+        self.socket.send('%04X%s' % (len(b), b))
         if checkok:
             self.__checkOk()
         if reconnect:
@@ -366,7 +367,7 @@ def drag(self, (x0, y0), (x1, y1), duration, steps):
         self.shell('input swipe %d %d %d %d %d' % (x0, y0, x1, y1, duration*1000))
     
     def type(self, text):
-        self.shell('input text "%s"' % text)
+        self.shell(u'input text "%s"' % text)
         
     def wake(self):
         self.shell('input keyevent 26')
