diff --git a/data.cpp b/data.cpp
index f8b19dd5..7f87b67e 100644
--- a/data.cpp
+++ b/data.cpp
@@ -758,7 +758,7 @@ void DataManager::SetDefaultValues()
mValues.insert(make_pair(TW_BACKUP_SP2_SIZE, make_pair("0", 0)));
mValues.insert(make_pair(TW_BACKUP_SP3_SIZE, make_pair("0", 0)));
mValues.insert(make_pair(TW_STORAGE_FREE_SIZE, make_pair("0", 0)));
-
+
mValues.insert(make_pair(TW_REBOOT_AFTER_FLASH_VAR, make_pair("0", 1)));
mValues.insert(make_pair(TW_SIGNED_ZIP_VERIFY_VAR, make_pair("0", 1)));
mValues.insert(make_pair(TW_FORCE_MD5_CHECK_VAR, make_pair("0", 1)));
@@ -785,6 +785,8 @@ void DataManager::SetDefaultValues()
mValues.insert(make_pair(TW_RESTORE_AVG_IMG_RATE, make_pair("15000000", 1)));
mValues.insert(make_pair(TW_RESTORE_AVG_FILE_RATE, make_pair("3000000", 1)));
mValues.insert(make_pair(TW_RESTORE_AVG_FILE_COMP_RATE, make_pair("2000000", 1)));
+ mValues.insert(make_pair("tw_wipe_cache", make_pair("0", 0)));
+ mValues.insert(make_pair("tw_wipe_dalvik", make_pair("0", 0)));
if (GetIntValue(TW_HAS_INTERNAL) == 1 && GetIntValue(TW_HAS_DATA_MEDIA) == 1 && GetIntValue(TW_HAS_EXTERNAL) == 0)
SetValue(TW_HAS_USB_STORAGE, 0, 0);
else
diff --git a/gui/action.cpp b/gui/action.cpp
index 19a8b69a..22e36217 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");
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index 8a14faff..be6750f8 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -2608,17 +2608,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_cancel_action=adbsideloadcancel
- tw_show_reboot=1
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index 21d429c6..93e7b1f2 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -2608,17 +2608,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_cancel_action=adbsideloadcancel
- tw_show_reboot=1
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index 9c843045..66d955a8 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -2608,17 +2608,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_cancel_action=adbsideloadcancel
- tw_show_reboot=1
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 40df4a87..9b9befde 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -2608,17 +2608,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_cancel_action=adbsideloadcancel
- tw_show_reboot=1
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index d2f5a130..f53d720a 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -2608,17 +2608,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_cancel_action=adbsideloadcancel
- tw_show_reboot=1
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index 2cc401b2..88b36635 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -2607,17 +2607,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_show_reboot=1
- tw_cancel_action=adbsideloadcancel
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index bb214c8f..98e4e156 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -2606,17 +2606,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_show_reboot=1
- tw_cancel_action=adbsideloadcancel
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 819d2456..964d9dea 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -2605,17 +2605,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_show_reboot=1
- tw_cancel_action=adbsideloadcancel
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index e4cf5c03..1ff4821a 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -2606,17 +2606,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_show_reboot=1
- tw_cancel_action=adbsideloadcancel
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index e3eabf36..5f39a2f8 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -2611,17 +2611,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_show_reboot=1
- tw_cancel_action=adbsideloadcancel
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index 2b6e3efe..9432466e 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -2607,17 +2607,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_show_reboot=1
- tw_cancel_action=adbsideloadcancel
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index b4181113..74c80921 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -2608,17 +2608,7 @@
ADB Sideload
-
- tw_back=advanced
- tw_action=adbsideload
- tw_action_text1=ADB Sideload
- tw_action_text2=Usage: adb sideload filename.zip
- tw_complete_text1=ADB Sideload Complete
- tw_has_cancel=1
- tw_cancel_action=adbsideloadcancel
- tw_show_reboot=1
- action_page
-
+ sideload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+