Fix zip install
We never used the feature for running a custom theme during zip install. We can re-implement this later if we like. For now, we will remove this feature until we are ready to make it work. Change-Id: Ice71b0b863c7ef17376e3f973d48b810be567c33
This commit is contained in:
+1
-26
@@ -218,33 +218,8 @@ int GUIAction::flash_zip(std::string filename, std::string pageName, const int s
|
||||
if (!PartitionManager.Mount_By_Path(filename, true))
|
||||
return -1;
|
||||
|
||||
if (mzOpenZipArchive(filename.c_str(), &zip))
|
||||
{
|
||||
LOGERR("Unable to open zip file.\n");
|
||||
return -1;
|
||||
}
|
||||
gui_changePage(pageName);
|
||||
|
||||
// Check the zip to see if it has a custom installer theme
|
||||
const ZipEntry* twrp = mzFindZipEntry(&zip, "META-INF/teamwin/twrp.zip");
|
||||
if (twrp != NULL)
|
||||
{
|
||||
unlink("/tmp/twrp.zip");
|
||||
fd = creat("/tmp/twrp.zip", 0666);
|
||||
}
|
||||
if (fd >= 0 && twrp != NULL &&
|
||||
mzExtractZipEntryToFile(&zip, twrp, fd) &&
|
||||
!PageManager::LoadPackage("install", "/tmp/twrp.zip", "main"))
|
||||
{
|
||||
mzCloseZipArchive(&zip);
|
||||
PageManager::SelectPackage("install");
|
||||
gui_changePage("main");
|
||||
}
|
||||
else
|
||||
{
|
||||
// In this case, we just use the default page
|
||||
mzCloseZipArchive(&zip);
|
||||
gui_changePage(pageName);
|
||||
}
|
||||
if (fd >= 0)
|
||||
close(fd);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user