Merge pull request #939 from doronz88/bugfix/dvt-oslog

Bugfix/dvt oslog
doronz88 · Apr 15, 2024 · 6d2275c · 6d2275c
2 parents b43c199 + 255889f
commit 6d2275c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/pymobiledevice3/exceptions.py b/pymobiledevice3/exceptions.py
@@ -2,18 +2,18 @@
  'PyMobileDevice3Exception', 'DeviceVersionNotSupportedError', 'IncorrectModeError',
  'NotTrustedError', 'PairingError', 'NotPairedError', 'CannotStopSessionError',
  'PasswordRequiredError', 'StartServiceError', 'FatalPairingError', 'NoDeviceConnectedError', 'DeviceNotFoundError',
- 'TunneldConnectionError', 'ConnectionFailedToUsbmuxdError', 'MuxException',
+ 'TunneldConnectionError', 'ConnectionFailedToUsbmuxdError', 'MuxException', 'InvalidConnectionError',
  'MuxVersionError', 'ArgumentError', 'AfcException', 'AfcFileNotFoundError', 'DvtException', 'DvtDirListError',
  'NotMountedError', 'AlreadyMountedError', 'UnsupportedCommandError', 'ExtractingStackshotError',
  'ConnectionTerminatedError', 'WirError', 'WebInspectorNotEnabledError', 'RemoteAutomationNotEnabledError',
  'ArbitrationError', 'InternalError', 'DeveloperModeIsNotEnabledError', 'DeviceAlreadyInUseError', 'LockdownError',
  'PairingDialogResponsePendingError', 'UserDeniedPairingError', 'InvalidHostIDError', 'SetProhibitedError',
  'MissingValueError', 'PasscodeRequiredError', 'AmfiError', 'DeviceHasPasscodeSetError', 'NotificationTimeoutError',
- 'DeveloperModeError', 'ProfileError', 'IRecvError', 'IRecvNoDeviceConnectedError',
+ 'DeveloperModeError', 'ProfileError', 'IRecvError', 'IRecvNoDeviceConnectedError', 'UnrecognizedSelectorError',
  'NoDeviceSelectedError', 'MessageNotSupportedError', 'InvalidServiceError', 'InspectorEvaluateError',
  'LaunchingApplicationError', 'BadCommandError', 'BadDevError', 'ConnectionFailedError', 'CoreDeviceError',
  'AccessDeniedError', 'RSDRequiredError', 'SysdiagnoseTimeoutError', 'GetProhibitedError',
- 'FeatureNotSupportedError', 'OSNotSupportedError'
+ 'FeatureNotSupportedError', 'OSNotSupportedError', 'DeprecationError', 'NotEnoughDiskSpaceError'
 ]
 
 from typing import List, Optional

diff --git a/pymobiledevice3/lockdown.py b/pymobiledevice3/lockdown.py
@@ -766,7 +766,7 @@ def create_using_remote(service: ServiceConnection, identifier: str = None, labe
  """
  Create a TcpLockdownClient instance over RSD
 
- :param hostname: The target device hostname
+ :param service: service connection to use
  :param identifier: Used as an identifier to look for the device pair record
  :param label: lockdownd user-agent
  :param autopair: Attempt to pair with device (blocking) if not already paired

diff --git a/pymobiledevice3/services/accessibilityaudit.py b/pymobiledevice3/services/accessibilityaudit.py
@@ -11,7 +11,7 @@
 
 
 class SerializedObject:
- def __init__(self, fields: typing.Mapping):
+ def __init__(self, fields: typing.MutableMapping):
  self._fields = fields
 
 

diff --git a/pymobiledevice3/services/dvt/instruments/activity_trace_tap.py b/pymobiledevice3/services/dvt/instruments/activity_trace_tap.py
@@ -41,7 +41,7 @@ def ignored_null(s: bytes) -> bytes:
 def decode_message_format(message) -> str:
  s = ''
  for type_, data in message:
- if data:
+ if data and isinstance(data, bytes):
  data = ignored_null(data)
  type_ = decode_str(type_)
 
@@ -53,6 +53,8 @@ def decode_message_format(message) -> str:
  s += '<None>'
  else:
  s += data.decode()
+ elif type_ == 'private':
+ s += '<private>'
  elif type_.startswith('uint64'):
  uint64 = struct.unpack('<Q', data.ljust(8, b'\x00'))[0]
  if 'hex' in type_: