Crunchy-DL
/
KeyDive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26 from Nineteen93/patch-1 

Update core.py
This commit is contained in:
hyugogirubato 2024-07-22 22:22:25 +02:00 committed by GitHub
parent 8876780457 abd14e074f
commit d5032db783
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
keydive/core.py
View File

@ -151,12 +151,11 @@ class Core:
# https://github.com/frida/frida/issues/1225#issuecomment-604181822 # https://github.com/frida/frida/issues/1225#issuecomment-604181822
prompt = ['adb', '-s', str(self.device.id), 'shell', 'ps'] prompt = ['adb', '-s', str(self.device.id), 'shell', 'ps']
sp = subprocess.run([*prompt, '-A'], capture_output=True) lines = subprocess.run([*prompt, '-A'], capture_output=True).stdout.decode('utf-8').strip().splitlines()
if sp.returncode != 0: if len(lines) <= 1:
sp = subprocess.run(prompt, capture_output=True) lines = subprocess.run(prompt, capture_output=True).stdout.decode('utf-8').strip().splitlines()
# Iterate through lines starting from the second line (skipping header) # Iterate through lines starting from the second line (skipping header)
for line in sp.stdout.decode('utf-8').splitlines()[1:]: for line in lines[1:]:
try: try:
line = line.split() # USER,PID,PPID,VSZ,RSS,WCHAN,ADDR,S,NAME line = line.split() # USER,PID,PPID,VSZ,RSS,WCHAN,ADDR,S,NAME
name = ' '.join(line[8:]).strip() name = ' '.join(line[8:]).strip()