- Bugfix: #194 Unintialized variable kmi_override causing patching …

…with KernelSU LKM fail if the value is not set in preferences.

- Bugfix: Preferences setting `Magisk Package Name` not saved.
- Regression bugfix: Rooted Magisk patching aborting if Magisk application path is not found when hidden and not properly set in the settings.
  PixelFlasher should not require unhiding Magisk or setting the package name if rooted, and su access to shell is granted.

advanced_settings.py

@@ -464,7 +464,7 @@ def _onOk(self, e):
 
         if self.package_name.GetValue():
             with contextlib.suppress(Exception):
-                if self.package_name.GetValue() != self.Parent.config.magisk and self.package_name.GetValue() in [MAGISK_PKG_NAME, MAGISK_ALPHA_PKG_NAME, MAGISK_DELTA_PKG_NAME]:
+                if self.package_name.GetValue() != self.Parent.config.magisk:
                     print(f"Setting Magisk Package Name to: {self.package_name.GetValue()}")
                     set_magisk_package(self.package_name.GetValue())
                     self.Parent.config.magisk = self.package_name.GetValue()

build-on-mac.spec

@@ -28,6 +28,6 @@ exe = EXE(pyz,
           icon='images/icon-dark-256.icns')
 app = BUNDLE(exe,
              name='PixelFlasher.app',
-             version='6.9.2.5',
+             version='6.9.2.6',
              icon='./images/icon-dark-256.icns',
              bundle_identifier='com.badabing.pixelflasher')

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 rm -rf build dist
-VERSION=6.9.2.5
+VERSION=6.9.2.6
 NAME="PixelFlasher"
 DIST_NAME="PixelFlasher"
 

constants.py

@@ -2,7 +2,7 @@
 
 APPNAME = 'PixelFlasher'
 CONFIG_FILE_NAME = 'PixelFlasher.json'
-VERSION = '6.9.2.5'
+VERSION = '6.9.2.6'
 SDKVERSION = '33.0.3'
 MAIN_WIDTH = 1400
 MAIN_HEIGHT = 1040

modules.py

@@ -1787,10 +1787,6 @@ def patch_magisk_script(patch_method):
                 magisk_path = f"{self.config.phone_path}/Magisk-Uploaded.apk"
             else:
                 magisk_path = device.magisk_path
-            if not magisk_path:
-                print("ERROR: Magisk path is empty!\nAborting ...")
-                puml("#red:Magisk path is empty;\n")
-                return -1
             data += f"MAGISK_PATH={magisk_path}\n"
 
             if patch_method in ["app", "other"]:
@@ -2091,6 +2087,7 @@ def patch_kernelsu_lkm_script():
             data += "echo -------------------------\n"
             data += "echo \"Creating a patch ...\"\n"
             data += "rm -f kernelsu_boot_*\n"
+            kmi_override = ''
             if self.config.override_kmi:
                 kmi_override = f" --kmi {self.config.override_kmi}"
                 data += "echo \"Overriding KMI ...\"\n"

windows-metadata.yaml

@@ -1,6 +1,6 @@
 # https://github.com/DudeNr33/pyinstaller-versionfile
 # create-version-file windows-metadata.yaml --outfile windows-version-info.txt
-Version: 6.9.2.5
+Version: 6.9.2.6
 FileDescription: PixelFlasher
 InternalName: PixelFlasher
 OriginalFilename: PixelFlasher.exe

windows-version-info.txt

@@ -7,8 +7,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0. Must always contain 4 elements.
-    filevers=(6,9,2,5),
-    prodvers=(6,9,2,5),
+    filevers=(6,9,2,6),
+    prodvers=(6,9,2,6),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -32,12 +32,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u''),
         StringStruct(u'FileDescription', u'PixelFlasher'),
-        StringStruct(u'FileVersion', u'6.9.2.5'),
+        StringStruct(u'FileVersion', u'6.9.2.6'),
         StringStruct(u'InternalName', u'PixelFlasher'),
         StringStruct(u'LegalCopyright', u''),
         StringStruct(u'OriginalFilename', u'PixelFlasher.exe'),
         StringStruct(u'ProductName', u'PixelFlasher'),
-        StringStruct(u'ProductVersion', u'6.9.2.5')])
+        StringStruct(u'ProductVersion', u'6.9.2.6')])
       ]),
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]