From 7ce7f0cde40bf127196cfac4bedce79ac5c59d77 Mon Sep 17 00:00:00 2001 From: bigbiff bigbiff Date: Fri, 25 Jan 2013 09:54:04 -0500 Subject: adding sideload page with wipe cache and dalvik fix variable Change-Id: I72eed7b4d709a184e53cc94165a1817a7dcf041e --- gui/action.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gui/action.cpp') diff --git a/gui/action.cpp b/gui/action.cpp index 19a8b69a0..22e362177 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -1059,6 +1059,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) simulate_progress_bar(); } else { int wipe_cache = 0; + int wipe_dalvik = 0; string result, Sideload_File; if (!PartitionManager.Mount_Current_Storage(true)) { @@ -1070,11 +1071,16 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) unlink(Sideload_File.c_str()); } ui_print("Starting ADB sideload feature...\n"); + DataManager::GetValue("tw_wipe_dalvik", wipe_dalvik); ret = apply_from_adb(ui, &wipe_cache, Sideload_File.c_str()); - if (ret != 0) + if (ret != 0) { ret = 1; // failure - else if (wipe_cache) - PartitionManager.Wipe_By_Path("/cache"); + } else { + if (wipe_cache || DataManager::GetIntValue("tw_wipe_cache")) + PartitionManager.Wipe_By_Path("/cache"); + if (wipe_dalvik) + PartitionManager.Wipe_Dalvik_Cache(); + } if (DataManager::GetIntValue(TW_HAS_INJECTTWRP) == 1 && DataManager::GetIntValue(TW_INJECT_AFTER_ZIP) == 1) { operation_start("ReinjectTWRP"); ui_print("Injecting TWRP into boot image...\n"); -- cgit v1.2.3