Add support for multi-user decryption
* Add CLI support using the command "twrp decrypt <PASSWORD> [USER ID]"
* Add GUI support using the menu Advanced --> Decrypt User
multiuser: Parse users only when Decrypt_DE runs successfully
multiuser: Warn when not all users are decrypted
Change-Id: Ia5e943b13c2d5ec5c34ae97661133c19ff471e6d
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 3fbac9e..7eaf622 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -759,6 +759,9 @@
<action function="set">tw_cancel_param=</action>
<action function="set">tw_show_exclamation=0</action>
<action function="set">tw_show_reboot=0</action>
+ <action function="set">tw_crypto_user_id=</action>
+ <action function="set">tw_multiuser_warning_accepted=</action>
+ <action function="set">tw_multiuser_warning_destination=</action>
<action function="page">%tw_clear_destination%</action>
</action>
</page>
@@ -1062,8 +1065,13 @@
</text>
<text style="text_m_accent">
- <condition var1="tw_has_data_media" var2="1"/>
<placement x="%center_x%" y="%row3_y%" placement="5"/>
+ <text>{@factory_reset5=(not including users/lockscreen)}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <condition var1="tw_has_data_media" var2="1"/>
+ <placement x="%center_x%" y="%row4_y%" placement="5"/>
<text>{@factory_reset2=(not including internal storage)}</text>
</text>
@@ -1625,6 +1633,18 @@
<page name="backup">
<template name="page"/>
+ <action>
+ <conditions>
+ <condition var1="tw_is_fbe" var2="1"/>
+ <condition var1="tw_all_users_decrypted" var2="0"/>
+ <condition var1="tw_multiuser_warning_accepted" op="!=" var2="1"/>
+ </conditions>
+ <actions>
+ <action function="set">tw_multiuser_warning_destination=backup</action>
+ <action function="page">multiuser_warning</action>
+ </actions>
+ </action>
+
<text style="text_l">
<placement x="%col1_x_header%" y="%row3_header_y%"/>
<text>{@backup_hdr=Backup}</text>
@@ -1761,6 +1781,49 @@
</action>
</page>
+ <page name="multiuser_warning">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@multiuser_warning_hdr=Multiuser Warning}</text>
+ </text>
+
+ <text style="text_m_fail">
+ <placement x="%center_x%" y="%row7_y%" placement="5"/>
+ <text>{@multiuser_warning1=Not all users decrypted!}</text>
+ </text>
+
+ <text style="text_m_fail">
+ <placement x="%center_x%" y="%row8_y%" placement="5"/>
+ <text>{@multiuser_warning2=Backup/restore operations may fail!}</text>
+ </text>
+
+ <button style="main_button_m">
+ <placement x="%col1_x_left%" y="%row15a_y%"/>
+ <text>{@decrypt_users=Decrypt Users}</text>
+ <action function="page">decrypt_users</action>
+ </button>
+
+ <slider>
+ <text>{@multiuser_warning_accept=Continue Anyway}</text>
+ <actions>
+ <action function="set">tw_multiuser_warning_accepted=1</action>
+ <action function="page">%tw_multiuser_warning_destination%</action>
+ </actions>
+ </slider>
+
+ <action>
+ <touch key="home"/>
+ <action function="page">main</action>
+ </action>
+
+ <action>
+ <touch key="back"/>
+ <action function="page">main</action>
+ </action>
+ </page>
+
<page name="backupname1">
<action>
<condition var1="tw_backup_name" op="=" var2="{@auto_generate=(Auto Generate)}"/>
@@ -2071,6 +2134,18 @@
<page name="restore">
<template name="page"/>
+ <action>
+ <conditions>
+ <condition var1="tw_is_fbe" var2="1"/>
+ <condition var1="tw_all_users_decrypted" var2="0"/>
+ <condition var1="tw_multiuser_warning_accepted" op="!=" var2="1"/>
+ </conditions>
+ <actions>
+ <action function="set">tw_multiuser_warning_destination=restore</action>
+ <action function="page">multiuser_warning</action>
+ </actions>
+ </action>
+
<text style="text_l">
<placement x="%col1_x_header%" y="%row3_header_y%"/>
<text>{@restore_hdr=Restore}</text>
@@ -2523,6 +2598,10 @@
</conditions>
<placement x="%col2_x_left%" y="%row15a_y%"/>
<text>{@decrypt_data_btn=Decrypt Data}</text>
+ <action function="set">tw_crypto_user_id=0</action>
+ <action function="set">tw_crypto_password=</action>
+ <action function="set">tw_password_fail=0</action>
+ <action function="set">tw_crypto_pwtype=%tw_crypto_pwtype_0%</action>
<action function="page">decrypt</action>
</button>
@@ -3564,6 +3643,16 @@
<listbox style="advanced_listbox">
<placement x="%center_x%" y="%row2_y%" w="%content_half_width%" h="%fileselector_install_height%"/>
+ <listitem name="{@decrypt_users=Decrypt Users}">
+ <conditions>
+ <condition var1="tw_is_fbe" var2="1"/>
+ <condition var1="tw_all_users_decrypted" var2="0"/>
+ </conditions>
+ <actions>
+ <action function="set">tw_crypto_user_id=</action>
+ <action function="page">decrypt_users</action>
+ </actions>
+ </listitem>
<listitem name="{@reload_theme_btn=Reload Theme}">
<action function="reload"/>
</listitem>
@@ -4577,10 +4666,17 @@
</text>
<text style="text_m_accent">
+ <condition var1="tw_is_fbe" op="!=" var2="1"/>
<placement x="%center_x%" y="%row2_y%" placement="5"/>
<text>{@decrypt_data_enter_pass=Enter Password:}</text>
</text>
+ <text style="text_m_accent">
+ <condition var1="tw_is_fbe" var2="1"/>
+ <placement x="%center_x%" y="%row2_y%" placement="5"/>
+ <text>{@decrypt_data_enter_pass_fbe=Enter Password for User [%tw_crypto_user_id%]}</text>
+ </text>
+
<input>
<placement x="%col1_x_left%" y="%row3_input_y%" w="%content_width%" h="%input_height%"/>
<text>%tw_crypto_display%</text>
@@ -5601,5 +5697,44 @@
<action function="screenshot"/>
</action>
</page>
+
+ <page name="decrypt_users">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@decrypt_users=Decrypt Users}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <placement x="%center_x%" y="%row2_y%" placement="5"/>
+ <text>{@decrypt_users_selection=Select a user ID to decrypt}</text>
+ </text>
+
+ <listbox>
+ <placement x="%col1_x_left%" y="%row1a_y%" w="%content_width%" h="%partitionlist_mount_height%"/>
+ <text>{@select_user=Select User}</text>
+ <icon selected="radio_true" unselected="radio_false" />
+ <data name="tw_crypto_user_id" />
+ </listbox>
+
+ <button style="main_button_half_width">
+ <placement x="%col2_x_right%" y="%row15a_y%"/>
+ <text>{@decrypt_users=Decrypt Users}</text>
+ <action function="set">tw_crypto_password=</action>
+ <action function="set">tw_password_fail=0</action>
+ <action function="page">decrypt</action>
+ </button>
+
+ <action>
+ <touch key="home"/>
+ <action function="page">main</action>
+ </action>
+
+ <action>
+ <touch key="back"/>
+ <action function="page">advanced</action>
+ </action>
+ </page>
</pages>
</recovery>