diff --git a/gui/action.cpp b/gui/action.cpp index 94acf188..63a8085b 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -684,6 +684,96 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) operation_end(0, simulate); return 0; } + if (function == "checkpartitionlist") { + string Wipe_List, wipe_path; + int count = 0; + + DataManager::GetValue("tw_wipe_list", Wipe_List); + LOGINFO("checkpartitionlist list '%s'\n", Wipe_List.c_str()); + if (!Wipe_List.empty()) { + size_t start_pos = 0, end_pos = Wipe_List.find(";", start_pos); + while (end_pos != string::npos && start_pos < Wipe_List.size()) { + wipe_path = Wipe_List.substr(start_pos, end_pos - start_pos); + LOGINFO("checkpartitionlist wipe_path '%s'\n", wipe_path.c_str()); + if (wipe_path == "/and-sec" || wipe_path == "DALVIK" || wipe_path == "INTERNAL") { + // Do nothing + } else { + count++; + } + start_pos = end_pos + 1; + end_pos = Wipe_List.find(";", start_pos); + } + DataManager::SetValue("tw_check_partition_list", count); + } else { + DataManager::SetValue("tw_check_partition_list", 0); + } + return 0; + } + if (function == "getpartitiondetails") { + string Wipe_List, wipe_path; + int count = 0; + + DataManager::GetValue("tw_wipe_list", Wipe_List); + LOGINFO("getpartitiondetails list '%s'\n", Wipe_List.c_str()); + if (!Wipe_List.empty()) { + size_t start_pos = 0, end_pos = Wipe_List.find(";", start_pos); + while (end_pos != string::npos && start_pos < Wipe_List.size()) { + wipe_path = Wipe_List.substr(start_pos, end_pos - start_pos); + LOGINFO("getpartitiondetails wipe_path '%s'\n", wipe_path.c_str()); + if (wipe_path == "/and-sec" || wipe_path == "DALVIK" || wipe_path == "INTERNAL") { + // Do nothing + } else { + DataManager::SetValue("tw_partition_path", wipe_path); + break; + } + start_pos = end_pos + 1; + end_pos = Wipe_List.find(";", start_pos); + } + if (!wipe_path.empty()) { + TWPartition* Part = PartitionManager.Find_Partition_By_Path(wipe_path); + if (Part) { + unsigned long long mb = 1048576; + + DataManager::SetValue("tw_partition_name", Part->Display_Name); + DataManager::SetValue("tw_partition_mount_point", Part->Mount_Point); + DataManager::SetValue("tw_partition_file_system", Part->Current_File_System); + DataManager::SetValue("tw_partition_size", Part->Size / mb); + DataManager::SetValue("tw_partition_used", Part->Used / mb); + DataManager::SetValue("tw_partition_free", Part->Free / mb); + DataManager::SetValue("tw_partition_backup_size", Part->Backup_Size / mb); + DataManager::SetValue("tw_partition_removable", Part->Removable); + DataManager::SetValue("tw_partition_is_present", Part->Is_Present); + + if (Part->Can_Repair()) + DataManager::SetValue("tw_partition_can_repair", 1); + else + DataManager::SetValue("tw_partition_can_repair", 0); + if (TWFunc::Path_Exists("/sbin/mkdosfs")) + DataManager::SetValue("tw_partition_vfat", 1); + else + DataManager::SetValue("tw_partition_vfat", 0); + if (TWFunc::Path_Exists("/sbin/mkfs.exfat")) + DataManager::SetValue("tw_partition_exfat", 1); + else + DataManager::SetValue("tw_partition_exfat", 0); + if (TWFunc::Path_Exists("/sbin/mkfs.f2fs")) + DataManager::SetValue("tw_partition_f2fs", 1); + else + DataManager::SetValue("tw_partition_f2fs", 0); + if (TWFunc::Path_Exists("/sbin/mke2fs")) + DataManager::SetValue("tw_partition_ext", 1); + else + DataManager::SetValue("tw_partition_ext", 0); + return 0; + } else { + LOGERR("Unable to locate partition: '%s'\n", wipe_path.c_str()); + } + } + } + DataManager::SetValue("tw_partition_name", ""); + DataManager::SetValue("tw_partition_file_system", ""); + return 0; + } if (isThreaded) { @@ -1279,6 +1369,49 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) op_status = 1; // fail } + operation_end(op_status, simulate); + return 0; + } + if (function == "repair") + { + int op_status = 0; + + operation_start("Repair Partition"); + if (simulate) { + simulate_progress_bar(); + } else { + string part_path; + DataManager::GetValue("tw_partition_mount_point", part_path); + if (PartitionManager.Repair_By_Path(part_path, true)) { + op_status = 0; // success + } else { + LOGERR("Error repairing file system.\n"); + op_status = 1; // fail + } + } + + operation_end(op_status, simulate); + return 0; + } + if (function == "changefilesystem") + { + int op_status = 0; + + operation_start("Change File System"); + if (simulate) { + simulate_progress_bar(); + } else { + string part_path, file_system; + DataManager::GetValue("tw_partition_mount_point", part_path); + DataManager::GetValue("tw_action_new_file_system", file_system); + if (PartitionManager.Wipe_By_Path(part_path, file_system)) { + op_status = 0; // success + } else { + LOGERR("Error changing file system.\n"); + op_status = 1; // fail + } + } + operation_end(op_status, simulate); return 0; } diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index f201c679..92a33c0e 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -1490,7 +1490,7 @@ - +
Select Partitions to Wipe: @@ -1502,6 +1502,25 @@
+ + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1607,6 +1626,314 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 8d7ded82..2d8b07cf 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -1490,7 +1490,7 @@ - +
Select Partitions to Wipe: @@ -1502,6 +1502,25 @@
+ + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1607,6 +1626,314 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml index 96ff6231..b11e6c13 100644 --- a/gui/devices/1080x1920/res/ui.xml +++ b/gui/devices/1080x1920/res/ui.xml @@ -182,7 +182,8 @@ - + + @@ -1163,7 +1164,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1216,6 +1220,10 @@ + + tw_wipe_list= + + @@ -1250,6 +1258,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1347,6 +1374,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2470,7 +2811,8 @@ screen - + + Restore Defaults diff --git a/gui/devices/1200x1920/res/ui.xml b/gui/devices/1200x1920/res/ui.xml index f727e677..313706ce 100644 --- a/gui/devices/1200x1920/res/ui.xml +++ b/gui/devices/1200x1920/res/ui.xml @@ -185,7 +185,8 @@ - + + @@ -1166,7 +1167,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1219,6 +1223,10 @@ + + tw_wipe_list= + + @@ -1253,6 +1261,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1350,6 +1377,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2473,7 +2814,8 @@ screen - + + Restore Defaults diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index 2c61b777..d52d3efc 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -1490,7 +1490,7 @@ - +
Select Partitions to Wipe: @@ -1502,6 +1502,25 @@
+ + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1607,6 +1626,314 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + diff --git a/gui/devices/1600x2560/res/ui.xml b/gui/devices/1600x2560/res/ui.xml index 1873d0b2..bb28c0a5 100644 --- a/gui/devices/1600x2560/res/ui.xml +++ b/gui/devices/1600x2560/res/ui.xml @@ -185,7 +185,8 @@ - + + @@ -1168,7 +1169,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1221,6 +1225,10 @@ + + tw_wipe_list= + + @@ -1255,6 +1263,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1352,6 +1379,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2475,6 +2816,15 @@ screen + + + + + Restore Defaults + + + + @@ -2484,14 +2834,6 @@ Vibrate - - - - Restore Defaults - - - - main @@ -2538,7 +2880,6 @@ PAKST-5;PAKDT TASHST-6;TASHDT THAIST-7;THAIDT - TAIST-8;TAIDT JST-9;JSTDT EET-10;EETDT @@ -3558,7 +3899,7 @@ filemanageracction - + @@ -3574,7 +3915,7 @@ main - + diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index 1a8daf9e..d0ab9773 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -1490,7 +1490,7 @@ - +
Select Partitions to Wipe: @@ -1502,6 +1502,25 @@
+ + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1607,6 +1626,314 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index d0428896..65dc8e8f 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -1490,7 +1490,7 @@ - +
Select Partitions to Wipe: @@ -1502,6 +1502,25 @@
+ + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1607,6 +1626,314 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index cf17d1a2..f8903a53 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -177,7 +177,8 @@ - + + @@ -1150,7 +1151,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1203,6 +1207,10 @@ + + tw_wipe_list= + + @@ -1237,6 +1245,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1334,6 +1361,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2457,7 +2798,8 @@ screen - + + Restore Defaults diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index 96fc5c4b..db78cd75 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -177,7 +177,8 @@ - + + @@ -1150,7 +1151,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1203,6 +1207,10 @@ + + tw_wipe_list= + + @@ -1237,6 +1245,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1334,6 +1361,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2457,7 +2798,8 @@ screen - + + Restore Defaults diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index 330f9393..617c1966 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -176,7 +176,8 @@ - + + @@ -1149,7 +1150,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1202,6 +1206,10 @@ + + tw_wipe_list= + + @@ -1236,6 +1244,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1333,6 +1360,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2456,7 +2797,8 @@ screen - + + Restore Defaults diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index 75262bb9..b6fcc600 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -177,7 +177,8 @@ - + + @@ -1150,7 +1151,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1203,6 +1207,10 @@ + + tw_wipe_list= + + @@ -1237,6 +1245,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1334,6 +1361,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2457,7 +2798,8 @@ screen - + + Restore Defaults diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index 83f7c409..763fa44d 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -182,7 +182,8 @@ - + + @@ -1163,7 +1164,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1216,6 +1220,10 @@ + + tw_wipe_list= + + @@ -1250,6 +1258,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1347,6 +1374,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2470,7 +2811,8 @@ screen - + + Restore Defaults diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index b70837bc..134b899c 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -178,7 +178,8 @@ - + + @@ -1151,7 +1152,10 @@ Advanced Wipe - advancedwipe + + partitionlisterror=0 + advancedwipe + @@ -1204,6 +1208,10 @@ + + tw_wipe_list= + + @@ -1238,6 +1246,25 @@ + + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1335,6 +1362,320 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some + + + + + + file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + @@ -2458,7 +2799,8 @@ screen - + + Restore Defaults diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index de693f17..2af9c9c7 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -1498,7 +1498,7 @@ - +
Select Partitions to Wipe: @@ -1510,6 +1510,25 @@
+ + + + + + Repair or Change File System + + + checkpartitionlist + + + + + + + + Invalid partition selection + + @@ -1615,6 +1634,314 @@ + + + + + partitionlisterror=0 + + partitionoptions + + + + + + + partitionlisterror=1 + tw_wipe_list= + advancedwipe + + + + + + + + + + + Partition Options for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + + Present: Yes + + + + + + + Present: No + + + + + + + Removable: Yes + + + + + + + Removable: No + + + + + + Size: %tw_partition_size%MB + + + + + + Used: %tw_partition_used%MB + + + + + + Free: %tw_partition_free%MB + + + + + + Backup Size: %tw_partition_backup_size%MB + + + + + + + + Repair + + + tw_back=partitionoptions + tw_action=repair + tw_action_param=%tw_partition_mount_point% + tw_has_action2=0 + tw_text1=Repair %tw_partition_name%? + tw_text2= + tw_action_text1=Repairing... + tw_complete_text1=Repair Complete + tw_slider_text=Swipe to Repair + confirm_action + + + + + + + + Change File System + + selectfilesystem + + + + + main + + + + + advancedwipe + + + + + + + + + + + + Change file system for: %tw_partition_name% + + + + + + Mount Point: %tw_partition_mount_point% + + + + + + Current file system: %tw_partition_file_system% + + + + + + Some ROMs or kernels may not support some file systems. Proceed with caution! + + + + + + + + EXT2 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext2 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT2? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT3 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext3 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT3? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + EXT4 + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=ext4 + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to EXT4? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + F2FS + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=f2fs + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to F2FS? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + FAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=vfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to FAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + + + + exFAT + + + tw_back=selectfilesystem + tw_action=changefilesystem + tw_action_param=%tw_partition_mount_point% + tw_action_new_file_system=exfat + tw_has_action2=0 + tw_text1=Change %tw_partition_name% to exFAT? + tw_text2= + tw_action_text1=Formatting... + tw_complete_text1=Format Complete + tw_slider_text=Swipe to Change + confirm_action + + + + + + main + + + + + partitionoptions + + + + + diff --git a/partition.cpp b/partition.cpp index e554ac7e..e92fccfd 100644 --- a/partition.cpp +++ b/partition.cpp @@ -1105,7 +1105,7 @@ bool TWPartition::Wipe(string New_File_System) { else unlink("/.layout_version"); - if (Has_Data_Media) { + if (Has_Data_Media && Current_File_System == New_File_System) { wiped = Wipe_Data_Without_Wiping_Media(); } else { @@ -1185,6 +1185,100 @@ bool TWPartition::Wipe_AndSec(void) { return true; } +bool TWPartition::Can_Repair() { + if (Current_File_System == "vfat" && TWFunc::Path_Exists("/sbin/dosfsck")) + return true; + else if ((Current_File_System == "ext2" || Current_File_System == "ext3" || Current_File_System == "ext4") && TWFunc::Path_Exists("/sbin/e2fsck")) + return true; + else if (Current_File_System == "exfat" && TWFunc::Path_Exists("/sbin/fsck.exfat")) + return true; + else if (Current_File_System == "f2fs" && TWFunc::Path_Exists("/sbin/fsck.f2fs")) + return true; + return false; +} + +bool TWPartition::Repair() { + string command; + + if (Current_File_System == "vfat") { + if (!TWFunc::Path_Exists("/sbin/dosfsck")) { + gui_print("dosfsck does not exist! Cannot repair!\n"); + return false; + } + if (!UnMount(true)) + return false; + gui_print("Repairing %s using dosfsck...\n", Display_Name.c_str()); + Find_Actual_Block_Device(); + command = "/sbin/dosfsck -y " + Actual_Block_Device; + LOGINFO("Repair command: %s\n", command.c_str()); + if (TWFunc::Exec_Cmd(command) == 0) { + gui_print("Done.\n"); + return true; + } else { + LOGERR("Unable to repair '%s'.\n", Mount_Point.c_str()); + return false; + } + } + if (Current_File_System == "ext2" || Current_File_System == "ext3" || Current_File_System == "ext4") { + if (!TWFunc::Path_Exists("/sbin/e2fsck")) { + gui_print("e2fsck does not exist! Cannot repair!\n"); + return false; + } + if (!UnMount(true)) + return false; + gui_print("Repairing %s using e2fsck...\n", Display_Name.c_str()); + Find_Actual_Block_Device(); + command = "/sbin/e2fsck -p " + Actual_Block_Device; + LOGINFO("Repair command: %s\n", command.c_str()); + if (TWFunc::Exec_Cmd(command) == 0) { + gui_print("Done.\n"); + return true; + } else { + LOGERR("Unable to repair '%s'.\n", Mount_Point.c_str()); + return false; + } + } + if (Current_File_System == "exfat") { + if (!TWFunc::Path_Exists("/sbin/fsck.exfat")) { + gui_print("fsck.exfat does not exist! Cannot repair!\n"); + return false; + } + if (!UnMount(true)) + return false; + gui_print("Repairing %s using fsck.exfat...\n", Display_Name.c_str()); + Find_Actual_Block_Device(); + command = "/sbin/fsck.exfat " + Actual_Block_Device; + LOGINFO("Repair command: %s\n", command.c_str()); + if (TWFunc::Exec_Cmd(command) == 0) { + gui_print("Done.\n"); + return true; + } else { + LOGERR("Unable to repair '%s'.\n", Mount_Point.c_str()); + return false; + } + } + if (Current_File_System == "f2fs") { + if (!TWFunc::Path_Exists("/sbin/fsck.f2fs")) { + gui_print("fsck.f2fs does not exist! Cannot repair!\n"); + return false; + } + if (!UnMount(true)) + return false; + gui_print("Repairing %s using fsck.f2fs...\n", Display_Name.c_str()); + Find_Actual_Block_Device(); + command = "/sbin/fsck.f2fs " + Actual_Block_Device; + LOGINFO("Repair command: %s\n", command.c_str()); + if (TWFunc::Exec_Cmd(command) == 0) { + gui_print("Done.\n"); + return true; + } else { + LOGERR("Unable to repair '%s'.\n", Mount_Point.c_str()); + return false; + } + } + return false; +} + bool TWPartition::Backup(string backup_folder) { if (Backup_Method == FILES) return Backup_Tar(backup_folder); diff --git a/partitionmanager.cpp b/partitionmanager.cpp index be4ba635..452e5c24 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -1096,6 +1096,69 @@ int TWPartitionManager::Wipe_By_Name(string Name) { return false; } +int TWPartitionManager::Wipe_By_Path(string Path, string New_File_System) { + std::vector::iterator iter; + int ret = false; + bool found = false; + string Local_Path = TWFunc::Get_Root_Path(Path); + + // Iterate through all partitions + for (iter = Partitions.begin(); iter != Partitions.end(); iter++) { + if ((*iter)->Mount_Point == Local_Path || (!(*iter)->Symlink_Mount_Point.empty() && (*iter)->Symlink_Mount_Point == Local_Path)) { + if (Path == "/and-sec") + ret = (*iter)->Wipe_AndSec(); + else + ret = (*iter)->Wipe(New_File_System); + found = true; + } else if ((*iter)->Is_SubPartition && (*iter)->SubPartition_Of == Local_Path) { + (*iter)->Wipe(New_File_System); + } + } + if (found) { + return ret; + } else + LOGERR("Wipe: Unable to find partition for path '%s'\n", Local_Path.c_str()); + return false; +} + +int TWPartitionManager::Wipe_By_Block(string Block, string New_File_System) { + TWPartition* Part = Find_Partition_By_Block(Block); + + if (Part) { + if (Part->Has_SubPartition) { + std::vector::iterator subpart; + + for (subpart = Partitions.begin(); subpart != Partitions.end(); subpart++) { + if ((*subpart)->Is_SubPartition && (*subpart)->SubPartition_Of == Part->Mount_Point) + (*subpart)->Wipe(New_File_System); + } + return Part->Wipe(New_File_System); + } else + return Part->Wipe(New_File_System); + } + LOGERR("Wipe: Unable to find partition for block '%s'\n", Block.c_str()); + return false; +} + +int TWPartitionManager::Wipe_By_Name(string Name, string New_File_System) { + TWPartition* Part = Find_Partition_By_Name(Name); + + if (Part) { + if (Part->Has_SubPartition) { + std::vector::iterator subpart; + + for (subpart = Partitions.begin(); subpart != Partitions.end(); subpart++) { + if ((*subpart)->Is_SubPartition && (*subpart)->SubPartition_Of == Part->Mount_Point) + (*subpart)->Wipe(); + } + return Part->Wipe(New_File_System); + } else + return Part->Wipe(New_File_System); + } + LOGERR("Wipe: Unable to find partition for name '%s'\n", Name.c_str()); + return false; +} + int TWPartitionManager::Factory_Reset(void) { std::vector::iterator iter; int ret = true; @@ -1234,6 +1297,78 @@ int TWPartitionManager::Wipe_Media_From_Data(void) { return false; } +int TWPartitionManager::Repair_By_Path(string Path, bool Display_Error) { + std::vector::iterator iter; + int ret = false; + bool found = false; + string Local_Path = TWFunc::Get_Root_Path(Path); + + if (Local_Path == "/tmp" || Local_Path == "/") + return true; + + // Iterate through all partitions + for (iter = Partitions.begin(); iter != Partitions.end(); iter++) { + if ((*iter)->Mount_Point == Local_Path || (!(*iter)->Symlink_Mount_Point.empty() && (*iter)->Symlink_Mount_Point == Local_Path)) { + ret = (*iter)->Repair(); + found = true; + } else if ((*iter)->Is_SubPartition && (*iter)->SubPartition_Of == Local_Path) { + (*iter)->Repair(); + } + } + if (found) { + return ret; + } else if (Display_Error) { + LOGERR("Repair: Unable to find partition for path '%s'\n", Local_Path.c_str()); + } else { + LOGINFO("Repair: Unable to find partition for path '%s'\n", Local_Path.c_str()); + } + return false; +} + +int TWPartitionManager::Repair_By_Block(string Block, bool Display_Error) { + TWPartition* Part = Find_Partition_By_Block(Block); + + if (Part) { + if (Part->Has_SubPartition) { + std::vector::iterator subpart; + + for (subpart = Partitions.begin(); subpart != Partitions.end(); subpart++) { + if ((*subpart)->Is_SubPartition && (*subpart)->SubPartition_Of == Part->Mount_Point) + (*subpart)->Repair(); + } + return Part->Repair(); + } else + return Part->Repair(); + } + if (Display_Error) + LOGERR("Repair: Unable to find partition for block '%s'\n", Block.c_str()); + else + LOGINFO("Repair: Unable to find partition for block '%s'\n", Block.c_str()); + return false; +} + +int TWPartitionManager::Repair_By_Name(string Name, bool Display_Error) { + TWPartition* Part = Find_Partition_By_Name(Name); + + if (Part) { + if (Part->Has_SubPartition) { + std::vector::iterator subpart; + + for (subpart = Partitions.begin(); subpart != Partitions.end(); subpart++) { + if ((*subpart)->Is_SubPartition && (*subpart)->SubPartition_Of == Part->Mount_Point) + (*subpart)->Repair(); + } + return Part->Repair(); + } else + return Part->Repair(); + } + if (Display_Error) + LOGERR("Repair: Unable to find partition for name '%s'\n", Name.c_str()); + else + LOGINFO("Repair: Unable to find partition for name '%s'\n", Name.c_str()); + return false; +} + void TWPartitionManager::Refresh_Sizes(void) { Update_System_Details(); return; diff --git a/partitions.hpp b/partitions.hpp index 7341fe0b..73ff1fbc 100644 --- a/partitions.hpp +++ b/partitions.hpp @@ -55,6 +55,8 @@ public: bool Wipe(string New_File_System); // Wipes the partition bool Wipe(); // Wipes the partition bool Wipe_AndSec(); // Wipes android secure + bool Can_Repair(); // Checks to see if we have everything needed to be able to repair the current file system + bool Repair(); // Repairs the current file system bool Backup(string backup_folder); // Backs up the partition to the folder specified bool Check_MD5(string restore_folder); // Checks MD5 of a backup bool Restore(string restore_folder); // Restores the partition using the backup folder provided @@ -158,6 +160,7 @@ private: friend class TWPartitionManager; friend class DataManager; friend class GUIPartitionList; +friend class GUIAction; }; class TWPartitionManager @@ -191,6 +194,9 @@ public: int Wipe_By_Path(string Path); // Wipes a partition based on path int Wipe_By_Block(string Block); // Wipes a partition based on block device int Wipe_By_Name(string Name); // Wipes a partition based on display name + int Wipe_By_Path(string Path, string New_File_System); // Wipes a partition based on path + int Wipe_By_Block(string Block, string New_File_System); // Wipes a partition based on block device + int Wipe_By_Name(string Name, string New_File_System); // Wipes a partition based on display name int Factory_Reset(); // Performs a factory reset int Wipe_Dalvik_Cache(); // Wipes dalvik cache int Wipe_Rotate_Data(); // Wipes rotation data -- @@ -198,6 +204,9 @@ public: int Wipe_Android_Secure(); // Wipes android secure int Format_Data(); // Really formats data on /data/media devices -- also removes encryption int Wipe_Media_From_Data(); // Removes and recreates the media folder on /data/media devices + int Repair_By_Path(string Path, bool Display_Error); // Repairs a partition based on path + int Repair_By_Block(string Block, bool Display_Error); // Repairs a partition based on block device + int Repair_By_Name(string Name, bool Display_Error); // Repairs a partition based on display name void Refresh_Sizes(); // Refreshes size data of partitions void Update_System_Details(); // Updates fstab, file systems, sizes, etc. int Decrypt_Device(string Password); // Attempt to decrypt any encrypted partitions