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/portrait.xml b/gui/theme/common/portrait.xml
index 3960faf..9208a57 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -710,6 +710,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>
@@ -1013,8 +1016,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>
@@ -1581,6 +1589,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>
@@ -1693,6 +1713,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_half_height_full_width">
+ <placement x="%indent%" y="%row18a_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="backup_options">
<template name="page"/>
@@ -2232,6 +2295,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>
@@ -2679,6 +2754,10 @@
</conditions>
<placement x="%center_x%" y="%row18a_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>
@@ -3686,6 +3765,16 @@
<listbox style="advanced_listbox">
<placement x="%indent%" y="%row13a_y%" w="%content_width%" h="%listbox_advanced_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>
@@ -4700,10 +4789,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="%indent%" y="%row3_input_y%" w="%content_width%" h="%input_height%"/>
<text>%tw_crypto_display%</text>
@@ -4759,10 +4855,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_pattern=Enter Pattern.}</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_pattern_fbe=Enter Pattern for User [%tw_crypto_user_id%]}</text>
+ </text>
+
<text style="text_m_fail">
<condition var1="tw_password_fail" var2="1"/>
<placement x="%center_x%" y="%row3_y%" placement="5"/>
@@ -5323,5 +5426,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="%indent%" y="%row3_y%" w="%content_width%" h="%listbox_advanced_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_height">
+ <placement x="%center_x%" y="%row21a_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>