Release v1.0.6

- add busybox env
- fix user
- add sudo
- update man
- frida in dev

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.6] - 2024-04-26
+
+### Added
+
+- Added `mksrc` script to manually improve Android shell interaction.
+- Added `editor` script for a text editor within the Android shell.
+
+### Changed
+
+- Removed example from the XML functions to prevent misunderstandings.
+- Enhanced the Android shell functionality.
+
+### Fixed
+
+- Fixed encoding issues with ADB commands, addressing issue [#3](https://github.com/hyugogirubato/KeyDive/issues/3).
+
 ## [1.0.5] - 2024-04-08
 
 ### Added
@@ -78,6 +94,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial release of the project, laying the foundation for future enhancements and features.
 
+[1.0.6]: https://github.com/hyugogirubato/KeyDive/releases/tag/v1.0.6
 [1.0.5]: https://github.com/hyugogirubato/KeyDive/releases/tag/v1.0.5
 [1.0.4]: https://github.com/hyugogirubato/KeyDive/releases/tag/v1.0.4
 [1.0.3]: https://github.com/hyugogirubato/KeyDive/releases/tag/v1.0.3

docs/shell.sh

@@ -1,19 +0,0 @@
-
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias egrep='egrep --color=auto'
-alias logcat='logcat -v color'
-
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-alias ipa='ip -c a'
-alias rm='rm -rf'
-
-tree() {
-  path=${1:-.}
-  find ${path} -print | sort | sed 's;[^/]*/;|---;g;s;---|; |;g'
-}
-
-clear

extractor/cdm.py

@@ -63,7 +63,8 @@ class Cdm:
         """
         # https://source.android.com/docs/core/architecture/configuration/add-system-properties?#shell-commands
         properties = {}
-        for line in subprocess.getoutput(f'adb -s "{self.device.id}" shell getprop').splitlines():
+        sp = subprocess.run(f'adb -s "{self.device.id}" shell getprop', capture_output=True)
+        for line in sp.stdout.decode('utf-8').splitlines():
             match = re.match(r'\[(.*?)\]: \[(.*?)\]', line)
             if match:
                 key, value = match.groups()
@@ -135,7 +136,8 @@ class Cdm:
         # https://github.com/frida/frida/issues/1225#issuecomment-604181822
         # Iterate through lines starting from the second line (skipping header)
         processes = {}
-        for line in subprocess.getoutput(f'adb -s "{self.device.id}" shell ps').splitlines()[1:]:
+        sp = subprocess.run(f'adb -s "{self.device.id}" shell ps', capture_output=True)
+        for line in sp.stdout.decode('utf-8').splitlines()[1:]:
             try:
                 line = line.split()  # USER,PID,PPID,VSZ,RSS,WCHAN,ADDR,S,NAME
                 name = ' '.join(line[8:]).strip()

keydive.py

@@ -29,8 +29,8 @@ if __name__ == '__main__':
         logger.info('Version: %s', extractor.__version__)
 
         # Ensure the ADB server is running
-        exitcode, _ = subprocess.getstatusoutput('adb start-server')
-        if exitcode != 0:
+        sp = subprocess.run('adb start-server', capture_output=True)
+        if sp.returncode != 0:
             raise EnvironmentError('ADB is not recognized as an environment variable, see https://github.com/hyugogirubato/KeyDive/blob/main/docs/PACKAGE.md#adb-android-debug-bridge')
 
         # Initialize the CDM handler with the specified or default device