From 9ddb6f4a42b9dc443742614c41ad6afd58835942 Mon Sep 17 00:00:00 2001
From: SathamHussainM <sathamhussain.m11@gmail.com>
Date: Wed, 1 Feb 2023 16:54:19 +0000
Subject: [PATCH] removed FBE cache some user facing encryption issue after
 wipe fbe cache

Revert "PBRP: Additional checks for FBE cache wiping"

This reverts commit 2f435e4

Revert "PBRP: Wipe: add FBE cache"

This reverts commit bc9b7d7

Signed-off-by: SathamHussainM <sathamhussain.m11@gmail.com>
---
 gui/action.cpp                       | 12 ++----------
 gui/theme/common/languages/cz.xml    |  2 --
 gui/theme/common/languages/de.xml    |  2 --
 gui/theme/common/languages/el.xml    |  2 --
 gui/theme/common/languages/en.xml    |  2 --
 gui/theme/common/languages/fr.xml    |  2 --
 gui/theme/common/languages/hu.xml    |  2 --
 gui/theme/common/languages/in.xml    |  2 --
 gui/theme/common/languages/it.xml    |  2 --
 gui/theme/common/languages/ja.xml    |  2 --
 gui/theme/common/languages/ko.xml    |  2 --
 gui/theme/common/languages/pt_PT.xml |  2 --
 gui/theme/common/languages/ru.xml    |  2 --
 gui/theme/common/languages/sk.xml    |  2 --
 gui/theme/common/languages/sl.xml    |  2 --
 gui/theme/common/languages/tr.xml    |  2 --
 gui/theme/common/languages/uk.xml    |  2 --
 gui/theme/common/languages/zh_TW.xml |  2 --
 partitionmanager.cpp                 | 27 ---------------------------
 partitions.hpp                       |  1 -
 20 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/gui/action.cpp b/gui/action.cpp
