- Add a new experimental feature to downgrade without a wipe and pote…

…ntially switch from Beta to Stable without a wipe. Credit to @tbalden for the discovery and @capntrips for the details of the process. - Select any img file and get additional image info. - #190 fix, scrcpy launch improvement. - Improved Menu to disabled advanced features when it's not enabled in the settings. (Previously only other GUI elements were hidden or disabled). - If KernelSU or APatch is installed, report their version as part of device details. - Improved logging. - Improved santization. - Other minor improvements and added stability.
badabing2005 · Apr 14, 2024 · fe34916 · fe34916
1 parent 361aae0
commit fe34916
Show file tree

Hide file tree

Showing 17 changed files with 5,681 additions and 170 deletions.
diff --git a/Main.py b/Main.py
diff --git a/avbtool.py b/avbtool.py
diff --git a/build-on-linux.spec b/build-on-linux.spec
@@ -5,7 +5,7 @@ block_cipher = None
 a = Analysis(['PixelFlasher.py'],
              pathex=[],
              binaries=[('bin/7zzs', 'bin')],
-             datas=[("images/icon-64.png", "images"),("images/icon-dark-64.png", "images"), ('bin/busybox_arm64-v8a', 'bin'), ('bin/busybox_armeabi-v7a', 'bin'), ('bin/busybox_x86', 'bin'), ('bin/busybox_x86_64', 'bin'), ('bin/aapt2_arm64-v8a', 'bin'), ('bin/aapt2_armeabi-v7a', 'bin'), ('bin/aapt2_x86', 'bin'), ('bin/aapt2_x86_64', 'bin'), ('bin/avbctl', 'bin'), ('bin/update_engine_client', 'bin'), ('android_versions.json', '.'), ('android_devices.json', '.')],
+             datas=[("images/icon-64.png", "images"),("images/icon-dark-64.png", "images"), ('bin/busybox_arm64-v8a', 'bin'), ('bin/busybox_armeabi-v7a', 'bin'), ('bin/busybox_x86', 'bin'), ('bin/busybox_x86_64', 'bin'), ('bin/aapt2_arm64-v8a', 'bin'), ('bin/aapt2_armeabi-v7a', 'bin'), ('bin/aapt2_x86', 'bin'), ('bin/aapt2_x86_64', 'bin'), ('bin/avbctl', 'bin'), ('bin/update_engine_client', 'bin'), ('android_versions.json', '.'), ('android_devices.json', '.'), ('testkey_rsa4096.pem', '.')],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],

diff --git a/build-on-mac.spec b/build-on-mac.spec
@@ -4,7 +4,7 @@ block_cipher = None
 
 a = Analysis(['PixelFlasher.py'],
              binaries=[('bin/7zz', 'bin')],
-             datas=[("images/icon-64.png", "images"), ("images/icon-dark-64.png", "images"), ('bin/busybox_arm64-v8a', 'bin'), ('bin/busybox_armeabi-v7a', 'bin'), ('bin/busybox_x86', 'bin'), ('bin/busybox_x86_64', 'bin'), ('bin/aapt2_arm64-v8a', 'bin'), ('bin/aapt2_armeabi-v7a', 'bin'), ('bin/aapt2_x86', 'bin'), ('bin/aapt2_x86_64', 'bin'), ('bin/avbctl', 'bin'), ('bin/update_engine_client', 'bin'), ('android_versions.json', '.'), ('android_devices.json', '.')],
+             datas=[("images/icon-64.png", "images"), ("images/icon-dark-64.png", "images"), ('bin/busybox_arm64-v8a', 'bin'), ('bin/busybox_armeabi-v7a', 'bin'), ('bin/busybox_x86', 'bin'), ('bin/busybox_x86_64', 'bin'), ('bin/aapt2_arm64-v8a', 'bin'), ('bin/aapt2_armeabi-v7a', 'bin'), ('bin/aapt2_x86', 'bin'), ('bin/aapt2_x86_64', 'bin'), ('bin/avbctl', 'bin'), ('bin/update_engine_client', 'bin'), ('android_versions.json', '.'), ('android_devices.json', '.'), ('testkey_rsa4096.pem', '.')],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],
@@ -28,6 +28,6 @@ exe = EXE(pyz,
           icon='images/icon-dark-256.icns')
 app = BUNDLE(exe,
              name='PixelFlasher.app',
-             version='6.9.1.3',
+             version='6.9.2.0',
              icon='./images/icon-dark-256.icns',
              bundle_identifier='com.badabing.pixelflasher')
