Add support to change TWRP Folder
Change-Id: Id3b3b46d492bf83d1d9d3f535c880ea9d15b4107
diff --git a/gui/action.cpp b/gui/action.cpp
index 20c3074..b67b0da 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -242,6 +242,7 @@
ADD_ACTION(uninstalltwrpsystemapp);
ADD_ACTION(repackimage);
ADD_ACTION(fixabrecoverybootloop);
+ ADD_ACTION(applycustomtwrpfolder);
#ifndef TW_EXCLUDE_NANO
ADD_ACTION(editfile);
#endif
@@ -2287,3 +2288,36 @@
return 0;
}
#endif
+
+int GUIAction::applycustomtwrpfolder(string arg __unused)
+{
+ operation_start("ChangingTWRPFolder");
+ string storageFolder = DataManager::GetSettingsStoragePath();
+ string newFolder = storageFolder + '/' + arg;
+ string newBackupFolder = newFolder + "/BACKUPS/" + DataManager::GetStrValue("device_id");
+ string prevFolder = storageFolder + DataManager::GetStrValue(TW_RECOVERY_FOLDER_VAR);
+ bool ret = false;
+
+ if (TWFunc::Path_Exists(newFolder)) {
+ gui_msg(Msg(msg::kError, "tw_folder_exists=A folder with that name already exists!"));
+ } else {
+ ret = true;
+ }
+
+ if (newFolder != prevFolder && ret) {
+ ret = TWFunc::Exec_Cmd("mv -f \"" + prevFolder + "\" \"" + newFolder + '\"') != 0 ? false : true;
+ } else {
+ gui_msg(Msg(msg::kError, "tw_folder_exists=A folder with that name already exists!"));
+ }
+
+ if (ret) ret = TWFunc::Recursive_Mkdir("\"" + newBackupFolder + "\"") ? true : false;
+
+
+ if (ret) {
+ DataManager::SetValue(TW_RECOVERY_FOLDER_VAR, '/' + arg);
+ DataManager::SetValue(TW_BACKUPS_FOLDER_VAR, newBackupFolder);
+ DataManager::mBackingFile = newFolder + '/' + TW_SETTINGS_FILE;
+ }
+ operation_end((int)!ret);
+ return 0;
+}
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 0f2fae5..d4b42c2 100755
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -374,9 +374,11 @@
int enableadb(std::string arg);
int enablefastboot(std::string arg);
int changeterminal(std::string arg);
+ int applycustomtwrpfolder(std::string arg);
#ifndef TW_EXCLUDE_NANO
int editfile(std::string arg);
#endif
+
int simulate;
};
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index cf14ace..b8c2098 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -3627,6 +3627,10 @@
<listbox style="advanced_listbox">
<placement x="%center_x%" y="%row2_y%" w="%content_half_width%" h="%fileselector_install_height%"/>
+ <listitem name="{@change_twrp_folder_btn=Change TWRP folder}">
+ <condition var1="tw_is_encrypted" var2="0"/>
+ <action function="page">changeTwrpFolder</action>
+ </listitem>
<listitem name="{@decrypt_users=Decrypt Users}">
<conditions>
<condition var1="tw_is_fbe" var2="1"/>
@@ -5779,5 +5783,102 @@
<action function="page">advanced</action>
</action>
</page>
+
+ <page name="changeTwrpFolder">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@advanced_hdr=Advanced}</text>
+ </text>
+
+ <text style="text_m">
+ <placement x="%col1_x_header%" y="%row4_header_y%"/>
+ <text>{@change_twrp_folder_btn=Change TWRP folder}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <placement x="%col1_x_left%" y="%row2_y%"/>
+ <text>{@name=Name:}</text>
+ </text>
+
+ <input>
+ <placement x="%col1_x_left%" y="%row2_input_y%" w="%content_width%" h="%input_height%"/>
+ <text>%tw_custom_folder%</text>
+ <data name="tw_custom_folder"/>
+ <restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"/>
+ <actions>
+ <action function="set">tw_back=changeTwrpFolder</action>
+ <action function="set">tw_action=applycustomtwrpfolder</action>
+ <action function="set">tw_action_param=%tw_custom_folder%</action>
+ <action function="set">tw_text1={@confirm_action=Confirm}</action>
+ <action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+ <action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+ <action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} %tw_custom_folder%</action>
+ <action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+ <action function="set">tw_filecheck=/sdcard/%tw_custom_folder%</action>
+ <action function="set">tw_existpage=changeTwrpFolder</action>
+ <action function="set">tw_notexistpage=confirm_action</action>
+ <action function="page">filecheck</action>
+ </actions>
+ </input>
+
+ <fill color="%accent_color%">
+ <placement x="%col1_x_left%" y="row4_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <fill color="%text_fail_color%">
+ <condition var1="tw_fileexists" var2="1"/>
+ <placement x="%col1_x_left%" y="row4_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <text style="text_m_fail">
+ <condition var1="tw_fileexists" var2="1"/>
+ <placement x="%col1_x_left%" y="%row4_y%"/>
+ <text>{@tw_folder_exists=A folder with that name already exists!}</text>
+ </text>
+
+ <button style="main_button_half_width_low">
+ <placement x="%indent%" y="%row5_y%"/>
+ <text>{@cancel_btn=Cancel}</text>
+ <action function="page">advanced</action>
+ </button>
+
+ <button style="main_button_half_width_low">
+ <condition var1="tw_recovery_folder" op="!=" var2="/TWRP"/>
+ <placement x="%date_button_x%" y="%row5_y%"/>
+ <text>{@restore_defaults_btn=Restore Defaults}</text>
+ <actions>
+ <action function="set">tw_back=changeTwrpFolder</action>
+ <action function="set">tw_action=applycustomtwrpfolder</action>
+ <action function="set">tw_action_param=TWRP</action>
+ <action function="set">tw_text1={@confirm_action=Confirm}</action>
+ <action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+ <action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+ <action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} TWRP</action>
+ <action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+ <action function="set">tw_filecheck=/sdcard/TWRP</action>
+ <action function="set">tw_existpage=changeTwrpFolder</action>
+ <action function="set">tw_notexistpage=confirm_action</action>
+ <action function="page">filecheck</action>
+ </actions>
+ </button>
+
+ <template name="keyboardtemplate"/>
+
+ <action>
+ <touch key="home"/>
+ <actions>
+ <action function="page">main</action>
+ </actions>
+ </action>
+
+ <action>
+ <touch key="back"/>
+ <actions>
+ <action function="page">advanced</action>
+ </actions>
+ </action>
+ </page>
</pages>
</recovery>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 3fd485d..3bc7a14 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -754,5 +754,9 @@
<string name="rescue_party3"> 3. Clean-flash your ROM.</string>
<string name="rescue_party4">The reported problem is: </string>
<string name="restore_system_context">Unable to get default context for {1} -- Android may not boot.</string>
+ <string name="change_twrp_folder_btn">Change TWRP folder</string>
+ <string name="change_twrp_folder_on_process">Changing TWRP folder</string>
+ <string name="change_twrp_folder_after_process">TWRP folder changed to</string>
+ <string name="tw_folder_exists">A folder with that name already exists!</string>
</resources>
</language>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index de985a6..aa078b9 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3749,6 +3749,10 @@
<listbox style="advanced_listbox">
<placement x="%indent%" y="%row13a_y%" w="%content_width%" h="%listbox_advanced_height%"/>
+ <listitem name="Change TWRP Folder">
+ <condition var1="tw_is_encrypted" var2="0"/>
+ <action function="page">changeTwrpFolder</action>
+ </listitem>
<listitem name="{@decrypt_users=Decrypt Users}">
<conditions>
<condition var1="tw_is_fbe" var2="1"/>
@@ -5507,5 +5511,104 @@
<action function="page">advanced</action>
</action>
</page>
+
+ <page name="changeTwrpFolder">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@advanced_hdr=Advanced}</text>
+ </text>
+
+ <text style="text_m">
+ <placement x="%col1_x_header%" y="%row4_header_y%"/>
+ <text>{@change_twrp_folder_btn=Change TWRP folder}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <placement x="%indent%" y="%row2_y%"/>
+ <text>{@name=Name:}</text>
+ </text>
+
+ <input>
+ <placement x="%indent%" y="%row2_input_y%" w="%content_width%" h="%input_height%"/>
+ <text>%tw_custom_folder%</text>
+ <data name="tw_custom_folder"/>
+ <restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"/>
+ <actions>
+ <action function="set">tw_back=changeTwrpFolder</action>
+ <action function="set">tw_action=applycustomtwrpfolder</action>
+ <action function="set">tw_action_param=%tw_custom_folder%</action>
+ <action function="set">tw_text1={@confirm_action=Confirm}</action>
+ <action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+ <action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+ <action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} %tw_custom_folder%</action>
+ <action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+ <action function="set">tw_filecheck=/sdcard/%tw_custom_folder%</action>
+ <action function="set">tw_existpage=changeTwrpFolder</action>
+ <action function="set">tw_notexistpage=confirm_action</action>
+ <action function="page">filecheck</action>
+ </actions>
+ </input>
+
+ <fill color="%accent_color%">
+ <placement x="%indent%" y="row4_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <fill color="%text_fail_color%">
+ <condition var1="tw_fileexists" var2="1"/>
+ <placement x="%indent%" y="row4_y" w="%content_width%" h="input_line_width" placement="1"/>
+ </fill>
+
+ <text style="text_m_fail">
+ <condition var1="tw_fileexists" var2="1"/>
+ <placement x="%indent%" y="%row4a_y%"/>
+ <text>{@tw_folder_exists=A folder with that name already exists!}</text>
+ </text>
+
+ <button style="main_button_half_height">
+ <placement x="%indent%" y="%row10_y%"/>
+ <text>{@cancel_btn=Cancel}</text>
+ <actions>
+ <action function="page">advanced</action>
+ </actions>
+ </button>
+
+ <button style="main_button_half_height">
+ <condition var1="tw_recovery_folder" op="!=" var2="/TWRP"/>
+ <placement x="%center_x%" y="%row10_y%"/>
+ <text>{@restore_defaults_btn=Restore Defaults}</text>
+ <actions>
+ <action function="set">tw_back=changeTwrpFolder</action>
+ <action function="set">tw_action=applycustomtwrpfolder</action>
+ <action function="set">tw_action_param=TWRP</action>
+ <action function="set">tw_text1={@confirm_action=Confirm}</action>
+ <action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+ <action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+ <action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} TWRP</action>
+ <action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+ <action function="set">tw_filecheck=/sdcard/TWRP</action>
+ <action function="set">tw_existpage=changeTwrpFolder</action>
+ <action function="set">tw_notexistpage=confirm_action</action>
+ <action function="page">filecheck</action>
+ </actions>
+ </button>
+
+ <template name="keyboardtemplate"/>
+
+ <action>
+ <touch key="home"/>
+ <actions>
+ <action function="page">main</action>
+ </actions>
+ </action>
+
+ <action>
+ <touch key="back"/>
+ <actions>
+ <action function="page">advanced</action>
+ </actions>
+ </action>
+ </page>
</pages>
</recovery>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 5520a35..6dd019f 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -4232,6 +4232,10 @@
<listbox style="advanced_listbox">
<placement x="%indent%" y="%row2_header_y%" w="%content_width%" h="%fileselector_install_height%"/>
+ <listitem name="{@change_twrp_folder_btn=Change TWRP folder}">
+ <condition var1="tw_is_encrypted" var2="0"/>
+ <action function="page">changeTwrpFolder</action>
+ </listitem>
<listitem name="{@decrypt_users=Decrypt Users}">
<conditions>
<condition var1="tw_is_fbe" var2="1"/>
@@ -5880,5 +5884,99 @@
<action function="page">advanced</action>
</action>
</page>
+
+ <page name="changeTwrpFolder">
+ <template name="page"/>
+
+ <template name="statusbar"/>
+
+ <text style="text_m">
+ <placement x="%col1_x_left%" y="%row1_header_y%"/>
+ <text>{@change_twrp_folder_btn=Change TWRP folder}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <placement x="%col1_x_left%" y="%row1_y%"/>
+ <text>{@name=Name:}</text>
+ </text>
+
+ <input>
+ <placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%input_height%"/>
+ <text>%tw_custom_folder%</text>
+ <data name="tw_custom_folder"/>
+ <restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"/>
+ <actions>
+ <action function="set">tw_back=changeTwrpFolder</action>
+ <action function="set">tw_action=applycustomtwrpfolder</action>
+ <action function="set">tw_action_param=%tw_custom_folder%</action>
+ <action function="set">tw_text1={@confirm_action=Confirm}</action>
+ <action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+ <action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+ <action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} %tw_custom_folder%</action>
+ <action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+ <action function="set">tw_filecheck=/sdcard/%tw_custom_folder%</action>
+ <action function="set">tw_existpage=changeTwrpFolder</action>
+ <action function="set">tw_notexistpage=confirm_action</action>
+ <action function="page">filecheck</action>
+ </actions>
+ </input>
+
+ <fill color="%accent_color%">
+ <placement x="%col1_x_left%" y="%row3_input_y%" w="%content_width%" h="%input_line_width%" placement="1"/>
+ </fill>
+
+ <fill color="%text_fail_color%">
+ <condition var1="tw_fileexists" var2="1"/>
+ <placement x="%col1_x_left%" y="%row3_input_y%" w="%content_width%" h="%input_line_width%" placement="1"/>
+ </fill>
+
+ <text style="text_m_fail">
+ <condition var1="tw_fileexists" var2="1"/>
+ <placement x="%col1_x_left%" y="%row3_input_y%"/>
+ <text>{@tw_folder_exists=A folder with that name already exists!}</text>
+ </text>
+
+ <button style="main_button_half_width_low">
+ <placement x="%col1_x_left%" y="%row4_y%"/>
+ <text>{@cancel_btn=Cancel}</text>
+ <action function="page">advanced2</action>
+ </button>
+
+ <button style="main_button_half_height">
+ <condition var1="tw_recovery_folder" op="!=" var2="/TWRP"/>
+ <placement x="%col1_x_right%" y="%row4_y%"/>
+ <text>{@restore_defaults_btn=Restore Defaults}</text>
+ <actions>
+ <action function="set">tw_back=changeTwrpFolder</action>
+ <action function="set">tw_action=applycustomtwrpfolder</action>
+ <action function="set">tw_action_param=TWRP</action>
+ <action function="set">tw_text1={@confirm_action=Confirm}</action>
+ <action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+ <action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+ <action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} TWRP</action>
+ <action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+ <action function="set">tw_filecheck=/sdcard/TWRP</action>
+ <action function="set">tw_existpage=changeTwrpFolder</action>
+ <action function="set">tw_notexistpage=confirm_action</action>
+ <action function="page">filecheck</action>
+ </actions>
+ </button>
+
+ <template name="keyboardtemplate"/>
+
+ <action>
+ <touch key="home"/>
+ <actions>
+ <action function="page">main</action>
+ </actions>
+ </action>
+
+ <action>
+ <touch key="back"/>
+ <actions>
+ <action function="page">advanced2</action>
+ </actions>
+ </action>
+ </page>
</pages>
</recovery>