Skip to content

Commit fe34916

Browse files
committed
- Add a new experimental feature to downgrade without a wipe and potentially 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.
1 parent 361aae0 commit fe34916

17 files changed

+5681
-170
lines changed

Main.py

Lines changed: 251 additions & 95 deletions
Large diffs are not rendered by default.

avbtool.py

Lines changed: 5015 additions & 0 deletions
Large diffs are not rendered by default.

build-on-linux.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ block_cipher = None
55
a = Analysis(['PixelFlasher.py'],
66
pathex=[],
77
binaries=[('bin/7zzs', 'bin')],
8-
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', '.')],
8+
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', '.')],
99
hiddenimports=[],
1010
hookspath=[],
1111
runtime_hooks=[],

build-on-mac.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ block_cipher = None
44

55
a = Analysis(['PixelFlasher.py'],
66
binaries=[('bin/7zz', 'bin')],
7-
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', '.')],
7+
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', '.')],
88
hiddenimports=[],
99
hookspath=[],
1010
runtime_hooks=[],
@@ -28,6 +28,6 @@ exe = EXE(pyz,
2828
icon='images/icon-dark-256.icns')
2929
app = BUNDLE(exe,
3030
name='PixelFlasher.app',
31-
version='6.9.1.3',
31+
version='6.9.2.0',
3232
icon='./images/icon-dark-256.icns',
3333
bundle_identifier='com.badabing.pixelflasher')

build-on-win.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ block_cipher = None
44

55
a = Analysis(['PixelFlasher.py'],
66
binaries=[('bin/7z.exe', 'bin'), ('bin/7z.dll', 'bin')],
7-
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', '.')],
7+
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', '.')],
88
hiddenimports=[],
99
hookspath=[],
1010
runtime_hooks=[],

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
rm -rf build dist
3-
VERSION=6.9.1.3
3+
VERSION=6.9.2.0
44
NAME="PixelFlasher"
55
DIST_NAME="PixelFlasher"
66

constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
APPNAME = 'PixelFlasher'
44
CONFIG_FILE_NAME = 'PixelFlasher.json'
5-
VERSION = '6.9.1.3'
5+
VERSION = '6.9.2.0'
66
SDKVERSION = '33.0.3'
77
MAIN_WIDTH = 1400
88
MAIN_HEIGHT = 1040

encode-bitmaps.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
"-a -F -i -n kernelsu-24 images/kernelsu-24.png images.py",
133133
"-a -F -i -n apatch-24 images/apatch-24.png images.py",
134134
"-a -F -i -n cert-24 images/cert-24.png images.py",
135+
"-a -F -i -n downgrade-24 images/downgrade-24.png images.py",
135136
]
136137

137138
if __name__ == "__main__":

images.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6525,3 +6525,12 @@
65256525
b'V02IDBE9aAJQopDBMQ7MQwXQVhZ5vWnQVJ1OB9v/A5rmYJASfdKvTj34KcATT0TYGZdaUUAA'
65266526
b'AAAASUVORK5CYII=')
65276527

6528+
#----------------------------------------------------------------------
6529+
downgrade_24 = PyEmbeddedImage(
6530+
b'iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA10lEQVRIS2NkoDFgpLH5DERb'
6531+
b'cL/BQECx4cIHUh1ElAW3arUTgAbXM/xlCFRru3qBFEsIWgAxnLEfaKgAEH9gZWZRJMUneC1A'
6532+
b'Mxxo/v9EtearC8j2AXI4E2P4rVqd/7gsU2u+AnY8ig+Aht5nZWY1/P33dwBSsOB0ORkWgF0E'
6533+
b'SymgMMcbLORagORr/GGObAEsSNCDDC2IkMP0/wNQcCGnGGJcTIIF4OBBsYRiCwglP7pagCvM'
6534+
b'8QYRuiQ5Lh7BFhAb5iQmU4TyUQsI5TGy5QnWaGSbDNVIcwsA0aiBGYyKH2AAAAAASUVORK5C'
6535+
b'YII=')
6536+

images/downgrade-24.png

272 Bytes
Loading

0 commit comments

Comments
 (0)