index 3db5ec530..c9c8401dd 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -963,7 +963,7 @@ int GUIAction::checkpartitionlist(std::string arg)
 		while (end_pos != string::npos && start_pos < List.size()) {
 			part_path = List.substr(start_pos, end_pos - start_pos);
 			LOGINFO("checkpartitionlist part_path '%s'\n", part_path.c_str());
-			if (part_path == "/and-sec" || part_path == "DALVIK" || part_path == "INTERNAL" || part_path == "SUBSTRATUM" || part_path == "MAGISK" || part_path == "FBE") {
+			if (part_path == "/and-sec" || part_path == "DALVIK" || part_path == "INTERNAL" || part_path == "SUBSTRATUM" || part_path == "MAGISK") {
 				// Do nothing
 			} else {
 				count++;
@@ -992,7 +992,7 @@ int GUIAction::getpartitiondetails(std::string arg)
 		while (end_pos != string::npos && start_pos < List.size()) {
 			part_path = List.substr(start_pos, end_pos - start_pos);
 			LOGINFO("getpartitiondetails part_path '%s'\n", part_path.c_str());
-			if (part_path == "/and-sec" || part_path == "DALVIK" || part_path == "INTERNAL" || part_path == "SUBSTRATUM" || part_path == "MAGISK" || part_path == "FBE") {
+			if (part_path == "/and-sec" || part_path == "DALVIK" || part_path == "INTERNAL" || part_path == "SUBSTRATUM" || part_path == "MAGISK") {
 				// Do nothing
 			} else {
 				DataManager::SetValue("tw_partition_path", part_path);
@@ -1420,14 +1420,6 @@ int GUIAction::wipe(std::string arg)
                                                 } else {
 			                                skip = true;
                                                 }
-                                        } else if (wipe_path == "FBE" && DataManager::GetIntValue(TW_IS_FBE)) {
-                                                if (!PartitionManager.Wipe_FBE_Cache()) {
-                                                        gui_err("pb_fbe_wipe_err=Failed to wipe fbe cache");
-                                                        ret_val = false;
-                                                        break;
-                                                } else {
-			                                skip = true;
-                                                }
                                         } else if (wipe_path == "INTERNAL") {
 						if (!PartitionManager.Wipe_Media_From_Data()) {
 							ret_val = false;
diff --git a/gui/theme/common/languages/cz.xml b/gui/theme/common/languages/cz.xml
index e33750772..343bf610c 100644
--- a/gui/theme/common/languages/cz.xml
+++ b/gui/theme/common/languages/cz.xml
@@ -906,8 +906,6 @@
 		<string name="pb_dev_reboot">Po přepnutí Codenames je nutné restartovat počítač</string>
 		<string name="pb_dev_name">Změna názvu zařízení PBRP</string>
 		<string name="codename_changer">Codename Changer</string>
-		<string name="pb_wipe_fbe_cache">Mezipaměť FBE</string>
-		<string name="fbe_done">- Vymazání mezipaměti FBE bylo dokončeno!</string>
 		<string name="sel_br_val">Hodnota jasu svítilny: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Před instalací ZIP odpojte systém</string>
 		<string name="unmount_system">Odpojení systému ...</string>
diff --git a/gui/theme/common/languages/de.xml b/gui/theme/common/languages/de.xml
index 9cc710ee5..2cbfbfe17 100644
--- a/gui/theme/common/languages/de.xml
+++ b/gui/theme/common/languages/de.xml
@@ -921,8 +921,6 @@
 		<string name="pb_dev_reboot">Ein Neustart ist nach dem Wechseln der Codenamen obligatorisch</string>
 		<string name="pb_dev_name">PBRP Device Codename Changer</string>
 		<string name="codename_changer">Codename Changer</string>
-		<string name="pb_wipe_fbe_cache">FBE-Cache</string>
-		<string name="fbe_done">- FBE Cache Wipe abgeschlossen!</string>
 		<string name="sel_br_val">Helligkeitswert der Taschenlampe: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Hängen Sie das System aus, bevor Sie eine ZIP-Datei installieren</string>
 		<string name="unmount_system">System aushängen ...</string>
diff --git a/gui/theme/common/languages/el.xml b/gui/theme/common/languages/el.xml
index a9f1f7bfd..b1b2aeda1 100644
--- a/gui/theme/common/languages/el.xml
+++ b/gui/theme/common/languages/el.xml
@@ -896,8 +896,6 @@
 		<string name="pb_dev_reboot">Η επανεκκίνηση είναι υποχρεωτική Μετά την αλλαγή κωδικών</string>
 		<string name="pb_dev_name">Αλλαγή κωδικού ονόματος συσκευής PBRP</string>
 		<string name="codename_changer">Κωδικός Changer</string>
-		<string name="pb_wipe_fbe_cache">Προσωρινή μνήμη FBE</string>
-		<string name="fbe_done">- Ολοκληρώθηκε η διαγραφή FBE Cache!</string>
 		<string name="sel_br_val">Τιμή φωτεινότητας φακού: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Αποσύνδεση συστήματος πριν εγκαταστήσετε ένα ZIP</string>
 		<string name="unmount_system">Αποσύνδεση συστήματος ...</string>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 389beabbf..437443d2d 100644
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -950,8 +950,6 @@
 		<string name="pb_dev_name">PBRP Device Codename Changer</string>
 		<string name="codename_changer">Codename Changer</string>
 		<string name="magisk_done">-- Magisk Modules Wipe Complete!</string>
-		<string name="pb_wipe_fbe_cache">FBE Cache</string>
-		<string name="fbe_done">-- FBE Cache Wipe Complete!</string>
 		<string name="sel_br_val">Flashlight Brightness Value: %pb_bright_value%%</string>
 		<string name="patch_avb2">Patch AVB2.0 Verity</string>
 		<string name="pb_patch_avb2">Patched AVB2.0</string>
diff --git a/gui/theme/common/languages/fr.xml b/gui/theme/common/languages/fr.xml
index 5fb944de2..34f0a0976 100644
--- a/gui/theme/common/languages/fr.xml
+++ b/gui/theme/common/languages/fr.xml
@@ -923,8 +923,6 @@
 		<string name="pb_dev_reboot">Un redémarrage est obligatoire après le changement de nom de code</string>
 		<string name="pb_dev_name">PBRP Device Codename Changer</string>
 		<string name="codename_changer">Codename Changer</string>
-		<string name="pb_wipe_fbe_cache">FBE Cache</string>
-		<string name="fbe_done">-- FBE Cache Wipe Complete!</string>
 		<string name="sel_br_val">Valeur de luminosité de la lampe de poche: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Démonter le système avant d'installer un ZIP</string>
 		<string name="unmount_system">Démontage du système ...</string>
diff --git a/gui/theme/common/languages/hu.xml b/gui/theme/common/languages/hu.xml
index 1048713a9..a6139833e 100644
--- a/gui/theme/common/languages/hu.xml
+++ b/gui/theme/common/languages/hu.xml
@@ -929,8 +929,6 @@
 		<string name="pb_dev_reboot">Az újraindítás kötelező a kódnevek váltása után</string>
 		<string name="pb_dev_name">PBRP eszköz kódnév váltó</string>
 		<string name="codename_changer">Kódnév váltó</string>
-		<string name="pb_wipe_fbe_cache">FBE gyorsítótár</string>
-		<string name="fbe_done">- Az FBE gyorsítótár törlése kész!</string>
 		<string name="sel_br_val">Lámpa fényerő értéke: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Vegye le a rendszert a ZIP telepítése előtt</string>
 		<string name="unmount_system">Rendszer leszerelése ...</string>
diff --git a/gui/theme/common/languages/in.xml b/gui/theme/common/languages/in.xml
index 1726bfd11..340e0ef80 100644
--- a/gui/theme/common/languages/in.xml
+++ b/gui/theme/common/languages/in.xml
@@ -962,8 +962,6 @@
 		<string name="pb_dev_reboot">Reboot adalah wajib Setelah mengganti Nama Kode</string>
 		<string name="pb_dev_name">Pengubah Nama Kode Perangkat PBRP</string>
 		<string name="codename_changer">Codename Changer</string>
-		<string name="pb_wipe_fbe_cache">Cache FBE</string>
-		<string name="fbe_done">- Penghapusan Cache FBE Selesai!</string>
 		<string name="sel_br_val">Nilai Kecerahan Senter: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Lepaskan Sistem sebelum menginstal ZIP</string>
 		<string name="unmount_system">Melepas Sistem ...</string>
diff --git a/gui/theme/common/languages/it.xml b/gui/theme/common/languages/it.xml
index c49070e56..86bc1b8ae 100644
--- a/gui/theme/common/languages/it.xml
+++ b/gui/theme/common/languages/it.xml
@@ -917,8 +917,6 @@
 		<string name="pb_dev_reboot">Un riavvio è obbligatorio dopo aver cambiato i nomi in codice</string>
 		<string name="pb_dev_name">Cambia nome in codice dispositivo PBRP</string>
 		<string name="codename_changer">Cambia nome in codice</string>
-		<string name="pb_wipe_fbe_cache">Cache FBE</string>
-		<string name="fbe_done">- Cancellazione cache FBE completata!</string>
 		<string name="sel_br_val">Valore di luminosità della torcia: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Smonta il sistema prima di installare un file ZIP</string>
 		<string name="unmount_system">Sistema di smontaggio ...</string>
diff --git a/gui/theme/common/languages/ja.xml b/gui/theme/common/languages/ja.xml
index 3a6f68739..f76e1650f 100644
--- a/gui/theme/common/languages/ja.xml
+++ b/gui/theme/common/languages/ja.xml
@@ -957,8 +957,6 @@
 		<string name="pb_dev_reboot">コードネームを切り替えた後の再起動は必須です</string>
 		<string name="pb_dev_name">PBRPデバイスコードネームチェンジャー</string>
 		<string name="codename_changer">コードネームチェンジャー</string>
-		<string name="pb_wipe_fbe_cache">FBEキャッシュ</string>
-		<string name="fbe_done">-FBEキャッシュワイプの完了！</string>
 		<string name="sel_br_val">懐中電灯の明るさの値：％pb_bright_value %%</string>
 		<string name="unmount_sys_install">ZIPをインストールする前にシステムをアンマウントする</string>
 		<string name="unmount_system">システムのマウントを解除しています...</string>
diff --git a/gui/theme/common/languages/ko.xml b/gui/theme/common/languages/ko.xml
index 28a81439e..2cfb86f6c 100644
--- a/gui/theme/common/languages/ko.xml
+++ b/gui/theme/common/languages/ko.xml
@@ -939,8 +939,6 @@
 		<string name="pb_dev_name">PBRP 기기 코드명 변경</string>
 		<string name="codename_changer">코드명 변경</string>
 		<string name="magisk_done">-- Magisk 모듈이 삭제되었습니다!</string>
-		<string name="pb_wipe_fbe_cache">파일 기반 암호화 캐시</string>
-		<string name="fbe_done">-- 파일 기반 암호화 캐시가 삭제되었습니다!</string>
 		<string name="sel_br_val">플래시 밝기 값: %pb_bright_value%%</string>
 		<string name="patch_avb2">AVB 2.0 검증</string>
 		<string name="pb_patch_avb2">AVB 2.0 패치됨</string>
diff --git a/gui/theme/common/languages/pt_PT.xml b/gui/theme/common/languages/pt_PT.xml
index 8daca8a88..a066e3b7a 100644
--- a/gui/theme/common/languages/pt_PT.xml
+++ b/gui/theme/common/languages/pt_PT.xml
@@ -917,8 +917,6 @@
 		<string name="pb_dev_reboot">A reinicialização é obrigatória após a troca de codinomes</string>
 		<string name="pb_dev_name">Trocador de nome de código do dispositivo PBRP</string>
 		<string name="codename_changer">Codename Changer</string>
-		<string name="pb_wipe_fbe_cache">FBE Cache</string>
-		<string name="fbe_done">- FBE Cache Wipe Complete!</string>
 		<string name="sel_br_val">Valor de brilho da lanterna: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Desmonte o sistema antes de instalar um ZIP</string>
 		<string name="unmount_system">Desmontando sistema ...</string>
diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index 1424b676d..75a4b97a4 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -887,8 +887,6 @@
 		<string name="pb_dev_reboot">Перезагрузка обязательна после переключения кодовых имен</string>
 		<string name="pb_dev_name">Смена имени</string>
 		<string name="codename_changer">Смена имени</string>
-		<string name="pb_wipe_fbe_cache">Кэш FBE</string>
-		<string name="fbe_done">- Очистка кэша FBE завершена!</string>
 		<string name="sel_br_val">Значение яркости фонарика:%pb_bright_value%%</string>
 		<string name="pb_ota_instruction">Пожалуйста, посмотрите инструкцию для включений обновлений по OTA на</string>
 		<string name="battery_pct">Батарея: %tw_battery%</string>
diff --git a/gui/theme/common/languages/sk.xml b/gui/theme/common/languages/sk.xml
index e10dfd87f..9daf19e81 100644
--- a/gui/theme/common/languages/sk.xml
+++ b/gui/theme/common/languages/sk.xml
@@ -903,8 +903,6 @@
 		<string name="pb_dev_reboot">Po prepnutí Codenames je povinný reštart</string>
 		<string name="pb_dev_name">Menič kódov zariadení PBRP</string>
 		<string name="codename_changer">Menič kódov</string>
-		<string name="pb_wipe_fbe_cache">FBE Cache</string>
-		<string name="fbe_done">- Vymazanie vyrovnávacej pamäte FBE bolo dokončené!</string>
 		<string name="sel_br_val">Hodnota jasu baterky: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Pred inštaláciou ZIP odpojte systém</string>
 		<string name="unmount_system">Odpojenie systému ...</string>
diff --git a/gui/theme/common/languages/sl.xml b/gui/theme/common/languages/sl.xml
index 6d0cc3583..5ff91d483 100644
--- a/gui/theme/common/languages/sl.xml
+++ b/gui/theme/common/languages/sl.xml
@@ -903,8 +903,6 @@
 		<string name="pb_dev_reboot">Po zamenjavi kodnih imen je obvezen ponovni zagon</string>
 		<string name="pb_dev_name">Izmenjevalnik kodnega imena naprave PBRP</string>
 		<string name="codename_changer">Changer Changer</string>
-		<string name="pb_wipe_fbe_cache">FBE predpomnilnik</string>
-		<string name="fbe_done">- FBE predpomnilnik obrišite popolno!</string>
 		<string name="sel_br_val">Vrednost svetlosti svetilke: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Pred namestitvijo ZIP-ja izklopite sistem</string>
 		<string name="unmount_system">Odstranjevanje sistema ...</string>
diff --git a/gui/theme/common/languages/tr.xml b/gui/theme/common/languages/tr.xml
index 62a565040..5930cde1f 100644
--- a/gui/theme/common/languages/tr.xml
+++ b/gui/theme/common/languages/tr.xml
@@ -916,8 +916,6 @@
 		<string name="pb_dev_reboot">Kod adlarını değiştirdikten sonra Yeniden Başlatma zorunludur</string>
 		<string name="pb_dev_name">PBRP Cihazı Kod Adı Değiştirici</string>
 		<string name="codename_changer">Kod Adı Değiştirici</string>
-		<string name="pb_wipe_fbe_cache">FBE Önbelleği</string>
-		<string name="fbe_done">- FBE Önbellek Temizleme Tamamlandı!</string>
 		<string name="sel_br_val">El Feneri Parlaklık Değeri: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Bir ZIP kurmadan önce Sistemin Bağlantısını Kes</string>
 		<string name="unmount_system">Sistemin Sökülmesi ...</string>
diff --git a/gui/theme/common/languages/uk.xml b/gui/theme/common/languages/uk.xml
index edb2bd547..0ffbde400 100644
--- a/gui/theme/common/languages/uk.xml
+++ b/gui/theme/common/languages/uk.xml
@@ -920,8 +920,6 @@
 		<string name="pb_dev_reboot">Після переключення кодових імен обов'язкове перезавантаження</string>
 		<string name="pb_dev_name">Зміна кодової назви пристрою PBRP</string>
 		<string name="codename_changer">Changer Changer</string>
-		<string name="pb_wipe_fbe_cache">Кеш FBE</string>
-		<string name="fbe_done">- Завантажити кеш-пам'ять FBE!</string>
 		<string name="sel_br_val">Значення яскравості ліхтарика: %pb_bright_value%%</string>
 		<string name="unmount_sys_install">Відключіть систему перед встановленням ZIP</string>
 		<string name="unmount_system">Демонтаж системи ...</string>
diff --git a/gui/theme/common/languages/zh_TW.xml b/gui/theme/common/languages/zh_TW.xml
index e9ac45ccd..2e44617c5 100644
--- a/gui/theme/common/languages/zh_TW.xml
+++ b/gui/theme/common/languages/zh_TW.xml
@@ -939,8 +939,6 @@
 		<string name="pb_dev_reboot">切換代號後必須重新啟動</string>
 		<string name="pb_dev_name">PBRP設備代號更改</string>
 		<string name="codename_changer">代號換</string>
-		<string name="pb_wipe_fbe_cache">FBE快取</string>
-		<string name="fbe_done">-FBE緩存擦除完成！</string>
 		<string name="sel_br_val">手電筒亮度值：％pb_bright_value %%</string>
 		<string name="unmount_sys_install">安裝ZIP之前先卸載系統</string>
 		<string name="unmount_system">卸載系統...</string>
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 81a14d17c..58bfc4bbe 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1506,26 +1506,6 @@ int TWPartitionManager::Wipe_Magisk_Modules(void) {
 	return true;
 }
 
-int TWPartitionManager::Wipe_FBE_Cache(void) {
-	string fbe_dir = "/data/misc";
-	string fbe_dir2 = "/data/system";
-	string fbe_dir3 = "/data/system_de";
-	string fbe_dir4 = "/data/unencrypted";
-
-	if (!Mount_By_Path("/data", true)) return false;
-
-	if (TWFunc::Path_Exists(fbe_dir)) TWFunc::removeDir(fbe_dir, false);
-
-	if (TWFunc::Path_Exists(fbe_dir2)) TWFunc::removeDir(fbe_dir2, false);
-
-	if (TWFunc::Path_Exists(fbe_dir3)) TWFunc::removeDir(fbe_dir3, false);
-
-	if (TWFunc::Path_Exists(fbe_dir4)) TWFunc::removeDir(fbe_dir4, false);
-
-	gui_msg("fbe_done=-- FBE Cache Wipe Complete!");
-	return true;
-}
-
 int TWPartitionManager::Wipe_By_Path(string Path, string New_File_System) {
 	std::vector<TWPartition*>::iterator iter;
 	int ret = false;
@@ -2654,13 +2634,6 @@ void TWPartitionManager::Get_Partition_List(string ListType,
 		magisk.Mount_Point = "MAGISK";
 		magisk.selected = 0;
 		Partition_List->push_back(magisk);
-		if (DataManager::GetIntValue(TW_IS_FBE)) {
-			struct PartitionList fbe;
-			fbe.Display_Name = gui_parse_text("{@pb_wipe_fbe_cache}");
-			fbe.Mount_Point = "FBE";
-			fbe.selected = 0;
-			Partition_List->push_back(fbe);
-		}
 		for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
 			if ((*iter)->Wipe_Available_in_GUI && !(*iter)->Is_SubPartition) {
 				struct PartitionList part;
diff --git a/partitions.hpp b/partitions.hpp
index 0f9f670ca..6958978aa 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -347,7 +347,6 @@ class TWPartitionManager
 	int Wipe_Dalvik_Cache();                                                  // Wipes dalvik cache
 	int Wipe_Substratum_Overlays();                                           // Wipe substratum overlays
 	int Wipe_Magisk_Modules();                                                // Wipe magisk modules
-	int Wipe_FBE_Cache();                                                     // Wipe fbe cache
         int Wipe_Rotate_Data();                                                   // Wipes rotation data --
 	int Wipe_Battery_Stats();                                                 // Wipe battery stats -- /data/system/batterystats.bin
 	int Wipe_Android_Secure();                                                // Wipes android secure