summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2019-04-09 22:29:51 +0200
committerEthan Yonker <dees_troy@teamw.in>2019-04-09 22:35:21 +0200
commit1da568fab4e96725d63c648295368d1bb62aad4b (patch)
treedbb802652bdc352e9918e36479344bdf27f40e0a
parentChange slot name position (diff)
downloadandroid_bootable_recovery-1da568fab4e96725d63c648295368d1bb62aad4b.tar
android_bootable_recovery-1da568fab4e96725d63c648295368d1bb62aad4b.tar.gz
android_bootable_recovery-1da568fab4e96725d63c648295368d1bb62aad4b.tar.bz2
android_bootable_recovery-1da568fab4e96725d63c648295368d1bb62aad4b.tar.lz
android_bootable_recovery-1da568fab4e96725d63c648295368d1bb62aad4b.tar.xz
android_bootable_recovery-1da568fab4e96725d63c648295368d1bb62aad4b.tar.zst
android_bootable_recovery-1da568fab4e96725d63c648295368d1bb62aad4b.zip
-rwxr-xr-xtwinstall.cpp6
-rwxr-xr-xtwrpDigestDriver.cpp2
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;