commit 7aa24ea80e56b5426b5df04f74e9f87f974ba0d7
author Dees_Troy <dees_troy@teamw.in> Thu Jan 31 15:49:06 2013 -0600
committer Gerrit Code Review <gerrit@5.9.244.119> Thu Jan 31 15:49:06 2013 -0600
tree e6fa5cae22e57e625b69142ea27fa098e8a85a22
parent dc771da4fb3c197fb5c045584bf7eacd734450c0
parent e2c8ba75eb908b0e8a370a2c24ebd54e9f06a023

Merge "Disable the forced MD5 check" into twrp2.4

twinstall.cpp

diff --git a/twinstall.cpp b/twinstall.cpp
index 86a0979..40d7155 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -260,7 +260,7 @@
 }
 
 extern "C" int TWinstall_zip(const char* path, int* wipe_cache) {
-	int err, zip_verify, md5_return, md5_verify;
+	int err, zip_verify, md5_return;
 
 	ui_print("Installing '%s'...\n", path);
 
@@ -276,13 +276,7 @@
 		LOGE("Zip MD5 does not match.\nUnable to install zip.\n");
 		return INSTALL_CORRUPT;
 	} else if (md5_return == -1) {
-		DataManager::GetValue(TW_FORCE_MD5_CHECK_VAR, md5_verify);
-		if (md5_verify == 1) {
-			// Forced MD5 checking is on and no MD5 file found.
-			LOGE("No MD5 file found for '%s'.\nDisable force MD5 check to avoid this error.\n", path);
-			return INSTALL_CORRUPT;
-		} else
-			ui_print("Skipping MD5 check: no MD5 file found.\n");
+		ui_print("Skipping MD5 check: no MD5 file found.\n");
 	} else if (md5_return == 1)
 		ui_print("Zip MD5 matched.\n"); // MD5 found and matched.