PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for multi-user decryption

Browse Source 
* Add CLI support using the command "twrp decrypt <PASSWORD> [USER ID]"
* Add GUI support using the menu Advanced --> Decrypt User

Change-Id: Id2681bc2b1012a0571417f7a6e0b980b1b25c61c
(cherry picked from commit 5a79f67a1b1bd1bcadeca0a4896a871646652534)
This commit is contained in:
Noah Jacobson
2019-04-28 00:10:07 -04:00
committed by bigbiff
parent 784073e9fe
commit 0b25b1d79b
18 changed files with 640 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
gui/listbox.cpp
View File

@@ -26,6 +26,7 @@ extern "C" {
#include "rapidxml.hpp"
#include "objects.hpp"
#include "../data.hpp"
#include "../partitions.hpp"
#include "pages.hpp"
extern std::vector<language_struct> Language_List;
@@ -82,10 +83,28 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIScrollList(node)
data.selected = 0;
mListItems.push_back(data);
}
} else if (mVariable == "tw_crypto_user_id") {
std::vector<users_struct>::iterator iter;
std::vector<users_struct>* Users_List = PartitionManager.Get_Users_List();
for (iter = Users_List->begin(); iter != Users_List->end(); iter++) {
if (!(*iter).isDecrypted) {
ListItem data;
data.displayName = (*iter).userName;
data.variableValue = (*iter).userId;
data.action = NULL;
DataManager::GetValue("tw_crypto_user_id", currentValue);
if (currentValue == (*iter).userId || currentValue == "") {
data.selected = 1;
DataManager::SetValue("tw_crypto_user_id", (*iter).userId);
DataManager::SetValue("tw_crypto_pwtype", (*iter).type);
} else
data.selected = 0;
mListItems.push_back(data);
}
}
}
}
else
allowSelection = false; // allows using listbox as a read-only list or menu
} else
allowSelection = false; // allows using listbox as a read-only list or menu
// Get the data for the list
child = FindNode(node, "listitem");
@@ -94,16 +113,14 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIScrollList(node)
ListItem item;
attr = child->first_attribute("name");
if (!attr)
continue;
if (!attr) continue;
// We will parse display names when we get page focus to ensure that translating takes place
item.displayName = attr->value();
item.variableValue = gui_parse_text(child->value());
item.selected = (child->value() == currentValue);
item.action = NULL;
xml_node<>* action = child->first_node("action");
if (!action)
action = child->first_node("actions");
if (!action) action = child->first_node("actions");
if (action) {
item.action = new GUIAction(child);
allowSelection = true;
@@ -122,7 +139,7 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIScrollList(node)
LoadConditions(child, item.mConditions);
mListItems.push_back(item);
mVisibleItems.push_back(mListItems.size()-1);
mVisibleItems.push_back(mListItems.size() - 1);
child = child->next_sibling("listitem");
}
@@ -137,6 +154,33 @@ int GUIListBox::Update(void)
if (!isConditionTrue())
return 0;
if (mVariable == "tw_crypto_user_id") {
mListItems.clear();
std::vector<users_struct>::iterator iter;
std::vector<users_struct>* Users_List = PartitionManager.Get_Users_List();
for (iter = Users_List->begin(); iter != Users_List->end(); iter++) {
if (!(*iter).isDecrypted) {
ListItem data;
data.displayName = (*iter).userName;
data.variableValue = (*iter).userId;
data.action = NULL;
DataManager::GetValue("tw_crypto_user_id", currentValue);
if (currentValue == (*iter).userId || currentValue == "") {
data.selected = 1;
DataManager::SetValue("tw_crypto_user_id", (*iter).userId);
DataManager::SetValue("tw_crypto_pwtype", (*iter).type);
} else
data.selected = 0;
mListItems.push_back(data);
}
}
mVisibleItems.clear();
for (size_t i = 0; i < mListItems.size(); i++) {
mVisibleItems.push_back(i);
}
mUpdate = 1;
}
GUIScrollList::Update();
if (mUpdate) {