From 2ff5a8dc5b7c39a21eb1bc8d2d227f2b16800a21 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Wed, 26 Sep 2012 14:53:02 -0400 Subject: Add option to wipe android secure --- gui/action.cpp | 2 ++ gui/devices/1024x600/res/ui.xml | 18 ++++++++++++++++++ gui/devices/1024x768/res/ui.xml | 18 ++++++++++++++++++ gui/devices/1280x800/res/ui.xml | 18 ++++++++++++++++++ gui/devices/1920x1200/res/ui.xml | 18 ++++++++++++++++++ gui/devices/320x480/res/ui.xml | 18 ++++++++++++++++++ gui/devices/480x800/res/ui.xml | 18 ++++++++++++++++++ gui/devices/480x854/res/ui.xml | 18 ++++++++++++++++++ gui/devices/540x960/res/ui.xml | 18 ++++++++++++++++++ gui/devices/720x1280/res/ui.xml | 18 ++++++++++++++++++ gui/devices/800x1280/res/ui.xml | 18 ++++++++++++++++++ gui/devices/800x480/res/ui.xml | 18 ++++++++++++++++++ partitionmanager.cpp | 20 ++++++++++++++++++++ partitions.hpp | 1 + 14 files changed, 221 insertions(+) diff --git a/gui/action.cpp b/gui/action.cpp index 1132a20a9..d63693440 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -715,6 +715,8 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) DataManager::GetValue(TW_EXTERNAL_PATH, External_Path); ret_val = PartitionManager.Wipe_By_Path(External_Path); + } else if (arg == "ANDROIDSECURE") { + ret_val = PartitionManager.Wipe_Android_Secure(); } else ret_val = PartitionManager.Wipe_By_Path(arg); diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index f32092646..7a0bbd00d 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -1582,6 +1582,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 02f0e1c80..cc9701ba1 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -1582,6 +1582,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index 94df418d2..2e5b32905 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -1582,6 +1582,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index a3eb3f933..17ccfe922 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -1582,6 +1582,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index bcc021133..efa980ac4 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -1162,6 +1162,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index 729b0c26c..435efb079 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -1161,6 +1161,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index d44d28c7a..ff0035723 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -1160,6 +1160,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index d673bc0c4..ca008d5ab 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -1161,6 +1161,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index dade88206..d0973b2ef 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -1166,6 +1166,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index 0ca35eb66..b7c1e0429 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -1162,6 +1162,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index e3ac81688..4454ffefb 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -1582,6 +1582,24 @@ + + + + + Android Secure + + + tw_back=wipe + tw_action=wipe + tw_action_param=ANDROIDSECURE + tw_text1=Wipe Android Secure? + tw_action_text1=Wiping Android Secure... + tw_complete_text1=Wipe Android Secure Complete + tw_slider_text=Swipe to Format + confirm_action + + + diff --git a/partitionmanager.cpp b/partitionmanager.cpp index c99447ff0..98151b43c 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -1283,6 +1283,26 @@ int TWPartitionManager::Wipe_Battery_Stats(void) { return true; } +int TWPartitionManager::Wipe_Android_Secure(void) { + std::vector::iterator iter; + int ret = false; + bool found = false; + + // Iterate through all partitions + for (iter = Partitions.begin(); iter != Partitions.end(); iter++) { + if ((*iter)->Has_Android_Secure) { + ret = (*iter)->Wipe_AndSec(); + found = true; + } + } + if (found) { + return ret; + } else { + LOGE("No android secure partitions found.\n"); + } + return false; +} + int TWPartitionManager::Format_Data(void) { TWPartition* dat = Find_Partition_By_Path("/data"); diff --git a/partitions.hpp b/partitions.hpp index 9a700b804..fdceba844 100644 --- a/partitions.hpp +++ b/partitions.hpp @@ -172,6 +172,7 @@ public: virtual int Wipe_Dalvik_Cache(); // Wipes dalvik cache virtual int Wipe_Rotate_Data(); // Wipes rotation data -- virtual int Wipe_Battery_Stats(); // Wipe battery stats -- /data/system/batterystats.bin + virtual int Wipe_Android_Secure(); // Wipes android secure virtual int Format_Data(); // Really formats data on /data/media devices -- also removes encryption virtual int Wipe_Media_From_Data(); // Removes and recreates the media folder on /data/media devices virtual void Refresh_Sizes(); // Refreshes size data of partitions -- cgit v1.2.3