From 83bd483f3db1df4b69c1612030e1a1be05b303ad Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Sat, 4 May 2013 12:39:56 +0000 Subject: Support encrypted backup files Also includes features merged from: Update twrpTar by kokotas Revised function entryExists(). Added function to get archive's uncompressed size. Added option to exclude item(s) from the archive. Revised forks() http://review.teamw.in/#/c/590/ Change-Id: I01fa2c81643161984eff2625247af75990684bd9 --- gui/action.cpp | 37 +++- gui/devices/1024x600/res/ui.xml | 301 +++++++++++++++++++++++++++- gui/devices/1024x768/res/ui.xml | 301 +++++++++++++++++++++++++++- gui/devices/1080x1920/res/ui.xml | 325 +++++++++++++++++++++++++++++- gui/devices/1280x800/res/ui.xml | 301 +++++++++++++++++++++++++++- gui/devices/1920x1200/res/ui.xml | 301 +++++++++++++++++++++++++++- gui/devices/2560x1600/res/ui.xml | 416 +++++++++++++++++++++++++++++++-------- gui/devices/320x480/res/ui.xml | 327 +++++++++++++++++++++++++++++- gui/devices/480x800/res/ui.xml | 327 +++++++++++++++++++++++++++++- gui/devices/480x854/res/ui.xml | 327 +++++++++++++++++++++++++++++- gui/devices/540x960/res/ui.xml | 327 +++++++++++++++++++++++++++++- gui/devices/720x1280/res/ui.xml | 327 +++++++++++++++++++++++++++++- gui/devices/800x1280/res/ui.xml | 327 +++++++++++++++++++++++++++++- gui/devices/800x480/res/ui.xml | 301 +++++++++++++++++++++++++++- 14 files changed, 4083 insertions(+), 162 deletions(-) (limited to 'gui') diff --git a/gui/action.cpp b/gui/action.cpp index 64049b2c1..9bd5ce5fb 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -405,6 +406,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) } } operation_end(ret_val, simulate); + return 0; } if (function == "readBackup") @@ -494,6 +496,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) PartitionManager.Mount_Current_Storage(true); } operation_end(0, simulate); + return 0; } if (function == "copylog") @@ -705,6 +708,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) operation_end(0, simulate); else operation_end(1, simulate); + return 0; } if (function == "flash") @@ -863,6 +867,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) } else PartitionManager.Update_System_Details(); operation_end(0, simulate); + return 0; } if (function == "nandroid") { @@ -893,12 +898,13 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) return -1; } } + DataManager::SetValue("tw_encrypt_backup", 0); if (ret == false) ret = 1; // 1 for failure else ret = 0; // 0 for success - operation_end(ret, simulate); - return 0; + operation_end(ret, simulate); + return 0; } if (function == "fixpermissions") { @@ -1226,6 +1232,7 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) DataManager::SetValue("tw_page_done", 1); } } + return 0; } if (function == "installsu") { @@ -1254,16 +1261,38 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) op_status = 1; } + operation_end(op_status, simulate); + return 0; + } + if (function == "decrypt_backup") + { + int op_status = 0; + + operation_start("Try Restore Decrypt"); + if (simulate) { + simulate_progress_bar(); + } else { + string Restore_Path, Filename, Password; + DataManager::GetValue("tw_restore", Restore_Path); + Restore_Path += "/"; + DataManager::GetValue("tw_restore_password", Password); + if (TWFunc::Try_Decrypting_Backup(Restore_Path, Password)) + op_status = 0; // success + else + op_status = 1; // fail + } + operation_end(op_status, simulate); return 0; } } else { - pthread_t t; - pthread_create(&t, NULL, thread_start, this); + pthread_t t; + pthread_create(&t, NULL, thread_start, this); return 0; } + LOGERR("Unknown action '%s'\n", function.c_str()); return -1; } diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index b24bda381..4835d8294 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -183,7 +183,7 @@ - + @@ -191,6 +191,7 @@ + @@ -1667,6 +1668,36 @@ + + + + + + + + + + No Encryption + + backupencryption + + + + + + + + + + + + + Using Encryption + + backupencryption + + + @@ -1787,6 +1818,140 @@ + + + + + + + Encrypt your backup? Please enter a password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1855,7 +2020,7 @@ - restore_select + restore_read @@ -1872,6 +2037,138 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup encrypted. Please enter your password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 5b9c3fcc5..dd53da410 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -183,7 +183,7 @@ - + @@ -191,6 +191,7 @@ + @@ -1667,6 +1668,36 @@ + + + + + + + + + + No Encryption + + backupencryption + + + + + + + + + + + + + Using Encryption + + backupencryption + + + @@ -1787,6 +1818,140 @@ + + + + + + + Encrypt your backup? Please enter a password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1855,7 +2020,7 @@ - restore_select + restore_read @@ -1872,6 +2037,138 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup encrypted. Please enter your password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml index 625cad83d..1c757fa19 100644 --- a/gui/devices/1080x1920/res/ui.xml +++ b/gui/devices/1080x1920/res/ui.xml @@ -1338,15 +1338,21 @@ - - - + + + + + Backup Name: %tw_backup_name% + + tw_fileexists=0 + backupname1 + - +
Select Partitions to Back Up: @@ -1359,14 +1365,33 @@
+ + + + - Set Backup Name + No Encryption - tw_fileexists=0 - backupname1 + backupencryption + + + + + + + + + + + + + Using Encryption + + tw_password_not_match=0 + backupencryption @@ -1508,6 +1533,152 @@ + + + + + + + Encrypt your backup? + + + + + + Please Enter A Password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? + + + + + + Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1574,7 +1745,7 @@ - restore_select + restore_read @@ -1591,6 +1762,144 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup Encrypted + + + + + + Please Enter Your Password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index 3ffa79dee..8babda141 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -183,7 +183,7 @@ - + @@ -191,6 +191,7 @@ + @@ -1667,6 +1668,36 @@ + + + + + + + + + + No Encryption + + backupencryption + + + + + + + + + + + + + Using Encryption + + backupencryption + + + @@ -1787,6 +1818,140 @@ + + + + + + + Encrypt your backup? Please enter a password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1855,7 +2020,7 @@ - restore_select + restore_read @@ -1872,6 +2037,138 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup encrypted. Please enter your password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index af9aba6a7..0cc4d7e03 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -183,7 +183,7 @@ - + @@ -191,6 +191,7 @@ + @@ -1667,6 +1668,36 @@ + + + + + + + + + + No Encryption + + backupencryption + + + + + + + + + + + + + Using Encryption + + backupencryption + + + @@ -1787,6 +1818,140 @@ + + + + + + + Encrypt your backup? Please enter a password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1855,7 +2020,7 @@ - restore_select + restore_read @@ -1872,6 +2037,138 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup encrypted. Please enter your password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index 12c032bd0..c9e6c6960 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -183,7 +183,7 @@ - + @@ -191,6 +191,7 @@ + @@ -1667,6 +1668,36 @@ + + + + + + + + + + No Encryption + + backupencryption + + + + + + + + + + + + + Using Encryption + + backupencryption + + + @@ -1787,6 +1818,140 @@ + + + + + + + Encrypt your backup? Please enter a password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1855,7 +2020,7 @@ - restore_select + restore_read @@ -1872,6 +2037,138 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup encrypted. Please enter your password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + @@ -2297,100 +2594,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 - - - - - - 180 - - tw_screen_timeout_secs=180 - - - - - - - Brightness: %tw_brightness_display% - - - - - - - 25% - - - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - + + + + + + + Screen timeout in seconds: + - + - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + + + + + Brightness: %tw_brightness_pct%% + + + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index 66865a7c4..6d258b067 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -169,7 +169,7 @@ - + @@ -1325,15 +1325,21 @@ - - - + + + + + Backup Name: %tw_backup_name% + + tw_fileexists=0 + backupname1 + - +
Select Partitions to Back Up: @@ -1346,14 +1352,33 @@
+ + + + - Set Backup Name + No Encryption - tw_fileexists=0 - backupname1 + backupencryption + + + + + + + + + + + + + Using Encryption + + tw_password_not_match=0 + backupencryption @@ -1495,6 +1520,152 @@ + + + + + + + Encrypt your backup? + + + + + + Please Enter A Password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? + + + + + + Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1561,7 +1732,7 @@ - restore_select + restore_read @@ -1578,6 +1749,144 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup Encrypted + + + + + + Please Enter Your Password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index e33e5b1dd..fdebf15f1 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -169,7 +169,7 @@ - + @@ -1325,15 +1325,21 @@ - - - + + + + + Backup Name: %tw_backup_name% + + tw_fileexists=0 + backupname1 + - +
Select Partitions to Back Up: @@ -1346,14 +1352,33 @@
+ + + + - Set Backup Name + No Encryption - tw_fileexists=0 - backupname1 + backupencryption + + + + + + + + + + + + + Using Encryption + + tw_password_not_match=0 + backupencryption @@ -1495,6 +1520,152 @@ + + + + + + + Encrypt your backup? + + + + + + Please Enter A Password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? + + + + + + Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1561,7 +1732,7 @@ - restore_select + restore_read @@ -1578,6 +1749,144 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup Encrypted + + + + + + Please Enter Your Password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index e4487f65c..b2a5f4c6d 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -168,7 +168,7 @@ - + @@ -1324,15 +1324,21 @@ - - - + + + + + Backup Name: %tw_backup_name% + + tw_fileexists=0 + backupname1 + - +
Select Partitions to Back Up: @@ -1345,14 +1351,33 @@
+ + + + - Set Backup Name + No Encryption - tw_fileexists=0 - backupname1 + backupencryption + + + + + + + + + + + + + Using Encryption + + tw_password_not_match=0 + backupencryption @@ -1494,6 +1519,152 @@ + + + + + + + Encrypt your backup? + + + + + + Please Enter A Password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? + + + + + + Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1560,7 +1731,7 @@ - restore_select + restore_read @@ -1577,6 +1748,144 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup Encrypted + + + + + + Please Enter Your Password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index 6ea2e1c64..c6b0c9252 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -169,7 +169,7 @@ - + @@ -1325,15 +1325,21 @@ - - - + + + + + Backup Name: %tw_backup_name% + + tw_fileexists=0 + backupname1 + - +
Select Partitions to Back Up: @@ -1346,14 +1352,33 @@
+ + + + - Set Backup Name + No Encryption - tw_fileexists=0 - backupname1 + backupencryption + + + + + + + + + + + + + Using Encryption + + tw_password_not_match=0 + backupencryption @@ -1495,6 +1520,152 @@ + + + + + + + Encrypt your backup? + + + + + + Please Enter A Password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? + + + + + + Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1561,7 +1732,7 @@ - restore_select + restore_read @@ -1578,6 +1749,144 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup Encrypted + + + + + + Please Enter Your Password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index d43aae95d..548111461 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -174,7 +174,7 @@ - + @@ -1338,15 +1338,21 @@ - - - + + + + + Backup Name: %tw_backup_name% + + tw_fileexists=0 + backupname1 + - +
Select Partitions to Back Up: @@ -1359,14 +1365,33 @@
+ + + + - Set Backup Name + No Encryption - tw_fileexists=0 - backupname1 + backupencryption + + + + + + + + + + + + + Using Encryption + + tw_password_not_match=0 + backupencryption @@ -1508,6 +1533,152 @@ + + + + + + + Encrypt your backup? + + + + + + Please Enter A Password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? + + + + + + Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1574,7 +1745,7 @@ - restore_select + restore_read @@ -1591,6 +1762,144 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup Encrypted + + + + + + Please Enter Your Password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index f7226f0fa..a6931b238 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -170,7 +170,7 @@ - + @@ -1326,15 +1326,21 @@ - - - + + + + + Backup Name: %tw_backup_name% + + tw_fileexists=0 + backupname1 + - +
Select Partitions to Back Up: @@ -1347,14 +1353,33 @@
+ + + + - Set Backup Name + No Encryption - tw_fileexists=0 - backupname1 + backupencryption + + + + + + + + + + + + + Using Encryption + + tw_password_not_match=0 + backupencryption @@ -1496,6 +1521,152 @@ + + + + + + + Encrypt your backup? + + + + + + Please Enter A Password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? + + + + + + Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1562,7 +1733,7 @@ - restore_select + restore_read @@ -1579,6 +1750,144 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup Encrypted + + + + + + Please Enter Your Password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index bb324dffd..562cb169e 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -183,7 +183,7 @@ - + @@ -191,6 +191,7 @@ + @@ -1675,6 +1676,36 @@ + + + + + + + + + + No Encryption + + backupencryption + + + + + + + + + + + + + Using Encryption + + backupencryption + + + @@ -1795,6 +1826,140 @@ + + + + + + + Encrypt your backup? Please enter a password: + + + + + + + + %tw_backup_encrypt_display% + + + backupencryption2 + + + + + + + Passwords Do Not Match + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + + + Encrypt your backup? Please Enter Password Again: + + + + + + + + %tw_backup_encrypt_display2% + + + + checkbackuppassword + + + + + + + + Cancel + + + tw_encrypt_backup=0 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backup + + + + + + + + main + + + + + backup + + + + + + + + + + tw_encrypt_backup=1 + backup + + + + + + + tw_encrypt_backup=0 + tw_password_not_match=1 + tw_backup_password= + tw_backup_password2= + tw_backup_encrypt_display= + tw_backup_encrypt_display2= + backupencryption + + + + @@ -1863,7 +2028,7 @@ - restore_select + restore_read @@ -1880,6 +2045,138 @@ + + + + + tw_password_fail=0 + restore_decrypt + + + + + + + restore_select + + + + + + + + + + + Backup encrypted. Please enter your password: + + + + + + + + %tw_restore_display% + + + + try_restore_decrypt + + + + + + + + Password Failed, Please Try Again + + + + + + + Cancel + + + tw_page_done=1 + restore + + + + + + + + Delete + + + tw_back=restore + tw_action=cmd + tw_action_param=cd %tw_backups_folder% && rm -rf "%tw_restore_name%" + tw_text1=Delete Backup? %tw_restore_name% + tw_text2=This cannot be undone! + tw_action_text1=Deleting Backup... + tw_complete_text1=Backup Delete Complete + tw_slider_text=Swipe to Delete + confirm_action + + + + + + + + main + + + + + restore + + + + + + + + + + + + Trying Decryption with Your Password + + + + + + + + + + + + + + + + + tw_password_fail=1 + restore_decrypt + + + + + + + + + + tw_page_done=1 + restore_select + + + + -- cgit v1.2.3