From a2ac96a2f21d533af51cff30693df4936cae417e Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Wed, 26 Sep 2012 13:07:22 -0400 Subject: Fix SDCard partitioning --- gui/action.cpp | 14 +++++++++++--- gui/devices/1024x600/res/ui.xml | 2 +- gui/devices/1024x768/res/ui.xml | 2 +- gui/devices/1280x800/res/ui.xml | 2 +- gui/devices/1920x1200/res/ui.xml | 2 +- gui/devices/320x480/res/ui.xml | 2 +- gui/devices/480x800/res/ui.xml | 2 +- gui/devices/480x854/res/ui.xml | 2 +- gui/devices/540x960/res/ui.xml | 2 +- gui/devices/720x1280/res/ui.xml | 2 +- gui/devices/800x1280/res/ui.xml | 2 +- gui/devices/800x480/res/ui.xml | 2 +- 12 files changed, 22 insertions(+), 14 deletions(-) diff --git a/gui/action.cpp b/gui/action.cpp index 80a582c6c..75d6c4764 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -27,7 +27,6 @@ extern "C" { #include "../common.h" -#include "../roots.h" #include "../tw_reboot.h" #include "../minuitwrp/minui.h" #include "../recovery_ui.h" @@ -827,8 +826,17 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) // Below seen in Koush's recovery char sddevice[256]; char mkdir_path[255]; - Volume *vol = volume_for_path("/sdcard"); - strcpy(sddevice, vol->device); +#ifdef TW_EXTERNAL_STORAGE_PATH + TWPartition* SDCard = PartitionManager.Find_Partition_By_Path(EXPAND(TW_EXTERNAL_STORAGE_PATH)); +#else + TWPartition* SDCard = PartitionManager.Find_Partition_By_Path("/sdcard"); +#endif + if (SDCard == NULL) { + LOGE("Unable to locate device to partition.\n"); + operation_end(1, simulate); + return 0; + } + strcpy(sddevice, SDCard->Actual_Block_Device.c_str()); // Just need block not whole partition sddevice[strlen("/dev/block/mmcblkX")] = '\0'; diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index 4cfac6d21..f32092646 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -2720,7 +2720,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 35e6ab376..02f0e1c80 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -2720,7 +2720,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index f2808c28f..94df418d2 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -2720,7 +2720,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index 13b0eb278..a3eb3f933 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -2720,7 +2720,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index b5ff423c8..bcc021133 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -2712,7 +2712,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index c63b44b6a..729b0c26c 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -2711,7 +2711,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index ff2eea953..d44d28c7a 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -2710,7 +2710,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index 1e3814d81..d673bc0c4 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -2711,7 +2711,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index 9d0732609..dade88206 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -2716,7 +2716,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index f9ea3115d..0ca35eb66 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -2712,7 +2712,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index 0400f55e9..e3ac81688 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -2720,7 +2720,7 @@ tw_action2_param=tw_zip_location=/sdcard tw_action_text1=Partitioning SD Card... tw_action_text2=This will take a few minutes. - tw_complete_text1=Fix Permissions Complete + tw_complete_text1=Partitioning Complete action_page -- cgit v1.2.3