Skip to content

Commit dcf001f

Browse files
badabing2005badabing2005
committed
- Bug fix #330, uninitialized variable preventing Magisk patch creation (but works with KernelSU* flavors)
1 parent d162c04 commit dcf001f

File tree

9 files changed

+83
-45
lines changed

9 files changed

+83
-45
lines changed

‎Main.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3035,6 +3035,7 @@ def _print_device_details(self, device):
30353035
android_versions = get_android_versions()
30363036
launch_version = android_versions[ro_product_first_api_level]
30373037
message += f" Launch Version: {launch_version['Name']}\n"
3038+
message += f" Attestation Version: {launch_version['Attestation Version']}\n"
30383039
if device.api_level and device.api.level is not None:
30393040
android_version = android_versions[device.api_level]
30403041
message += f" Android Version: {android_version['Version']}\n"

‎android_versions.json‎

Lines changed: 72 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,251 +4,287 @@
44
"Codename": "",
55
"Version": "1.0",
66
"Release date": "September 23, 2008",
7-
"Latest update": ""
7+
"Latest update": "",
8+
"Attestation Version": "Not Supported"
89
},
910
"2": {
1011
"Name": "Android Petit Four",
1112
"Codename": "Petit Four",
1213
"Version": "1.1",
1314
"Release date": "February 9, 2009",
14-
"Latest update": ""
15+
"Latest update": "",
16+
"Attestation Version": "Not Supported"
1517
},
1618
"3": {
1719
"Name": "Android Cupcake",
1820
"Codename": "Cupcake",
1921
"Version": "1.5",
2022
"Release date": "April 27, 2009",
21-
"Latest update": ""
23+
"Latest update": "",
24+
"Attestation Version": "Not Supported"
2225
},
2326
"4": {
2427
"Name": "Android Donut",
2528
"Codename": "Donut",
2629
"Version": "1.6",
2730
"Release date": "September 15, 2009",
28-
"Latest update": ""
31+
"Latest update": "",
32+
"Attestation Version": "Not Supported"
2933
},
3034
"5": {
3135
"Name": "Android Eclair",
3236
"Codename": "Eclair",
3337
"Version": "2.0",
3438
"Release date": "October 27, 2009",
35-
"Latest update": ""
39+
"Latest update": "",
40+
"Attestation Version": "Not Supported"
3641
},
3742
"6": {
3843
"Name": "Android Eclair",
3944
"Codename": "Eclair",
4045
"Version": "2.0.1",
4146
"Release date": "December 3, 2009",
42-
"Latest update": ""
47+
"Latest update": "",
48+
"Attestation Version": "Not Supported"
4349
},
4450
"7": {
4551
"Name": "Android Eclair",
4652
"Codename": "Eclair",
4753
"Version": "2.1",
4854
"Release date": "January 11, 2010",
49-
"Latest update": ""
55+
"Latest update": "",
56+
"Attestation Version": "Not Supported"
5057
},
5158
"8": {
5259
"Name": "Android Froyo",
5360
"Codename": "Froyo",
5461
"Version": "2.2 – 2.2.3",
5562
"Release date": "May 20, 2010",
56-
"Latest update": ""
63+
"Latest update": "",
64+
"Attestation Version": "Not Supported"
5765
},
5866
"9": {
5967
"Name": "Android Gingerbread",
6068
"Codename": "Gingerbread",
6169
"Version": "2.3 – 2.3.2",
6270
"Release date": "December 6, 2010",
63-
"Latest update": ""
71+
"Latest update": "",
72+
"Attestation Version": "Not Supported"
6473
},
6574
"10": {
6675
"Name": "Android Gingerbread",
6776
"Codename": "Gingerbread",
6877
"Version": "2.3.3 – 2.3.7",
6978
"Release date": "February 9, 2011",
70-
"Latest update": ""
79+
"Latest update": "",
80+
"Attestation Version": "Not Supported"
7181
},
7282
"11": {
7383
"Name": "Android Honeycomb",
7484
"Codename": "Honeycomb",
7585
"Version": "3.0",
7686
"Release date": "February 22, 2011",
77-
"Latest update": ""
87+
"Latest update": "",
88+
"Attestation Version": "Not Supported"
7889
},
7990
"12": {
8091
"Name": "Android Honeycomb",
8192
"Codename": "Honeycomb",
8293
"Version": "3.1",
8394
"Release date": "May 10, 2011",
84-
"Latest update": ""
95+
"Latest update": "",
96+
"Attestation Version": "Not Supported"
8597
},
8698
"13": {
8799
"Name": "Android Honeycomb",
88100
"Codename": "",
89101
"Version": "3.2 – 3.2.6",
90102
"Release date": "July 15, 2011",
91-
"Latest update": ""
103+
"Latest update": "",
104+
"Attestation Version": "Not Supported"
92105
},
93106
"14": {
94107
"Name": "Android Ice Cream Sandwich",
95108
"Codename": "Ice Cream Sandwich",
96109
"Version": "4.0 – 4.0.2",
97110
"Release date": "October 18, 2011",
98-
"Latest update": ""
111+
"Latest update": "",
112+
"Attestation Version": "Not Supported"
99113
},
100114
"15": {
101115
"Name": "Android Ice Cream Sandwich",
102116
"Codename": "Ice Cream Sandwich",
103117
"Version": "4.0.3 – 4.0.4",
104118
"Release date": "December 16, 2011",
105-
"Latest update": ""
119+
"Latest update": "",
120+
"Attestation Version": "Not Supported"
106121
},
107122
"16": {
108123
"Name": "Android Jelly Bean",
109124
"Codename": "Jelly Bean",
110125
"Version": "4.1 – 4.1.2",
111126
"Release date": "July 9, 2012",
112-
"Latest update": ""
127+
"Latest update": "",
128+
"Attestation Version": "Not Supported"
113129
},
114130
"17": {
115131
"Name": "Android Jelly Bean",
116132
"Codename": "Jelly Bean",
117133
"Version": "4.2 – 4.2.2",
118134
"Release date": "November 13, 2012",
119-
"Latest update": ""
135+
"Latest update": "",
136+
"Attestation Version": "Not Supported"
120137
},
121138
"18": {
122139
"Name": "Android Jelly Bean",
123140
"Codename": "Jelly Bean",
124141
"Version": "4.3 – 4.3.1",
125142
"Release date": "July 24, 2013",
126-
"Latest update": ""
143+
"Latest update": "",
144+
"Attestation Version": "Not Supported"
127145
},
128146
"19": {
129147
"Name": "Android KitKat",
130148
"Codename": "Key Lime Pie",
131149
"Version": "4.4 – 4.4.4",
132150
"Release date": "October 31, 2013",
133-
"Latest update": "October 2017"
151+
"Latest update": "October 2017",
152+
"Attestation Version": "Not Supported"
134153
},
135154
"20": {
136155
"Name": "Android KitKat",
137156
"Codename": "Key Lime Pie",
138157
"Version": "4.4W – 4.4W.2",
139158
"Release date": "June 25, 2014",
140-
"Latest update": ""
159+
"Latest update": "",
160+
"Attestation Version": "Not Supported"
141161
},
142162
"21": {
143163
"Name": "Android Lollipop",
144164
"Codename": "Lemon Meringue Pie",
145165
"Version": "5.0 – 5.0.2",
146166
"Release date": "November 4, 2014",
147-
"Latest update": "November 2017"
167+
"Latest update": "November 2017",
168+
"Attestation Version": "Not Supported"
148169
},
149170
"22": {
150171
"Name": "Android Lollipop",
151172
"Codename": "Lemon Meringue Pie",
152173
"Version": "5.1 – 5.1.1",
153174
"Release date": "March 2, 2015",
154-
"Latest update": "March 2018"
175+
"Latest update": "March 2018",
176+
"Attestation Version": "Not Supported"
155177
},
156178
"23": {
157179
"Name": "Android Marshmallow",
158180
"Codename": "Macadamia Nut Cookie",
159181
"Version": "6.0 – 6.0.1",
160182
"Release date": "October 2, 2015",
161-
"Latest update": "August 2018"
183+
"Latest update": "August 2018",
184+
"Attestation Version": "Keymaster 1.0"
162185
},
163186
"24": {
164187
"Name": "Android Nougat",
165188
"Codename": "New York Cheesecake",
166189
"Version": "7.0",
167190
"Release date": "August 22, 2016",
168-
"Latest update": "August 2019"
191+
"Latest update": "August 2019",
192+
"Attestation Version": "Keymaster 2.0"
169193
},
170194
"25": {
171195
"Name": "Android Nougat",
172196
"Codename": "New York Cheesecake",
173197
"Version": "7.1 – 7.1.2",
174198
"Release date": "October 4, 2016",
175-
"Latest update": "October 2019"
199+
"Latest update": "October 2019",
200+
"Attestation Version": "Keymaster 2.0"
176201
},
177202
"26": {
178203
"Name": "Android Oreo",
179204
"Codename": "Oatmeal Cookie",
180205
"Version": "8.0",
181206
"Release date": "August 21, 2017",
182-
"Latest update": "January 2021"
207+
"Latest update": "January 2021",
208+
"Attestation Version": "Keymaster 3.0"
183209
},
184210
"27": {
185211
"Name": "Android Oreo",
186212
"Codename": "Oatmeal Cookie",
187213
"Version": "8.1",
188214
"Release date": "December 5, 2017",
189-
"Latest update": "October 2021"
215+
"Latest update": "October 2021",
216+
"Attestation Version": "Keymaster 3.0"
190217
},
191218
"28": {
192219
"Name": "Android Pie",
193220
"Codename": "Pistachio Ice Cream",
194221
"Version": "9",
195222
"Release date": "August 6, 2018",
196-
"Latest update": "January 2022"
223+
"Latest update": "January 2022",
224+
"Attestation Version": "Keymaster 4.0"
197225
},
198226
"29": {
199227
"Name": "Android 10",
200228
"Codename": "Quince Tart",
201229
"Version": "10",
202230
"Release date": "September 3, 2019",
203-
"Latest update": "February 2023"
231+
"Latest update": "February 2023",
232+
"Attestation Version": "Keymaster 4.1"
204233
},
205234
"30": {
206235
"Name": "Android 11",
207236
"Codename": "Red Velvet Cake",
208237
"Version": "11",
209238
"Release date": "September 8, 2020",
210-
"Latest update": "February 2024"
239+
"Latest update": "February 2024",
240+
"Attestation Version": "Keymaster 4.1"
211241
},
212242
"31": {
213243
"Name": "Android 12",
214244
"Codename": "Snow Cone ",
215245
"Version": "12",
216246
"Release date": "October 4, 2021",
217-
"Latest update": "March 2025"
247+
"Latest update": "March 2025",
248+
"Attestation Version": "KeyMint 1.0"
218249
},
219250
"32": {
220251
"Name": "Android 12L",
221252
"Codename": "Snow Cone v2",
222253
"Version": "12.1",
223254
"Release date": "March 7, 2022",
224-
"Latest update": "March 2025"
255+
"Latest update": "March 2025",
256+
"Attestation Version": "KeyMint 1.0"
225257
},
226258
"33": {
227259
"Name": "Android 13",
228260
"Codename": "Tiramisu",
229261
"Version": "13",
230262
"Release date": "August 15, 2022",
231-
"Latest update": "March 2025"
263+
"Latest update": "March 2025",
264+
"Attestation Version": "KeyMint 2.0"
232265
},
233266
"34": {
234267
"Name": "Android 14",
235268
"Codename": "Upside Down Cake",
236269
"Version": "14",
237270
"Release date": "October 4, 2023",
238-
"Latest update": "Present"
271+
"Latest update": "Present",
272+
"Attestation Version": "KeyMint 3.0"
239273
},
240274
"35": {
241275
"Name": "Android 15",
242276
"Codename": "Vanilla Ice Cream",
243277
"Version": "15",
244278
"Release date": "September 3, 2024",
245-
"Latest update": "Present"
279+
"Latest update": "Present",
280+
"Attestation Version": "KeyMint 3.0"
246281
},
247282
"36": {
248283
"Name": "Android 16",
249284
"Codename": "Baklava",
250285
"Version": "16",
251286
"Release date": "June 10, 2025",
252-
"Latest update": "Present"
287+
"Latest update": "Present",
288+
"Attestation Version": "KeyMint 4.0"
253289
}
254290
}

