resolve branch coonflicts.

Author: PixelCode01

core/adb_utils.py

@@ -232,6 +232,8 @@ def run_command(
             cmd,
             capture_output=True,
             text=True,
+            encoding="utf-8",
+            errors="replace",
             timeout=timeout,
             check=False,
         )

core/bloatware_remover.py

@@ -87,9 +87,9 @@ def check_device_connection(self) -> bool:
                 self.logger.error("Failed to query devices: %s", exc)
                 print("\nADB could not communicate with the device.")
                 print("Please make sure Developer options and USB debugging are enabled, then reconnect the cable.")
-                print("   Enable Developer options: Settings  About phone  tap 'Build number' seven times.")
-                print("   Enable USB debugging: Settings  System  Developer options  toggle USB debugging on.")
-                print("  ÔÇó Reconnect the device and accept the USB debugging prompt if shown.")
+                print("   Enable Developer options: Settings  About phone  tap 'Build number' seven times.")
+                print("   Enable USB debugging: Settings  System  Developer options  toggle USB debugging on.")
+                print("   Reconnect the device and accept the USB debugging prompt if shown.")
                 if self._prompt_wifi_connection("Attempt to connect over Wi-Fi ADB instead?"):
                     continue
                 action = self._prompt_connection_retry()
@@ -712,15 +712,15 @@ def _show_device_state_instructions(self, device: DeviceState) -> None:
         state = device.state.lower().strip()
 
         if state == 'unauthorized':
-            print("    ÔÇó Unlock the device and ensure USB debugging is enabled in Developer options.")
-            print("    ÔÇó When prompted, tap 'Allow' to trust this computer for USB debugging.")
+            print("     Unlock the device and ensure USB debugging is enabled in Developer options.")
+            print("     When prompted, tap 'Allow' to trust this computer for USB debugging.")
         elif state == 'offline':
-            print("    ÔÇó Reconnect the USB cable and toggle USB debugging off and on again.")
-            print("    ÔÇó Ensure the device screen stays awake and unlocked.")
+            print("     Reconnect the USB cable and toggle USB debugging off and on again.")
+            print("     Ensure the device screen stays awake and unlocked.")
         elif state == 'recovery':
-            print("    ÔÇó The device is in recovery mode. Boot into Android before running the remover.")
+            print("     The device is in recovery mode. Boot into Android before running the remover.")
         else:
-            print("    ÔÇó Check the USB connection and confirm the device is unlocked with USB debugging enabled.")
+            print("     Check the USB connection and confirm the device is unlocked with USB debugging enabled.")
 
     def _select_device(self, authorized_devices: List[DeviceState]) -> Optional[DeviceState]:
         """Select a device from the authorised list, prompting when needed."""
@@ -927,3 +927,4 @@ def manual_package_removal(self) -> None:
                     return
             else:
                 print("Removal cancelled for the selected apps.")
+

device_detector.py

@@ -1,4 +1,4 @@
-import re
+import re
 from typing import Optional, List
 
 from core.adb_utils import (
@@ -483,4 +483,4 @@ def _connect_via_wifi(self) -> bool:
         self.device_serial = device.serial
         self._last_wifi_endpoint = endpoint
         print(f"Connected to {device.summary()} over Wi-Fi.")
-        return True
+        return True

version.py

@@ -1,6 +1,6 @@
 """Version information for Android Bloatware Remover"""
 
-__version__ = "1.2.0"
+__version__ = "1.3.1"
 __author__ = "PixelCode01"
 __description__ = "Android Bloatware Remover - Remove unwanted pre-installed apps"
 __url__ = "https://github.com/PixelCode01/UIBloatwareRegistry"