honeynet · Oct 27, 2023
Showing with 22 additions and 11 deletions.

+1 −1 droidbot/adapter/logcat.py

+4 −1 droidbot/app.py

+15 −7 droidbot/device.py

+2 −2 droidbot/input_event.py
diff --git a/droidbot/adapter/logcat.py b/droidbot/adapter/logcat.py
@@ -63,7 +63,7 @@ def handle_output(self):
                 continue
             line = self.process.stdout.readline()
             if not isinstance(line, str):
-                line = line.decode()
+                line = line.decode(errors='ignore')
             self.recent_lines.append(line)
             self.parse_line(line)
             if f is not None:

diff --git a/droidbot/app.py b/droidbot/app.py
@@ -28,7 +28,10 @@ def __init__(self, app_path, output_dir=None):
         from androguard.core.bytecodes.apk import APK
         self.apk = APK(self.app_path)
         self.package_name = self.apk.get_package()
-        self.main_activity = self.apk.get_main_activity()
+        main_activities = self.apk.get_main_activities()
+        if 'leakcanary.internal.activity.LeakLauncherActivity' in main_activities:
+            main_activities.remove('leakcanary.internal.activity.LeakLauncherActivity')
+        self.main_activity = sorted(main_activities)[0]
         self.permissions = self.apk.get_permissions()
         self.activities = self.apk.get_activities()
         self.possible_broadcasts = self.get_possible_broadcasts()

diff --git a/droidbot/device.py b/droidbot/device.py
@@ -184,7 +184,7 @@ def disconnect(self):
             temp_dir = os.path.join(self.output_dir, "temp")
             if os.path.exists(temp_dir):
                 import shutil
-                shutil.rmtree(temp_dir)
+                shutil.rmtree(temp_dir, ignore_errors=True)
 
     def tear_down(self):
         for adapter in self.adapters:
@@ -802,7 +802,7 @@ def take_screenshot(self):
             remote_image_path = "/sdcard/screen_%s.png" % tag
             self.adb.shell("screencap -p %s" % remote_image_path)
             self.pull_file(remote_image_path, local_image_path)
-            self.adb.shell("rm %s" % remote_image_path)
+            self.adb.shell("rm -f %s" % remote_image_path)
 
         return local_image_path
 
@@ -812,6 +812,9 @@ def get_current_state(self):
         try:
             views = self.get_views()
             foreground_activity = self.get_top_activity_name()
+            if foreground_activity is None: # hotfix
+                foreground_activity = "none.package.name/none.activity.name"
+
             activity_stack = self.get_current_activity_stack()
             background_services = self.get_service_names()
             screenshot_path = self.take_screenshot()
@@ -881,11 +884,16 @@ def get_views(self):
             else:
                 self.logger.warning("Failed to get views using OpenCV.")
         if self.droidbot_app and self.adapters[self.droidbot_app]:
-            views = self.droidbot_app.get_views()
-            if views:
-                return views
-            else:
-                self.logger.warning("Failed to get views using Accessibility.")
+            max_tries = 10
+            tries = 0
+            while tries < max_tries:
+                views = self.droidbot_app.get_views()
+                if views:
+                    return views
+                else:
+                    self.logger.warning("Failed to get views using Accessibility. Retrying...")
+                    tries += 1
+                    time.sleep(0.2)
 
         self.logger.warning("failed to get current views!")
         return None

diff --git a/droidbot/input_event.py b/droidbot/input_event.py
@@ -683,8 +683,8 @@ def __init__(self, x=None, y=None, view=None, text=None, event_dict=None):
 
     def send(self, device):
         x, y = UIEvent.get_xy(x=self.x, y=self.y, view=self.view)
-        touch_event = TouchEvent(x=x, y=y)
-        touch_event.send(device)
+        device.view_long_touch(x=x, y=y, duration=200)
+        device.view_touch(x=x, y=y)
         device.view_set_text(self.text)
         return True