AndroidFridaManager 1.8.2__py3-none-any.whl → 1.8.3__py3-none-any.whl

AndroidFridaManager/FridaManager.py

@@ -91,22 +91,50 @@ class FridaManager():
         else:
             command = "adb shell su 0 "+ cmd 
 
-        subprocess.Popen(command, shell=True)
+        try:
+            process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            # Give it a moment to start and potentially fail
+            import time
+            time.sleep(1)
+            
+            # Check if process failed immediately
+            if process.poll() is not None:
+                stdout, stderr = process.communicate()
+                if "Address already in use" in stderr.decode():
+                    print("[*] frida-server is already running on the device")
+                    return
+                else:
+                    self.logger.error(f"Failed to start frida-server: {stderr.decode()}")
+                    raise RuntimeError(f"Failed to start frida-server: {stderr.decode()}")
+        except Exception as e:
+            self.logger.error(f"Error starting frida-server: {e}")
+            raise
 
 
     def is_frida_server_running(self):
         """
         Checks if on the connected device a frida server is running. 
-        The test is done by the Android system command pidof and is looking for the string frida-server.
+        The test is done by trying multiple methods to detect the frida-server process.
 
         :return: True if a frida-server is running otherwise False.
         :rtype: bool
         """
-        result = self.run_adb_command_as_root("/system/bin/pidof frida-server")
-        if len(result.stdout) > 1:
+        # Try pidof first (most reliable if available)
+        result = self.run_adb_command_as_root("pidof frida-server")
+        if result.stdout.strip():
             return True
-        else:
-            return False
+            
+        # Fallback to ps grep if pidof doesn't work
+        result = self.run_adb_command_as_root("ps | grep frida-server | grep -v grep")
+        if result.stdout.strip():
+            return True
+            
+        # Try alternative ps command format
+        result = self.run_adb_command_as_root("ps -A | grep frida-server | grep -v grep")
+        if result.stdout.strip():
+            return True
+            
+        return False
 
 
     def stop_frida_server(self):

AndroidFridaManager/about.py

@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 
 __author__ = "Daniel Baier"
-__version__ = "1.8.2"
+__version__ = "1.8.3"

{androidfridamanager-1.8.2.dist-info → androidfridamanager-1.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AndroidFridaManager
-Version: 1.8.2
+Version: 1.8.3
 Summary: A python API in order to install and run the frida-server on an Android device.
 Home-page: https://github.com/fkie-cad/AndroidFridaManager
 Author: Daniel Baier
@@ -33,7 +33,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-[![PyPI version](https://badge.fury.io/py/AndroidFridaManager.svg)](https://badge.fury.io/py/AndroidFridaManager)
+![version](https://img.shields.io/badge/version-1.8.3-blue) [![PyPI version](https://badge.fury.io/py/AndroidFridaManager.svg)](https://badge.fury.io/py/AndroidFridaManager) [![Publish status](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/fkie-cad/AndroidFridaManager/actions/workflows/publish-to-pypi.yml)
 
 # AndroidFridaManager
 

androidfridamanager-1.8.3.dist-info/RECORD

@@ -0,0 +1,11 @@
+AndroidFridaManager/FridaManager.py,sha256=kaOua90QoYCZYjE-PLv2jKNbjGsR049iSdguzpS7IOo,15108
+AndroidFridaManager/__init__.py,sha256=T6AKtrGSLQ9M5bJoWDQcsRTJbSEbksdgrx3AAAdozRI,171
+AndroidFridaManager/about.py,sha256=9PIAKC-I68GSVhurcOpqSExKNmRXqkqGHjeJ0eQtdIg,98
+AndroidFridaManager/job.py,sha256=QTSNjdV7XqawSTV19HQt53aiwoT3UaQeQw2K4AWPxY8,3265
+AndroidFridaManager/job_manager.py,sha256=icdNlfqorEM3XVw4h_83IcoupEFDlkzb29VhEZ6dxrQ,12294
+androidfridamanager-1.8.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+androidfridamanager-1.8.3.dist-info/METADATA,sha256=Juumzl4unTLH2Ee6M0ByzYEDGq7kWCES3YijRSt2htM,5141
+androidfridamanager-1.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+androidfridamanager-1.8.3.dist-info/entry_points.txt,sha256=GmNngu2fDNCxUcquFRegBa7GWknPKG1jsM4lvWeyKnY,64
+androidfridamanager-1.8.3.dist-info/top_level.txt,sha256=oH2lVMSRlghmt-_tVrOEUqvY462P9hd5Ktgp5-1qF3o,20
+androidfridamanager-1.8.3.dist-info/RECORD,,

androidfridamanager-1.8.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-AndroidFridaManager/FridaManager.py,sha256=tuDTZQ9maNBkobw2-qJtWPM3bhUQZH7eKPXG5XAKPks,13837
-AndroidFridaManager/__init__.py,sha256=T6AKtrGSLQ9M5bJoWDQcsRTJbSEbksdgrx3AAAdozRI,171
-AndroidFridaManager/about.py,sha256=z1dlTh519qWYEK_J_iuyx6_2eEzRI_pdKsVpVgi_DLA,98
-AndroidFridaManager/job.py,sha256=QTSNjdV7XqawSTV19HQt53aiwoT3UaQeQw2K4AWPxY8,3265
-AndroidFridaManager/job_manager.py,sha256=icdNlfqorEM3XVw4h_83IcoupEFDlkzb29VhEZ6dxrQ,12294
-androidfridamanager-1.8.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-androidfridamanager-1.8.2.dist-info/METADATA,sha256=serVQrmt0u7xH5F8wYqBQ1NOMMRqT4g_cvn5vnxT8mc,4886
-androidfridamanager-1.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-androidfridamanager-1.8.2.dist-info/entry_points.txt,sha256=GmNngu2fDNCxUcquFRegBa7GWknPKG1jsM4lvWeyKnY,64
-androidfridamanager-1.8.2.dist-info/top_level.txt,sha256=oH2lVMSRlghmt-_tVrOEUqvY462P9hd5Ktgp5-1qF3o,20
-androidfridamanager-1.8.2.dist-info/RECORD,,