From 24813426b9cf6d4a79e5da68008d1a4532e6c710 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Fri, 7 Nov 2014 17:19:07 -0600
Subject: Update adb sideload feature

Change-Id: Ib503d0e87434e1a28430779302d6565211c26592
---
 twinstall.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'twinstall.cpp')

diff --git a/twinstall.cpp b/twinstall.cpp
index 595c4d2a6..4e478d408 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -257,14 +257,22 @@ extern "C" int TWinstall_zip(const char* path, int* wipe_cache) {
 	string strpath = path;
 	ZipArchive Zip;
 
-	gui_print("Installing '%s'...\nChecking for MD5 file...\n", path);
-	md5sum.setfn(strpath);
-	md5_return = md5sum.verify_md5digest();
-	if (md5_return == -2) { // md5 did not match
-		LOGERR("Aborting zip install\n");
+	if (strcmp(path, "error") == 0) {
+		LOGERR("Failed to get adb sideload file: '%s'\n", path);
 		return INSTALL_CORRUPT;
 	}
 
+	gui_print("Installing '%s'...\n", path);
+	if (strlen(path) < 9 || strncmp(path, "/sideload", 9) != 0) {
+		gui_print("Checking for MD5 file...\n");
+		md5sum.setfn(strpath);
+		md5_return = md5sum.verify_md5digest();
+		if (md5_return == -2) { // md5 did not match
+			LOGERR("Aborting zip install\n");
+			return INSTALL_CORRUPT;
+		}
+	}
+
 #ifndef TW_OEM_BUILD
 	DataManager::GetValue(TW_SIGNED_ZIP_VERIFY_VAR, zip_verify);
 #endif
-- 
cgit v1.2.3