Enable Both slot Flash options : Try 2

Author: fatalcoder524

app/src/main/assets/flash_ak3.sh

@@ -13,10 +13,10 @@ TMP=$F/tmp;
 
 $F/busybox rm -rf $TMP 2>/dev/null;
 $F/busybox mkdir -p $TMP;
-$F/busybox sed -i "/export ZIPFILE=\"\$3\";/a export STATE=\"\$4\";\nexport SLOT=\"\$5\";" $F/update-binary;
+## $F/busybox sed -i "/export ZIPFILE=\"\$3\";/a export STATE=\"\$4\";\nexport SLOT=\"\$5\";" $F/update-binary;
 ## $F/busybox sed -i 's/\[ -e \/dev\/block\/$byname\/system \] || slot=\$(find_slot);/[ -e \/dev\/block\/$byname\/system ] || slot=$SLOT;/' $F/update-binary;
-$F/busybox sed -i '/setup_env;/i sed -i "/is_slot_device=auto/i slot_select=$4" anykernel.sh' $F/update-binary;
-$F/busybox sed -i '/setup_env;/i sed -i '\''s/is_slot_device=auto/is_slot_device=1/'\'' anykernel.sh' $F/update-binary;
+## $F/busybox sed -i '/setup_env;/i sed -i "/is_slot_device=auto/i slot_select=$4" anykernel.sh' $F/update-binary;
+## $F/busybox sed -i '/setup_env;/i sed -i '\''s/is_slot_device=auto/is_slot_device=1/'\'' anykernel.sh' $F/update-binary;
 
 # update-binary <RECOVERY_API_VERSION> <OUTFD> <ZIPFILE>
 AKHOME=$TMP/anykernel $F/busybox ash $F/update-binary 3 1 "$Z" "$S" "$P";

app/src/main/java/com/github/capntrips/kernelflasher/ui/screens/slot/SlotViewModel.kt

@@ -429,10 +429,10 @@ class SlotViewModel(
     }
 
     private fun resetSlot() {
-        // val activeSlotSuffix = Shell.cmd("getprop ro.boot.slot_suffix").exec().out[0]
-        // val newSlot = if (activeSlotSuffix == "_a") "_b" else "_a"
-        // Shell.cmd("magisk resetprop -n ro.boot.slot_suffix $newSlot").exec()
-        // wasSlotReset = !wasSlotReset
+        val activeSlotSuffix = Shell.cmd("getprop ro.boot.slot_suffix").exec().out[0]
+        val newSlot = if (activeSlotSuffix == "_a") "_b" else "_a"
+        Shell.cmd("magisk resetprop -n ro.boot.slot_suffix $newSlot").exec()
+        wasSlotReset = !wasSlotReset
     }
 
     @Suppress("FunctionName")
@@ -496,7 +496,7 @@ class SlotViewModel(
     }
 
     @Suppress("FunctionName")
-    private suspend fun _flashAk3(context: Context, slotSuffix: String) {
+    private suspend fun _flashAk3(context: Context) {
         if (!isActive) {
             resetSlot()
         }
@@ -508,7 +508,7 @@ class SlotViewModel(
                 val files = File(context.filesDir.canonicalPath)
                 val flashScript = File(files, "flash_ak3.sh")
                 val slot_inactive_state = if(isActive) "active" else "inactive"
-                val result = Shell.Builder.create().setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_REDIRECT_STDERR).build().newJob().add("F=$files Z=\"$zip\" S=\"$slot_inactive_state\" P=\"$slotSuffix\" /system/bin/sh $flashScript").to(flashOutput).exec()
+                val result = Shell.Builder.create().setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_REDIRECT_STDERR).build().newJob().add("F=$files Z=\"$zip\" /system/bin/sh $flashScript").to(flashOutput).exec()
                 if (result.isSuccess) {
                     log(context, "Kernel flashed successfully")
                     _wasFlashSuccess.value = true
@@ -534,15 +534,15 @@ class SlotViewModel(
         launch {
             _clearFlash()
             _copyFile(context, currentBackup, filename)
-            _flashAk3(context,slotSuffix)
+            _flashAk3(context)
         }
     }
 
     fun flashAk3(context: Context, uri: Uri) {
         launch {
             _clearFlash()
             _copyFile(context, uri)
-            _flashAk3(context, slotSuffix)
+            _flashAk3(context)
         }
     }