repack: update repacking
This will support updating the ramdisk to a different
compression format and co-exist with magisk.
We are also moving twrp repacking to its own class. We
check the new ramdisk format and if it's different
we have magisk compress using the new ramdisk format.
Change-Id: I770030aae7797e75817178b2f0fccd9f39dc23af
diff --git a/gui/action.cpp b/gui/action.cpp
index c8ee34c..494665c 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -38,6 +38,7 @@
#include <sstream>
#include "../partitions.hpp"
#include "../twrp-functions.hpp"
+#include "../twrpRepacker.hpp"
#include "../openrecoveryscript.hpp"
#include "../adb_install.h"
@@ -2167,6 +2168,8 @@
int GUIAction::repackimage(std::string arg __unused)
{
int op_status = 1;
+ twrpRepacker repacker;
+
operation_start("Repack Image");
if (!simulate)
{
@@ -2179,7 +2182,7 @@
Repack_Options.Type = REPLACE_KERNEL;
else
Repack_Options.Type = REPLACE_RAMDISK;
- if (!PartitionManager.Repack_Images(path, Repack_Options))
+ if (!repacker.Repack_Image_And_Flash(path, Repack_Options))
goto exit;
} else
simulate_progress_bar();
@@ -2192,6 +2195,8 @@
int GUIAction::fixabrecoverybootloop(std::string arg __unused)
{
int op_status = 1;
+ twrpRepacker repacker;
+
operation_start("Repack Image");
if (!simulate)
{
@@ -2207,7 +2212,7 @@
gui_msg(Msg(msg::kError, "unable_to_locate=Unable to locate {1}.")("/boot"));
goto exit;
}
- if (!PartitionManager.Prepare_Repack(part, REPACK_ORIG_DIR, DataManager::GetIntValue("tw_repack_backup_first") != 0, gui_lookup("repack", "Repack")))
+ if (!repacker.Backup_Image_For_Repack(part, REPACK_ORIG_DIR, DataManager::GetIntValue("tw_repack_backup_first") != 0, gui_lookup("repack", "Repack")))
goto exit;
DataManager::SetProgress(.25);
gui_msg("fixing_recovery_loop_patch=Patching kernel...");