‎build-on-mac-intel-only.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ exe = EXE(pyz,
5858
icon='images/icon-dark-256.icns')
5959
app = BUNDLE(exe,
6060
name='PixelFlasher.app',
61-
version='8.9.0.0',
61+
version='8.9.0.1',
6262
icon='./images/icon-dark-256.icns',
6363
bundle_identifier='com.badabing.pixelflasher')

‎build-on-mac.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ exe = EXE(pyz,
5959
icon='images/icon-dark-256.icns')
6060
app = BUNDLE(exe,
6161
name='PixelFlasher.app',
62-
version='8.9.0.0',
62+
version='8.9.0.1',
6363
icon='./images/icon-dark-256.icns',
6464
bundle_identifier='com.badabing.pixelflasher')

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# <https://www.gnu.org/licenses/>.
3333

3434
rm -rf build dist
35-
VERSION=8.9.0.0
35+
VERSION=8.9.0.1
3636
NAME="PixelFlasher"
3737
DIST_NAME="PixelFlasher"
3838

‎constants.py‎

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

3636
APPNAME = 'PixelFlasher'
3737
CONFIG_FILE_NAME = 'PixelFlasher.json'
38-
VERSION = '8.9.0.0'
38+
VERSION = '8.9.0.1'
3939
SDKVERSION = '33.0.3'
4040
MAIN_WIDTH = 1400
4141
MAIN_HEIGHT = 1040

‎modules.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3713,6 +3713,7 @@ def magisk_not_found():
37133713
return
37143714

37153715
is_rooted = device.rooted
3716+
kernel_su_gz_file = None
37163717

37173718
# KernelSU
37183719
if patch_flavor in ['KernelSU', 'KernelSU-Next', 'SukiSU', 'Wild_KSU']:

‎windows-metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/DudeNr33/pyinstaller-versionfile
22
# create-version-file windows-metadata.yaml --outfile windows-version-info.txt
3-
Version: 8.9.0.0
3+
Version: 8.9.0.1
44
FileDescription: PixelFlasher
55
InternalName: PixelFlasher
66
OriginalFilename: PixelFlasher.exe

0 commit comments

Comments
 (0)