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

Add option to uninstall TWRP app from /system

Browse Source 
Change-Id: Ibe372a372333c357810be2afcb3796723ca370cb
This commit is contained in:
Ethan Yonker
2019-05-16 19:07:06 +02:00
committed by Dees Troy
parent 9f5dd3139e
commit 76bbd3a11a
10 changed files with 121 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data.cpp
+2
View File
@@ -909,11 +909,13 @@ void DataManager::SetDefaultValues()
#ifdef TW_OEM_BUILD
LOGINFO("TW_OEM_BUILD := true\n");
mConst.SetValue("tw_oem_build", "1");
mConst.SetValue("tw_app_installed_in_system", "0");
#else
mConst.SetValue("tw_oem_build", "0");
mPersist.SetValue("tw_app_prompt", "1");
mPersist.SetValue("tw_app_install_system", "1");
mData.SetValue("tw_app_install_status", "0"); // 0 = no status, 1 = not installed, 2 = already installed
mData.SetValue("tw_app_installed_in_system", "0");
#endif
mData.SetValue("tw_enable_adb_backup", "0");
gui/action.cpp
+57 -13
View File
@@ -231,6 +231,7 @@ GUIAction::GUIAction(xml_node<>* node)
ADD_ACTION(twcmd);
ADD_ACTION(setbootslot);
ADD_ACTION(installapp);
ADD_ACTION(uninstalltwrpsystemapp);
ADD_ACTION(repackimage);
ADD_ACTION(fixabrecoverybootloop);
}
@@ -1919,19 +1920,9 @@ int GUIAction::checkforapp(std::string arg __unused)
DataManager::SetValue("tw_app_install_status", 1); // 0 = no status, 1 = not installed, 2 = already installed or do not install
goto exit;
}
if (PartitionManager.Mount_By_Path(PartitionManager.Get_Android_Root_Path(), false)) {
string base_path = PartitionManager.Get_Android_Root_Path();
if (TWFunc::Path_Exists(PartitionManager.Get_Android_Root_Path() + "/system"))
base_path += "/system"; // For devices with system as a root file system (e.g. Pixel)
string install_path = base_path + "/priv-app";
if (!TWFunc::Path_Exists(install_path))
install_path = base_path + "/app";
install_path += "/twrpapp";
if (TWFunc::Path_Exists(install_path)) {
LOGINFO("App found at '%s'\n", install_path.c_str());
DataManager::SetValue("tw_app_install_status", 2); // 0 = no status, 1 = not installed, 2 = already installed or do not install
goto exit;
}
if (TWFunc::Is_TWRP_App_In_System()) {
DataManager::SetValue("tw_app_install_status", 2); // 0 = no status, 1 = not installed, 2 = already installed or do not install
goto exit;
}
if (PartitionManager.Mount_By_Path("/data", false)) {
const char parent_path[] = "/data/app";
@@ -2058,6 +2049,59 @@ exit:
return 0;
}
int GUIAction::uninstalltwrpsystemapp(std::string arg __unused)
{
int op_status = 1;
operation_start("Uninstall TWRP System App");
if (!simulate)
{
int Mount_System_RO = DataManager::GetIntValue("tw_mount_system_ro");
TWPartition* Part = PartitionManager.Find_Partition_By_Path(PartitionManager.Get_Android_Root_Path());
if (!Part) {
LOGERR("Unabled to find system partition.\n");
goto exit;
}
if (!Part->UnMount(true)) {
goto exit;
}
if (Mount_System_RO > 0) {
DataManager::SetValue("tw_mount_system_ro", 0);
Part->Change_Mount_Read_Only(false);
}
if (Part->Mount(true)) {
string base_path = PartitionManager.Get_Android_Root_Path();
if (TWFunc::Path_Exists(PartitionManager.Get_Android_Root_Path() + "/system"))
base_path += "/system"; // For devices with system as a root file system (e.g. Pixel)
string uninstall_path = base_path + "/priv-app";
if (!TWFunc::Path_Exists(uninstall_path))
uninstall_path = base_path + "/app";
uninstall_path += "/twrpapp";
if (TWFunc::Path_Exists(uninstall_path)) {
LOGINFO("Uninstalling TWRP App from '%s'\n", uninstall_path.c_str());
if (TWFunc::removeDir(uninstall_path, false) == 0) {
sync();
op_status = 0;
DataManager::SetValue("tw_app_installed_in_system", 0);
DataManager::SetValue("tw_app_install_status", 0);
} else {
LOGERR("Unable to remove TWRP app from system.\n");
}
} else {
LOGINFO("didn't find TWRP app in '%s'\n", uninstall_path.c_str());
}
}
Part->UnMount(true);
if (Mount_System_RO > 0) {
DataManager::SetValue("tw_mount_system_ro", Mount_System_RO);
Part->Change_Mount_Read_Only(true);
}
} else
simulate_progress_bar();
exit:
operation_end(0);
return 0;
}
int GUIAction::repackimage(std::string arg __unused)
{
int op_status = 1;
gui/objects.hpp
+1
View File
@@ -367,6 +367,7 @@ protected:
int twcmd(std::string arg);
int setbootslot(std::string arg);
int installapp(std::string arg);
int uninstalltwrpsystemapp(std::string arg);
int repackimage(std::string arg);
int fixabrecoverybootloop(std::string arg);
gui/theme/common/landscape.xml
+12
View File
@@ -3433,6 +3433,18 @@
<action function="page">confirm_action</action>
</actions>
</listitem>
<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
<condition var1="tw_app_installed_in_system" var2="1"/>
<actions>
<action function="set">tw_back=advanced</action>
<action function="set">tw_action=uninstalltwrpsystemapp</action>
<action function="set">tw_text1={@uninstall_twrp_system_app_confirm=Uninstall TWRP App from System?}</action>
<action function="set">tw_action_text1={@uninstalling_twrp_system_app=Uninstalling TWRP App from System...}</action>
<action function="set">tw_complete_text1={@uninstall_twrp_system_app_complete=Uninstall TWRP App from System Complete}</action>
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
<action function="page">confirm_action</action>
</actions>
</listitem>
</listbox>
<action>
gui/theme/common/languages/en.xml
+4
View File
@@ -126,6 +126,10 @@
<string name="reboot_install_app_system">Install as a System App</string>
<string name="reboot_installing_app">Installing App...</string>
<string name="swipe_to_install_app">Swipe to Install TWRP App</string>
<string name="uninstall_twrp_system_app">Uninstall TWRP App from System</string>
<string name="uninstall_twrp_system_app_confirm">Uninstall TWRP App from System?</string>
<string name="uninstalling_twrp_system_app">Uninstalling TWRP App from System...</string>
<string name="uninstall_twrp_system_app_complete">Uninstall TWRP App from System Complete</string>
<string name="swipe_flash">Swipe to confirm Flash</string>
<string name="confirm_action">Confirm Action</string>
<string name="back_cancel">Press back button to cancel.</string>
gui/theme/common/portrait.xml
+12
View File
@@ -3594,6 +3594,18 @@
<action function="page">confirm_action</action>
</actions>
</listitem>
<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
<condition var1="tw_app_installed_in_system" var2="1"/>
<actions>
<action function="set">tw_back=advanced</action>
<action function="set">tw_action=uninstalltwrpsystemapp</action>
<action function="set">tw_text1={@uninstall_twrp_system_app_confirm=Uninstall TWRP App from System?}</action>
<action function="set">tw_action_text1={@uninstalling_twrp_system_app=Uninstalling TWRP App from System...}</action>
<action function="set">tw_complete_text1={@uninstall_twrp_system_app_complete=Uninstall TWRP App from System Complete}</action>
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
<action function="page">confirm_action</action>
</actions>
</listitem>
</listbox>
<action>
gui/theme/common/watch.xml
+12
View File
@@ -4205,6 +4205,18 @@
<action function="page">confirm_action</action>
</actions>
</listitem>
<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
<condition var1="tw_app_installed_in_system" var2="1"/>
<actions>
<action function="set">tw_back=advanced</action>
<action function="set">tw_action=uninstalltwrpsystemapp</action>
<action function="set">tw_text1={@uninstall_twrp_system_app_confirm=Uninstall TWRP App from System?}</action>
<action function="set">tw_action_text1={@uninstalling_twrp_system_app=Uninstalling TWRP App from System...}</action>
<action function="set">tw_complete_text1={@uninstall_twrp_system_app_complete=Uninstall TWRP App from System Complete}</action>
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
<action function="page">confirm_action</action>
</actions>
</listitem>
</listbox>
<button>
partitionmanager.cpp
+1
View File
@@ -1550,6 +1550,7 @@ void TWPartitionManager::Update_System_Details(void) {
if ((*iter)->Mount_Point == Get_Android_Root_Path()) {
int backup_display_size = (int)((*iter)->Backup_Size / 1048576LLU);
DataManager::SetValue(TW_BACKUP_SYSTEM_SIZE, backup_display_size);
TWFunc::Is_TWRP_App_In_System();
} else if ((*iter)->Mount_Point == "/data" || (*iter)->Mount_Point == "/datadata") {
data_size += (int)((*iter)->Backup_Size / 1048576LLU);
} else if ((*iter)->Mount_Point == "/cache") {
twrp-functions.cpp
+19
View File
@@ -1228,4 +1228,23 @@ void TWFunc::check_selinux_support() {
}
}
}
bool TWFunc::Is_TWRP_App_In_System() {
if (PartitionManager.Mount_By_Path(PartitionManager.Get_Android_Root_Path(), false)) {
string base_path = PartitionManager.Get_Android_Root_Path();
if (TWFunc::Path_Exists(PartitionManager.Get_Android_Root_Path() + "/system"))
base_path += "/system"; // For devices with system as a root file system (e.g. Pixel)
string install_path = base_path + "/priv-app";
if (!TWFunc::Path_Exists(install_path))
install_path = base_path + "/app";
install_path += "/twrpapp";
if (TWFunc::Path_Exists(install_path)) {
LOGINFO("App found at '%s'\n", install_path.c_str());
DataManager::SetValue("tw_app_installed_in_system", 1);
return true;
}
}
DataManager::SetValue("tw_app_installed_in_system", 0);
return false;
}
#endif // ndef BUILD_TWRPTAR_MAIN
twrp-functions.hpp
+1
View File
@@ -106,6 +106,7 @@ public:
static int stream_adb_backup(string &Restore_Name); // Tell ADB Backup to Stream to TWRP from GUI selection
static std::string get_cache_dir(); // return the cache partition existence
static void check_selinux_support(); // print whether selinux support is enabled to console
static bool Is_TWRP_App_In_System(); // Check if the TWRP app is installed in the system partition
private:
static void Copy_Log(string Source, string Destination);