diff --git a/build-on-win.spec b/build-on-win.spec
@@ -4,7 +4,7 @@ block_cipher = None
 
 a = Analysis(['PixelFlasher.py'],
              binaries=[('bin/7z.exe', 'bin'), ('bin/7z.dll', 'bin')],
-             datas=[("images/icon-64.png", "images"), ("images/icon-dark-64.png", "images"), ('bin/busybox_arm64-v8a', 'bin'), ('bin/busybox_armeabi-v7a', 'bin'), ('bin/busybox_x86', 'bin'), ('bin/busybox_x86_64', 'bin'), ('bin/aapt2_arm64-v8a', 'bin'), ('bin/aapt2_armeabi-v7a', 'bin'), ('bin/aapt2_x86', 'bin'), ('bin/aapt2_x86_64', 'bin'), ('bin/avbctl', 'bin'), ('bin/update_engine_client', 'bin'), ('android_versions.json', '.'), ('android_devices.json', '.')],
+             datas=[("images/icon-64.png", "images"), ("images/icon-dark-64.png", "images"), ('bin/busybox_arm64-v8a', 'bin'), ('bin/busybox_armeabi-v7a', 'bin'), ('bin/busybox_x86', 'bin'), ('bin/busybox_x86_64', 'bin'), ('bin/aapt2_arm64-v8a', 'bin'), ('bin/aapt2_armeabi-v7a', 'bin'), ('bin/aapt2_x86', 'bin'), ('bin/aapt2_x86_64', 'bin'), ('bin/avbctl', 'bin'), ('bin/update_engine_client', 'bin'), ('android_versions.json', '.'), ('android_devices.json', '.'), ('testkey_rsa4096.pem', '.')],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],

diff --git a/build.sh b/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 rm -rf build dist
-VERSION=6.9.1.3
+VERSION=6.9.2.0
 NAME="PixelFlasher"
 DIST_NAME="PixelFlasher"
 

diff --git a/constants.py b/constants.py
@@ -2,7 +2,7 @@
 
 APPNAME = 'PixelFlasher'
 CONFIG_FILE_NAME = 'PixelFlasher.json'
-VERSION = '6.9.1.3'
+VERSION = '6.9.2.0'
 SDKVERSION = '33.0.3'
 MAIN_WIDTH = 1400
 MAIN_HEIGHT = 1040

diff --git a/encode-bitmaps.py b/encode-bitmaps.py
@@ -132,6 +132,7 @@
     "-a -F -i -n kernelsu-24 images/kernelsu-24.png images.py",
     "-a -F -i -n apatch-24 images/apatch-24.png images.py",
     "-a -F -i -n cert-24 images/cert-24.png images.py",
+    "-a -F -i -n downgrade-24 images/downgrade-24.png images.py",
 ]
 
 if __name__ == "__main__":

diff --git a/images.py b/images.py
@@ -6525,3 +6525,12 @@
     b'V02IDBE9aAJQopDBMQ7MQwXQVhZ5vWnQVJ1OB9v/A5rmYJASfdKvTj34KcATT0TYGZdaUUAA'
     b'AAAASUVORK5CYII=')
 
+#----------------------------------------------------------------------
+downgrade_24 = PyEmbeddedImage(
+    b'iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA10lEQVRIS2NkoDFgpLH5DERb'
+    b'cL/BQECx4cIHUh1ElAW3arUTgAbXM/xlCFRru3qBFEsIWgAxnLEfaKgAEH9gZWZRJMUneC1A'
+    b'Mxxo/v9EtearC8j2AXI4E2P4rVqd/7gsU2u+AnY8ig+Aht5nZWY1/P33dwBSsOB0ORkWgF0E'
+    b'SymgMMcbLORagORr/GGObAEsSNCDDC2IkMP0/wNQcCGnGGJcTIIF4OBBsYRiCwglP7pagCvM'
+    b'8QYRuiQ5Lh7BFhAb5iQmU4TyUQsI5TGy5QnWaGSbDNVIcwsA0aiBGYyKH2AAAAAASUVORK5C'
+    b'YII=')
+
diff --git a/images/downgrade-24.png b/images/downgrade-24.png
diff --git a/message_box_ex.py b/message_box_ex.py
@@ -10,7 +10,7 @@
 from runtime import *
 
 class MessageBoxEx(wx.Dialog):
-    def __init__(self, *args, title=None, message=None, button_texts=None, default_button=None, disable_buttons=None, is_md=False, size=(800, 600), checkbox_labels=None, **kwargs):
+    def __init__(self, *args, title=None, message=None, button_texts=None, default_button=None, disable_buttons=None, is_md=False, size=(800, 600), checkbox_labels=None, checkbox_initial_values=None, **kwargs):
         wx.Dialog.__init__(self, *args, **kwargs)
         self.SetTitle(title)
         self.button_texts = button_texts
@@ -19,6 +19,10 @@ def __init__(self, *args, title=None, message=None, button_texts=None, default_b
         self.return_value = None
         self.checkboxes = []
         self.checkbox_labels = checkbox_labels
+        if checkbox_initial_values is not None:
+            self.checkbox_initial_values = checkbox_initial_values
+        else:
+            self.checkbox_initial_values = []
 
         vSizer = wx.BoxSizer(wx.VERTICAL)
         message_sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -56,8 +60,11 @@ def __init__(self, *args, title=None, message=None, button_texts=None, default_b
 
         if checkbox_labels is not None:
             checkbox_sizer = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY), wx.HORIZONTAL)
-            for checkbox_label in checkbox_labels:
+            for i in range(len(checkbox_labels)):
+                checkbox_label = checkbox_labels[i]
                 checkbox = wx.CheckBox(self, wx.ID_ANY, checkbox_label, wx.DefaultPosition, wx.DefaultSize, 0)
+                if i < len(self.checkbox_initial_values):
+                    checkbox.SetValue(self.checkbox_initial_values[i])
                 self.checkboxes.append(checkbox)
                 checkbox_sizer.Add(checkbox, 0, wx.ALL, 5)
             vSizer.Add(checkbox_sizer, 0, wx.EXPAND | wx.ALL, 10)