From 1da568fab4e96725d63c648295368d1bb62aad4b Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Tue, 9 Apr 2019 15:29:51 -0500 Subject: Do not check digest on mapped installs Change-Id: I2d57eba354e4ec88f418208183f53c12e8548fcb --- twinstall.cpp | 6 +++--- twrpDigestDriver.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/twinstall.cpp b/twinstall.cpp index 8bbafca30..d659b47b1 100755 --- a/twinstall.cpp +++ b/twinstall.cpp @@ -353,9 +353,9 @@ int TWinstall_zip(const char* path, int* wipe_cache) { gui_msg("check_for_digest=Checking for Digest file..."); - if (!twrpDigestDriver::Check_File_Digest(Full_Filename)) { - LOGERR("Aborting zip install: Digest verification failed\n"); - return INSTALL_CORRUPT; + if (*path != '@' && !twrpDigestDriver::Check_File_Digest(Full_Filename)) { + LOGERR("Aborting zip install: Digest verification failed\n"); + return INSTALL_CORRUPT; } } diff --git a/twrpDigestDriver.cpp b/twrpDigestDriver.cpp index 4023c813d..074b6c3df 100755 --- a/twrpDigestDriver.cpp +++ b/twrpDigestDriver.cpp @@ -70,7 +70,7 @@ bool twrpDigestDriver::Check_File_Digest(const string& Filename) { if (!TWFunc::Path_Exists(digestfile)) { delete digest; - if (Filename.find(".zip") == std::string::npos) { + if (Filename.find(".zip") == std::string::npos && Filename.find(".map") == std::string::npos) { gui_msg(Msg(msg::kError, "no_digest_found=No digest file found for '{1}'. Please unselect Enable Digest verification to restore.")(Filename)); } else { return true; -- cgit v1.2.3