From 189bd277f917955bdbc7b3030219e720b2c75f2b Mon Sep 17 00:00:00 2001
From: David <Davidteri91@gmail.com>
Date: Sun, 30 Sep 2018 15:10:30 +0200
Subject: [PATCH 001/207] language: italian: Fix rename_stock typo

Change-Id: Ifea3aca26e8664416ec1b161d2b102a0592fc9c1
Signed-off-by: David Viteri <davidteri91@gmail.com>
---
 gui/theme/common/languages/it.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/theme/common/languages/it.xml b/gui/theme/common/languages/it.xml
index ec74d59a5a..81ec46fe4e 100644
--- a/gui/theme/common/languages/it.xml
+++ b/gui/theme/common/languages/it.xml
@@ -646,7 +646,7 @@
 		<string name="dumlock_restore">Ripristino del Boot originale...</string>
 		<string name="dumlock_reflash">Reinstallazione della Recovery in Boot...</string>
 		<string name="run_script">Esecuzione dello script {1}...</string>
-		<string name="rename_stock">Il file della Recovery stock, in System, è stato rinominato per prevenire la sostituzione di TWRP da paete della ROM.</string>
+		<string name="rename_stock">Il file della Recovery stock, in System, è stato rinominato per prevenire la sostituzione di TWRP da parte della ROM.</string>
 		<string name="split_backup">Divisione del backup in archivi multipli...</string>
 		<string name="backup_error">Errore nella creazione del backup.</string>
 		<string name="restore_error">Errore durante il ripristino.</string>

From ff33d1352c7dcdf2dbb9f5b21fcc598a2394e145 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Sun, 20 Jan 2019 19:50:41 -0500
Subject: [PATCH 002/207] twinstall: exploit compat with karnak

Change-Id: I01df82c5dc3494598e8393358ba84475ce668764
---
 twinstall.cpp | 185 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 183 insertions(+), 2 deletions(-)

diff --git a/twinstall.cpp b/twinstall.cpp
index fa6b8594e0..add6be6f63 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -320,6 +320,181 @@ static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zi
 	return INSTALL_SUCCESS;
 }
 
+const char *karnak_boot_part = "/dev/block/platform/soc/11230000.mmc/by-name/boot";
+
+// TODO: think of a name for the exploit
+#define EXPLOIT_TAG "<exploit-compat> "
+
+static int unpatch_boot() {
+  FILE *fp = NULL;
+  uint8_t boot_data[0x800];
+  int ret = -1;
+
+  gui_print(EXPLOIT_TAG "Remove boot patch...");
+
+  fp = fopen(karnak_boot_part, "r+b");
+  if (!fp) {
+    gui_print(EXPLOIT_TAG "Failed to open the boot device");
+    goto cleanup;
+  }
+
+  if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print(EXPLOIT_TAG "Failed to read data");
+    goto cleanup;
+  }
+
+  if (memcmp(boot_data + 0x400, "ANDROID!", 8) != 0) {
+    // Exploit not installed yet, but that's okay
+    gui_print(EXPLOIT_TAG "NOT_INSTALLED");
+    ret = 0;
+    goto cleanup;
+  }
+
+  // Assume exploit is installed. Uninstall it by copying the second 0x400 over the first 0x400
+  memcpy(boot_data, boot_data + 0x400, 0x400);
+  // and zero out the second 0x400
+  memset(boot_data + 0x400, 0, 0x400);
+
+  if (fseek(fp, 0, SEEK_SET) != 0) {
+    gui_print(EXPLOIT_TAG "Failed to seek");
+    goto cleanup;
+  }
+
+  if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print(EXPLOIT_TAG "Failed to write data");
+    goto cleanup;
+  }
+
+  gui_print(EXPLOIT_TAG "OK");
+  ret = 0;
+
+cleanup:
+  if (fp) {
+    fclose(fp);
+    fp = NULL;
+  }
+
+  return ret;
+}
+
+static uint8_t microloader_bin[1024] = {
+    0x41, 0x4E, 0x44, 0x52, 0x4F, 0x49, 0x44, 0x21, 0x00, 0x10, 0x00, 0x00, 0xF0, 0xBF, 0xD5, 0x4B,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x40,
+    0x00, 0x00, 0x00, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x11, 0x04, 0x0E,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x62, 0x6F, 0x6F, 0x74, 0x6F, 0x70, 0x74, 0x3D, 0x36, 0x34, 0x53, 0x33, 0x2C, 0x33, 0x32, 0x4E,
+    0x32, 0x2C, 0x33, 0x32, 0x4E, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x40, 0xC0, 0xD5, 0x4B, 0x20, 0x33, 0xD4, 0x4B, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xC0, 0xD5, 0x4B, 0x00, 0x00, 0x00, 0x00,
+    0x23, 0x84, 0xD1, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x33, 0x01, 0xD5, 0x4B, 0x00, 0xC1, 0xD5, 0x4B, 0x00, 0x02, 0x00, 0x00, 0xAD, 0xDE, 0x00, 0x00,
+    0x90, 0x4C, 0xD2, 0x4B, 0xAD, 0xDE, 0x00, 0x00, 0xAD, 0xDE, 0x00, 0x00, 0x9B, 0x5E, 0xD2, 0x4B,
+    0xAD, 0xDE, 0x00, 0x00, 0x00, 0xC1, 0xD5, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x42, 0xD4, 0xA0, 0xE3, 0x12, 0x00, 0x00, 0xFA, 0x03, 0x4A, 0x13, 0x68, 0x9B, 0x06, 0xFC, 0xD5,
+    0x02, 0x4B, 0x18, 0x60, 0x70, 0x47, 0x00, 0xBF, 0x14, 0x20, 0x00, 0x11, 0x00, 0x20, 0x00, 0x11,
+    0x0A, 0x28, 0x08, 0xB5, 0x01, 0x46, 0x02, 0xD1, 0x0D, 0x20, 0xFF, 0xF7, 0xED, 0xFF, 0x08, 0x46,
+    0xFF, 0xF7, 0xEA, 0xFF, 0x08, 0xBD, 0x38, 0xB5, 0x45, 0x1E, 0x15, 0xF8, 0x01, 0x4F, 0x24, 0xB9,
+    0x0A, 0x20, 0xFF, 0xF7, 0xED, 0xFF, 0x20, 0x46, 0x38, 0xBD, 0x20, 0x46, 0xFF, 0xF7, 0xE8, 0xFF,
+    0xF3, 0xE7, 0x00, 0xBF, 0x7F, 0xB5, 0x4F, 0xF0, 0x82, 0x44, 0x0E, 0x4E, 0x4F, 0xF4, 0x00, 0x15,
+    0x0D, 0x48, 0xFF, 0xF7, 0xE8, 0xFF, 0x33, 0x68, 0x98, 0x47, 0x01, 0x23, 0x4F, 0xF4, 0x00, 0x12,
+    0x02, 0x93, 0x00, 0x23, 0x01, 0x95, 0x00, 0x94, 0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46,
+    0x20, 0x46, 0x98, 0x47, 0x05, 0x48, 0xFF, 0xF7, 0xD6, 0xFF, 0xA0, 0x47, 0x04, 0x48, 0xFF, 0xF7,
+    0xD2, 0xFF, 0xFE, 0xE7, 0xFC, 0xC1, 0xD5, 0x4B, 0xA4, 0xC1, 0xD5, 0x4B, 0xC8, 0xC1, 0xD5, 0x4B,
+    0xDC, 0xC1, 0xD5, 0x4B, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x6C, 0x6F, 0x61, 0x64, 0x65, 0x72, 0x20,
+    0x62, 0x79, 0x20, 0x78, 0x79, 0x7A, 0x2E, 0x20, 0x43, 0x6F, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
+    0x74, 0x20, 0x32, 0x30, 0x31, 0x39, 0x2E, 0x00, 0x4A, 0x75, 0x6D, 0x70, 0x20, 0x74, 0x6F, 0x20,
+    0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x79, 0x6C, 0x6F, 0x61, 0x64, 0x00, 0x53, 0x6F, 0x6D, 0x65,
+    0x74, 0x68, 0x69, 0x6E, 0x67, 0x20, 0x77, 0x65, 0x6E, 0x74, 0x20, 0x68, 0x6F, 0x72, 0x72, 0x69,
+    0x62, 0x6C, 0x79, 0x20, 0x77, 0x72, 0x6F, 0x6E, 0x67, 0x21, 0x00, 0x00, 0x99, 0xEC, 0xD1, 0x4B,
+    0x90, 0x4C, 0xD2, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
+};
+
+static int repatch_boot() {
+  FILE *fp = NULL;
+  uint8_t boot_data[0x800];
+  int ret = -1;
+
+  gui_print(EXPLOIT_TAG "Install boot patch... ");
+
+  fp = fopen(karnak_boot_part, "r+b");
+  if (!fp) {
+    gui_print(EXPLOIT_TAG "Failed to open the boot device");
+    goto cleanup;
+  }
+
+  if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print(EXPLOIT_TAG "Failed to read data");
+    goto cleanup;
+  }
+
+  if (memcmp(boot_data + 0x400, "ANDROID!", 8) == 0) {
+    // Exploit not installed yet, but that's okay
+    gui_print(EXPLOIT_TAG "ALREADY_INSTALLED"); // If the rom author injected the boot image herself
+    ret = 0;
+    goto cleanup;
+  }
+
+  // Copy first half to the second half, replace first half with the microloader
+  memcpy(boot_data + 0x400, boot_data, 0x400);
+  memcpy(boot_data, microloader_bin, 0x400);
+
+  if (fseek(fp, 0, SEEK_SET) != 0) {
+    gui_print(EXPLOIT_TAG "Failed to seek");
+    goto cleanup;
+  }
+
+  if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print(EXPLOIT_TAG "Failed to write data");
+    goto cleanup;
+  }
+
+  gui_print(EXPLOIT_TAG "OK");
+  ret = 0;
+
+cleanup:
+  if (fp) {
+    fclose(fp);
+    fp = NULL;
+  }
+
+  return ret;
+}
+
 int TWinstall_zip(const char* path, int* wipe_cache) {
 	int ret_val, zip_verify = 1;
 
@@ -435,8 +610,14 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 			ret_val = INSTALL_CORRUPT;
 		} else {
 			ret_val = Prepare_Update_Binary(path, &Zip, wipe_cache);
-			if (ret_val == INSTALL_SUCCESS)
-				ret_val = Run_Update_Binary(path, &Zip, wipe_cache, UPDATE_BINARY_ZIP_TYPE);
+			if (ret_val == INSTALL_SUCCESS) {
+				if (unpatch_boot() < 0)
+					ret_val = INSTALL_ERROR;
+				if (ret_val == INSTALL_SUCCESS)
+					ret_val = Run_Update_Binary(path, &Zip, wipe_cache, UPDATE_BINARY_ZIP_TYPE);
+				if (repatch_boot() < 0)
+					ret_val = INSTALL_ERROR;
+			}
 		}
 	} else {
 		if (Zip.EntryExists(AB_OTA)) {

From b2b9658748d5aaed75526d83bc91ab3d1dcfa745 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Sun, 27 Jan 2019 10:10:00 -0500
Subject: [PATCH 003/207] amonet: make logging prettier

Change-Id: I9756237ac5c8b969fef79d0ebdf97dc25bd40c1a
---
 twinstall.cpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/twinstall.cpp b/twinstall.cpp
index add6be6f63..d8faaf9445 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -322,30 +322,29 @@ static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zi
 
 const char *karnak_boot_part = "/dev/block/platform/soc/11230000.mmc/by-name/boot";
 
-// TODO: think of a name for the exploit
-#define EXPLOIT_TAG "<exploit-compat> "
+#define EXPLOIT_TAG "[amonet] "
 
 static int unpatch_boot() {
   FILE *fp = NULL;
   uint8_t boot_data[0x800];
   int ret = -1;
 
-  gui_print(EXPLOIT_TAG "Remove boot patch...");
+  gui_print_color("highlight", EXPLOIT_TAG "Remove boot patch...");
 
   fp = fopen(karnak_boot_part, "r+b");
   if (!fp) {
-    gui_print(EXPLOIT_TAG "Failed to open the boot device");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the boot device");
     goto cleanup;
   }
 
   if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print(EXPLOIT_TAG "Failed to read data");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data");
     goto cleanup;
   }
 
   if (memcmp(boot_data + 0x400, "ANDROID!", 8) != 0) {
     // Exploit not installed yet, but that's okay
-    gui_print(EXPLOIT_TAG "NOT_INSTALLED");
+    gui_print_color("highlight", EXPLOIT_TAG "NOT_INSTALLED");
     ret = 0;
     goto cleanup;
   }
@@ -356,16 +355,16 @@ static int unpatch_boot() {
   memset(boot_data + 0x400, 0, 0x400);
 
   if (fseek(fp, 0, SEEK_SET) != 0) {
-    gui_print(EXPLOIT_TAG "Failed to seek");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek");
     goto cleanup;
   }
 
   if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print(EXPLOIT_TAG "Failed to write data");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data");
     goto cleanup;
   }
 
-  gui_print(EXPLOIT_TAG "OK");
+  gui_print_color("highlight", EXPLOIT_TAG "OK");
   ret = 0;
 
 cleanup:
@@ -449,22 +448,22 @@ static int repatch_boot() {
   uint8_t boot_data[0x800];
   int ret = -1;
 
-  gui_print(EXPLOIT_TAG "Install boot patch... ");
+  gui_print_color("highlight", EXPLOIT_TAG "Install boot patch... ");
 
   fp = fopen(karnak_boot_part, "r+b");
   if (!fp) {
-    gui_print(EXPLOIT_TAG "Failed to open the boot device");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the boot device");
     goto cleanup;
   }
 
   if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print(EXPLOIT_TAG "Failed to read data");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data");
     goto cleanup;
   }
 
   if (memcmp(boot_data + 0x400, "ANDROID!", 8) == 0) {
     // Exploit not installed yet, but that's okay
-    gui_print(EXPLOIT_TAG "ALREADY_INSTALLED"); // If the rom author injected the boot image herself
+    gui_print_color("highlight", EXPLOIT_TAG "ALREADY_INSTALLED"); // If the rom author injected the boot image herself
     ret = 0;
     goto cleanup;
   }
@@ -474,16 +473,16 @@ static int repatch_boot() {
   memcpy(boot_data, microloader_bin, 0x400);
 
   if (fseek(fp, 0, SEEK_SET) != 0) {
-    gui_print(EXPLOIT_TAG "Failed to seek");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek");
     goto cleanup;
   }
 
   if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print(EXPLOIT_TAG "Failed to write data");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data");
     goto cleanup;
   }
 
-  gui_print(EXPLOIT_TAG "OK");
+  gui_print_color("highlight", EXPLOIT_TAG "OK");
   ret = 0;
 
 cleanup:

From 157b01fef5871349039133cc3fbafb124fc05b40 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Sun, 27 Jan 2019 10:17:25 -0500
Subject: [PATCH 004/207] Update default settings for amonet

Change-Id: I489009cb8396d632c63d9e530ca939b8cbf6475a
---
 data.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data.cpp b/data.cpp
index cf9dd2476d..884cee25dd 100755
--- a/data.cpp
+++ b/data.cpp
@@ -888,7 +888,7 @@ void DataManager::SetDefaultValues()
 	mConst.SetValue("tw_has_mtp", "0");
 	mConst.SetValue("tw_mtp_enabled", "0");
 #endif
-	mPersist.SetValue("tw_mount_system_ro", "2");
+	mPersist.SetValue("tw_mount_system_ro", "1");
 	mPersist.SetValue("tw_never_show_system_ro_page", "0");
 	mPersist.SetValue("tw_language", EXPAND(TW_DEFAULT_LANGUAGE));
 	LOGINFO("LANG: %s\n", EXPAND(TW_DEFAULT_LANGUAGE));
@@ -911,9 +911,9 @@ void DataManager::SetDefaultValues()
 	mConst.SetValue("tw_oem_build", "1");
 #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
+	mPersist.SetValue("tw_app_prompt", "0");
+	mPersist.SetValue("tw_app_install_system", "0");
+	mData.SetValue("tw_app_install_status", "2"); // 0 = no status, 1 = not installed, 2 = already installed
 #endif
 
         mData.SetValue("tw_enable_adb_backup", "0");

From 671afae1886f1ace256c288170ecaba669fcd35e Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Mon, 11 Feb 2019 23:02:46 +0100
Subject: [PATCH 005/207] update amonet-exploit for ford

---
 twinstall.cpp | 156 ++++++++++++++++++++++++++++----------------------
 1 file changed, 89 insertions(+), 67 deletions(-)

diff --git a/twinstall.cpp b/twinstall.cpp
index d8faaf9445..88a0eccf75 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -320,7 +320,7 @@ static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zi
 	return INSTALL_SUCCESS;
 }
 
-const char *karnak_boot_part = "/dev/block/platform/soc/11230000.mmc/by-name/boot";
+const char *ford_boot_part = "/dev/block/platform/mtk-msdc.0/by-name/boot";
 
 #define EXPLOIT_TAG "[amonet] "
 
@@ -331,7 +331,7 @@ static int unpatch_boot() {
 
   gui_print_color("highlight", EXPLOIT_TAG "Remove boot patch...");
 
-  fp = fopen(karnak_boot_part, "r+b");
+  fp = fopen(ford_boot_part, "r+b");
   if (!fp) {
     gui_print_color("highlight", EXPLOIT_TAG "Failed to open the boot device");
     goto cleanup;
@@ -377,70 +377,92 @@ static int unpatch_boot() {
 }
 
 static uint8_t microloader_bin[1024] = {
-    0x41, 0x4E, 0x44, 0x52, 0x4F, 0x49, 0x44, 0x21, 0x00, 0x10, 0x00, 0x00, 0xF0, 0xBF, 0xD5, 0x4B,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x40,
-    0x00, 0x00, 0x00, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x11, 0x04, 0x0E,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x62, 0x6F, 0x6F, 0x74, 0x6F, 0x70, 0x74, 0x3D, 0x36, 0x34, 0x53, 0x33, 0x2C, 0x33, 0x32, 0x4E,
-    0x32, 0x2C, 0x33, 0x32, 0x4E, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x40, 0xC0, 0xD5, 0x4B, 0x20, 0x33, 0xD4, 0x4B, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xC0, 0xD5, 0x4B, 0x00, 0x00, 0x00, 0x00,
-    0x23, 0x84, 0xD1, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x33, 0x01, 0xD5, 0x4B, 0x00, 0xC1, 0xD5, 0x4B, 0x00, 0x02, 0x00, 0x00, 0xAD, 0xDE, 0x00, 0x00,
-    0x90, 0x4C, 0xD2, 0x4B, 0xAD, 0xDE, 0x00, 0x00, 0xAD, 0xDE, 0x00, 0x00, 0x9B, 0x5E, 0xD2, 0x4B,
-    0xAD, 0xDE, 0x00, 0x00, 0x00, 0xC1, 0xD5, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x42, 0xD4, 0xA0, 0xE3, 0x12, 0x00, 0x00, 0xFA, 0x03, 0x4A, 0x13, 0x68, 0x9B, 0x06, 0xFC, 0xD5,
-    0x02, 0x4B, 0x18, 0x60, 0x70, 0x47, 0x00, 0xBF, 0x14, 0x20, 0x00, 0x11, 0x00, 0x20, 0x00, 0x11,
-    0x0A, 0x28, 0x08, 0xB5, 0x01, 0x46, 0x02, 0xD1, 0x0D, 0x20, 0xFF, 0xF7, 0xED, 0xFF, 0x08, 0x46,
-    0xFF, 0xF7, 0xEA, 0xFF, 0x08, 0xBD, 0x38, 0xB5, 0x45, 0x1E, 0x15, 0xF8, 0x01, 0x4F, 0x24, 0xB9,
-    0x0A, 0x20, 0xFF, 0xF7, 0xED, 0xFF, 0x20, 0x46, 0x38, 0xBD, 0x20, 0x46, 0xFF, 0xF7, 0xE8, 0xFF,
-    0xF3, 0xE7, 0x00, 0xBF, 0x7F, 0xB5, 0x4F, 0xF0, 0x82, 0x44, 0x0E, 0x4E, 0x4F, 0xF4, 0x00, 0x15,
-    0x0D, 0x48, 0xFF, 0xF7, 0xE8, 0xFF, 0x33, 0x68, 0x98, 0x47, 0x01, 0x23, 0x4F, 0xF4, 0x00, 0x12,
-    0x02, 0x93, 0x00, 0x23, 0x01, 0x95, 0x00, 0x94, 0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46,
-    0x20, 0x46, 0x98, 0x47, 0x05, 0x48, 0xFF, 0xF7, 0xD6, 0xFF, 0xA0, 0x47, 0x04, 0x48, 0xFF, 0xF7,
-    0xD2, 0xFF, 0xFE, 0xE7, 0xFC, 0xC1, 0xD5, 0x4B, 0xA4, 0xC1, 0xD5, 0x4B, 0xC8, 0xC1, 0xD5, 0x4B,
-    0xDC, 0xC1, 0xD5, 0x4B, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x6C, 0x6F, 0x61, 0x64, 0x65, 0x72, 0x20,
-    0x62, 0x79, 0x20, 0x78, 0x79, 0x7A, 0x2E, 0x20, 0x43, 0x6F, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
-    0x74, 0x20, 0x32, 0x30, 0x31, 0x39, 0x2E, 0x00, 0x4A, 0x75, 0x6D, 0x70, 0x20, 0x74, 0x6F, 0x20,
-    0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x79, 0x6C, 0x6F, 0x61, 0x64, 0x00, 0x53, 0x6F, 0x6D, 0x65,
-    0x74, 0x68, 0x69, 0x6E, 0x67, 0x20, 0x77, 0x65, 0x6E, 0x74, 0x20, 0x68, 0x6F, 0x72, 0x72, 0x69,
-    0x62, 0x6C, 0x79, 0x20, 0x77, 0x72, 0x6F, 0x6E, 0x67, 0x21, 0x00, 0x00, 0x99, 0xEC, 0xD1, 0x4B,
-    0x90, 0x4C, 0xD2, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
+  0x41, 0x4e, 0x44, 0x52, 0x4f, 0x49, 0x44, 0x21, 0x00, 0x10, 0x00, 0x00,
+  0xf0, 0xbf, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x48,
+  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x11, 0x04, 0x0e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x62, 0x6f, 0x6f, 0x74, 0x6f, 0x70, 0x74, 0x3d,
+  0x36, 0x34, 0x53, 0x33, 0x2c, 0x33, 0x32, 0x4e, 0x32, 0x2c, 0x33, 0x32,
+  0x4e, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x4c, 0xc0, 0xe6, 0x81, 0x18, 0x0f, 0xe4, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x5c, 0xc0, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xbc, 0xe3, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xa4, 0xba, 0xe0, 0x81, 0x00, 0xc1, 0xe6, 0x81,
+  0x00, 0x02, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xd0, 0xbc, 0xe3, 0x81,
+  0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
+  0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
+  0x99, 0x1d, 0xe0, 0x81, 0xad, 0xde, 0x00, 0x00, 0x00, 0xc1, 0xe6, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xd0, 0x1f, 0xe5, 0x13, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xb0, 0x8b,
+  0x03, 0x4a, 0x13, 0x68, 0x9b, 0x06, 0xfc, 0xd5, 0x02, 0x4b, 0x18, 0x60,
+  0x70, 0x47, 0x00, 0xbf, 0x14, 0x20, 0x00, 0x11, 0x00, 0x20, 0x00, 0x11,
+  0x0a, 0x28, 0x01, 0x46, 0x08, 0xb5, 0x02, 0xd1, 0x0d, 0x20, 0xff, 0xf7,
+  0xed, 0xff, 0x08, 0x46, 0xff, 0xf7, 0xea, 0xff, 0x08, 0xbd, 0x38, 0xb5,
+  0x45, 0x1e, 0x15, 0xf8, 0x01, 0x4f, 0x24, 0xb9, 0x0a, 0x20, 0xff, 0xf7,
+  0xed, 0xff, 0x20, 0x46, 0x38, 0xbd, 0x20, 0x46, 0xff, 0xf7, 0xe8, 0xff,
+  0xf3, 0xe7, 0x00, 0xbf, 0x7f, 0xb5, 0x4f, 0xf4, 0x00, 0x15, 0x0e, 0x4e,
+  0x0e, 0x48, 0x0f, 0x4c, 0xff, 0xf7, 0xe9, 0xff, 0x33, 0x68, 0x98, 0x47,
+  0x01, 0x95, 0x01, 0x23, 0x02, 0x93, 0x4f, 0xf4, 0x00, 0x12, 0x00, 0x94,
+  0x00, 0x23, 0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46, 0x20, 0x46,
+  0x98, 0x47, 0x07, 0x48, 0xff, 0xf7, 0xd7, 0xff, 0xa0, 0x47, 0x06, 0x48,
+  0xff, 0xf7, 0xd3, 0xff, 0xfe, 0xe7, 0x00, 0xbf, 0x04, 0xc2, 0xe6, 0x81,
+  0xac, 0xc1, 0xe6, 0x81, 0x00, 0x00, 0xb0, 0x8a, 0xd0, 0xc1, 0xe6, 0x81,
+  0xe4, 0xc1, 0xe6, 0x81, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x6c, 0x6f, 0x61,
+  0x64, 0x65, 0x72, 0x20, 0x62, 0x79, 0x20, 0x78, 0x79, 0x7a, 0x2e, 0x20,
+  0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x32, 0x30,
+  0x31, 0x39, 0x2e, 0x00, 0x4a, 0x75, 0x6d, 0x70, 0x20, 0x74, 0x6f, 0x20,
+  0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x00,
+  0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x77, 0x65,
+  0x6e, 0x74, 0x20, 0x68, 0x6f, 0x72, 0x72, 0x69, 0x62, 0x6c, 0x79, 0x20,
+  0x77, 0x72, 0x6f, 0x6e, 0x67, 0x21, 0x00, 0x00, 0xf1, 0x54, 0xe3, 0x81,
+  0xd0, 0xbc, 0xe3, 0x81, 0x70, 0xd3, 0xe6, 0x81, 0x89, 0x22, 0xe4, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
 };
 
 static int repatch_boot() {
@@ -450,7 +472,7 @@ static int repatch_boot() {
 
   gui_print_color("highlight", EXPLOIT_TAG "Install boot patch... ");
 
-  fp = fopen(karnak_boot_part, "r+b");
+  fp = fopen(ford_boot_part, "r+b");
   if (!fp) {
     gui_print_color("highlight", EXPLOIT_TAG "Failed to open the boot device");
     goto cleanup;

From 6ee2f6a10a2de50a8ca2af15663efac05e2928bc Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Wed, 13 Feb 2019 04:56:11 +0100
Subject: [PATCH 006/207] also patch recovery and with flash image

---
 Android.mk    |   3 +-
 amonet.cpp    | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++
 amonet.h      |  15 ++++
 twinstall.cpp | 199 +----------------------------------------
 4 files changed, 262 insertions(+), 198 deletions(-)
 create mode 100644 amonet.cpp
 create mode 100644 amonet.h

diff --git a/Android.mk b/Android.mk
index 6eb1cbcd53..a82267d6a6 100755
--- a/Android.mk
+++ b/Android.mk
@@ -64,7 +64,8 @@ LOCAL_SRC_FILES := \
     twrpDigestDriver.cpp \
     openrecoveryscript.cpp \
     tarWrite.c \
-    twrpAdbBuFifo.cpp
+    twrpAdbBuFifo.cpp \
+    amonet.cpp
 
 ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
   LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
diff --git a/amonet.cpp b/amonet.cpp
new file mode 100644
index 0000000000..8b8a97366d
--- /dev/null
+++ b/amonet.cpp
@@ -0,0 +1,243 @@
+#include <string.h>
+
+#include "amonet.h"
+#include "twcommon.h"
+
+static const char *ford_boot_part = "/dev/block/platform/mtk-msdc.0/by-name/boot";
+static const char *ford_recovery_part = "/dev/block/platform/mtk-msdc.0/by-name/recovery";
+
+static uint8_t microloader_bin[1024] = {
+  0x41, 0x4e, 0x44, 0x52, 0x4f, 0x49, 0x44, 0x21, 0x00, 0x10, 0x00, 0x00,
+  0xf0, 0xbf, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x48,
+  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x11, 0x04, 0x0e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x62, 0x6f, 0x6f, 0x74, 0x6f, 0x70, 0x74, 0x3d,
+  0x36, 0x34, 0x53, 0x33, 0x2c, 0x33, 0x32, 0x4e, 0x32, 0x2c, 0x33, 0x32,
+  0x4e, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x4c, 0xc0, 0xe6, 0x81, 0x18, 0x0f, 0xe4, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x5c, 0xc0, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xbc, 0xe3, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xa4, 0xba, 0xe0, 0x81, 0x00, 0xc1, 0xe6, 0x81,
+  0x00, 0x02, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xd0, 0xbc, 0xe3, 0x81,
+  0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
+  0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
+  0x99, 0x1d, 0xe0, 0x81, 0xad, 0xde, 0x00, 0x00, 0x00, 0xc1, 0xe6, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xd0, 0x1f, 0xe5, 0x13, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xb0, 0x8b,
+  0x03, 0x4a, 0x13, 0x68, 0x9b, 0x06, 0xfc, 0xd5, 0x02, 0x4b, 0x18, 0x60,
+  0x70, 0x47, 0x00, 0xbf, 0x14, 0x20, 0x00, 0x11, 0x00, 0x20, 0x00, 0x11,
+  0x0a, 0x28, 0x01, 0x46, 0x08, 0xb5, 0x02, 0xd1, 0x0d, 0x20, 0xff, 0xf7,
+  0xed, 0xff, 0x08, 0x46, 0xff, 0xf7, 0xea, 0xff, 0x08, 0xbd, 0x38, 0xb5,
+  0x45, 0x1e, 0x15, 0xf8, 0x01, 0x4f, 0x24, 0xb9, 0x0a, 0x20, 0xff, 0xf7,
+  0xed, 0xff, 0x20, 0x46, 0x38, 0xbd, 0x20, 0x46, 0xff, 0xf7, 0xe8, 0xff,
+  0xf3, 0xe7, 0x00, 0xbf, 0x7f, 0xb5, 0x4f, 0xf4, 0x00, 0x15, 0x0e, 0x4e,
+  0x0e, 0x48, 0x0f, 0x4c, 0xff, 0xf7, 0xe9, 0xff, 0x33, 0x68, 0x98, 0x47,
+  0x01, 0x95, 0x01, 0x23, 0x02, 0x93, 0x4f, 0xf4, 0x00, 0x12, 0x00, 0x94,
+  0x00, 0x23, 0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46, 0x20, 0x46,
+  0x98, 0x47, 0x07, 0x48, 0xff, 0xf7, 0xd7, 0xff, 0xa0, 0x47, 0x06, 0x48,
+  0xff, 0xf7, 0xd3, 0xff, 0xfe, 0xe7, 0x00, 0xbf, 0x04, 0xc2, 0xe6, 0x81,
+  0xac, 0xc1, 0xe6, 0x81, 0x00, 0x00, 0xb0, 0x8a, 0xd0, 0xc1, 0xe6, 0x81,
+  0xe4, 0xc1, 0xe6, 0x81, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x6c, 0x6f, 0x61,
+  0x64, 0x65, 0x72, 0x20, 0x62, 0x79, 0x20, 0x78, 0x79, 0x7a, 0x2e, 0x20,
+  0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x32, 0x30,
+  0x31, 0x39, 0x2e, 0x00, 0x4a, 0x75, 0x6d, 0x70, 0x20, 0x74, 0x6f, 0x20,
+  0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x00,
+  0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x77, 0x65,
+  0x6e, 0x74, 0x20, 0x68, 0x6f, 0x72, 0x72, 0x69, 0x62, 0x6c, 0x79, 0x20,
+  0x77, 0x72, 0x6f, 0x6e, 0x67, 0x21, 0x00, 0x00, 0xf1, 0x54, 0xe3, 0x81,
+  0xd0, 0xbc, 0xe3, 0x81, 0x70, 0xd3, 0xe6, 0x81, 0x89, 0x22, 0xe4, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
+};
+
+int repatch() {
+  return repatch_boot() + repatch_recovery();
+}
+
+int repatch_boot() {
+  return repatch_part(0);
+}
+
+int unpatch_boot() {
+  return unpatch_part(0);
+}
+
+int repatch_recovery() {
+  return repatch_part(1);
+}
+
+int unpatch_recovery() {
+  return unpatch_part(1);
+}
+
+int unpatch_part(uint8_t part) {
+  FILE *fp = NULL;
+  uint8_t boot_data[0x800];
+  int ret = -1;
+
+  static const char *ford_part;
+  static const char *part_name;
+
+  if(part == 1) {
+    ford_part = ford_recovery_part;
+    part_name = "recovery";
+  }
+  else {
+    ford_part = ford_boot_part;
+    part_name = "boot";
+  }
+  
+  gui_print_color("highlight", EXPLOIT_TAG "Remove %s patch...", part_name);
+
+  fp = fopen(ford_part, "r+b");
+  if (!fp) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device", part_name);
+    goto cleanup;
+  }
+
+  if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data");
+    goto cleanup;
+  }
+
+  if (memcmp(boot_data + 0x400, "ANDROID!", 8) != 0) {
+    // Exploit not installed yet, but that's okay
+    gui_print_color("highlight", EXPLOIT_TAG "NOT_INSTALLED");
+    ret = 0;
+    goto cleanup;
+  }
+
+  // Assume exploit is installed. Uninstall it by copying the second 0x400 over the first 0x400
+  memcpy(boot_data, boot_data + 0x400, 0x400);
+  // and zero out the second 0x400
+  memset(boot_data + 0x400, 0, 0x400);
+
+  if (fseek(fp, 0, SEEK_SET) != 0) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek");
+    goto cleanup;
+  }
+
+  if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data");
+    goto cleanup;
+  }
+
+  gui_print_color("highlight", EXPLOIT_TAG "OK");
+  ret = 0;
+
+cleanup:
+  if (fp) {
+    fclose(fp);
+    fp = NULL;
+  }
+
+  return ret;
+}
+
+int repatch_part(uint8_t part) {
+  FILE *fp = NULL;
+  uint8_t boot_data[0x800];
+  int ret = -1;
+
+  static const char *ford_part;
+  static const char *part_name;
+
+  if(part == 1) {
+    ford_part = ford_recovery_part;
+    part_name = "recovery";
+  }
+  else {
+    ford_part = ford_boot_part;
+    part_name = "boot";
+  }
+
+  gui_print_color("highlight", EXPLOIT_TAG "Install %s patch... ", part_name);
+
+  fp = fopen(ford_part, "r+b");
+  if (!fp) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device", part_name);
+    goto cleanup;
+  }
+
+  if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data");
+    goto cleanup;
+  }
+
+  if (memcmp(boot_data + 0x400, "ANDROID!", 8) == 0) {
+    // Exploit not installed yet, but that's okay
+    gui_print_color("highlight", EXPLOIT_TAG "ALREADY_INSTALLED"); // If the rom author injected the boot image herself
+    ret = 0;
+    goto cleanup;
+  }
+
+  // Copy first half to the second half, replace first half with the microloader
+  memcpy(boot_data + 0x400, boot_data, 0x400);
+  memcpy(boot_data, microloader_bin, 0x400);
+
+  if (fseek(fp, 0, SEEK_SET) != 0) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek");
+    goto cleanup;
+  }
+
+  if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data");
+    goto cleanup;
+  }
+
+  gui_print_color("highlight", EXPLOIT_TAG "OK");
+  ret = 0;
+
+cleanup:
+  if (fp) {
+    fclose(fp);
+    fp = NULL;
+  }
+
+  return ret;
+}
diff --git a/amonet.h b/amonet.h
new file mode 100644
index 0000000000..1b23215c01
--- /dev/null
+++ b/amonet.h
@@ -0,0 +1,15 @@
+#ifndef RECOVERY_AMONET_H_
+#define RECOVERY_AMONET_H_
+
+#include <unistd.h>
+
+#define EXPLOIT_TAG "[amonet] "
+int unpatch_boot();
+int repatch_boot();
+int repatch_recovery();
+int unpatch_recovery();
+int repatch();
+int unpatch_part(uint8_t part);
+int repatch_part(uint8_t part);
+
+#endif  // RECOVERY_AMONET_H_
diff --git a/twinstall.cpp b/twinstall.cpp
index 88a0eccf75..7c3063840c 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -61,6 +61,7 @@
 #include "legacy_property_service.h"
 #include "twinstall.h"
 #include "installcommand.h"
+#include "amonet.h"
 extern "C" {
 	#include "gui/gui.h"
 }
@@ -320,202 +321,6 @@ static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zi
 	return INSTALL_SUCCESS;
 }
 
-const char *ford_boot_part = "/dev/block/platform/mtk-msdc.0/by-name/boot";
-
-#define EXPLOIT_TAG "[amonet] "
-
-static int unpatch_boot() {
-  FILE *fp = NULL;
-  uint8_t boot_data[0x800];
-  int ret = -1;
-
-  gui_print_color("highlight", EXPLOIT_TAG "Remove boot patch...");
-
-  fp = fopen(ford_boot_part, "r+b");
-  if (!fp) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the boot device");
-    goto cleanup;
-  }
-
-  if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data");
-    goto cleanup;
-  }
-
-  if (memcmp(boot_data + 0x400, "ANDROID!", 8) != 0) {
-    // Exploit not installed yet, but that's okay
-    gui_print_color("highlight", EXPLOIT_TAG "NOT_INSTALLED");
-    ret = 0;
-    goto cleanup;
-  }
-
-  // Assume exploit is installed. Uninstall it by copying the second 0x400 over the first 0x400
-  memcpy(boot_data, boot_data + 0x400, 0x400);
-  // and zero out the second 0x400
-  memset(boot_data + 0x400, 0, 0x400);
-
-  if (fseek(fp, 0, SEEK_SET) != 0) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek");
-    goto cleanup;
-  }
-
-  if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data");
-    goto cleanup;
-  }
-
-  gui_print_color("highlight", EXPLOIT_TAG "OK");
-  ret = 0;
-
-cleanup:
-  if (fp) {
-    fclose(fp);
-    fp = NULL;
-  }
-
-  return ret;
-}
-
-static uint8_t microloader_bin[1024] = {
-  0x41, 0x4e, 0x44, 0x52, 0x4f, 0x49, 0x44, 0x21, 0x00, 0x10, 0x00, 0x00,
-  0xf0, 0xbf, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x48,
-  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x11, 0x04, 0x0e,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x62, 0x6f, 0x6f, 0x74, 0x6f, 0x70, 0x74, 0x3d,
-  0x36, 0x34, 0x53, 0x33, 0x2c, 0x33, 0x32, 0x4e, 0x32, 0x2c, 0x33, 0x32,
-  0x4e, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x4c, 0xc0, 0xe6, 0x81, 0x18, 0x0f, 0xe4, 0x81,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x5c, 0xc0, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xbc, 0xe3, 0x81,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xa4, 0xba, 0xe0, 0x81, 0x00, 0xc1, 0xe6, 0x81,
-  0x00, 0x02, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xd0, 0xbc, 0xe3, 0x81,
-  0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
-  0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
-  0x99, 0x1d, 0xe0, 0x81, 0xad, 0xde, 0x00, 0x00, 0x00, 0xc1, 0xe6, 0x81,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0xd0, 0x1f, 0xe5, 0x13, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xb0, 0x8b,
-  0x03, 0x4a, 0x13, 0x68, 0x9b, 0x06, 0xfc, 0xd5, 0x02, 0x4b, 0x18, 0x60,
-  0x70, 0x47, 0x00, 0xbf, 0x14, 0x20, 0x00, 0x11, 0x00, 0x20, 0x00, 0x11,
-  0x0a, 0x28, 0x01, 0x46, 0x08, 0xb5, 0x02, 0xd1, 0x0d, 0x20, 0xff, 0xf7,
-  0xed, 0xff, 0x08, 0x46, 0xff, 0xf7, 0xea, 0xff, 0x08, 0xbd, 0x38, 0xb5,
-  0x45, 0x1e, 0x15, 0xf8, 0x01, 0x4f, 0x24, 0xb9, 0x0a, 0x20, 0xff, 0xf7,
-  0xed, 0xff, 0x20, 0x46, 0x38, 0xbd, 0x20, 0x46, 0xff, 0xf7, 0xe8, 0xff,
-  0xf3, 0xe7, 0x00, 0xbf, 0x7f, 0xb5, 0x4f, 0xf4, 0x00, 0x15, 0x0e, 0x4e,
-  0x0e, 0x48, 0x0f, 0x4c, 0xff, 0xf7, 0xe9, 0xff, 0x33, 0x68, 0x98, 0x47,
-  0x01, 0x95, 0x01, 0x23, 0x02, 0x93, 0x4f, 0xf4, 0x00, 0x12, 0x00, 0x94,
-  0x00, 0x23, 0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46, 0x20, 0x46,
-  0x98, 0x47, 0x07, 0x48, 0xff, 0xf7, 0xd7, 0xff, 0xa0, 0x47, 0x06, 0x48,
-  0xff, 0xf7, 0xd3, 0xff, 0xfe, 0xe7, 0x00, 0xbf, 0x04, 0xc2, 0xe6, 0x81,
-  0xac, 0xc1, 0xe6, 0x81, 0x00, 0x00, 0xb0, 0x8a, 0xd0, 0xc1, 0xe6, 0x81,
-  0xe4, 0xc1, 0xe6, 0x81, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x6c, 0x6f, 0x61,
-  0x64, 0x65, 0x72, 0x20, 0x62, 0x79, 0x20, 0x78, 0x79, 0x7a, 0x2e, 0x20,
-  0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x32, 0x30,
-  0x31, 0x39, 0x2e, 0x00, 0x4a, 0x75, 0x6d, 0x70, 0x20, 0x74, 0x6f, 0x20,
-  0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x00,
-  0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x77, 0x65,
-  0x6e, 0x74, 0x20, 0x68, 0x6f, 0x72, 0x72, 0x69, 0x62, 0x6c, 0x79, 0x20,
-  0x77, 0x72, 0x6f, 0x6e, 0x67, 0x21, 0x00, 0x00, 0xf1, 0x54, 0xe3, 0x81,
-  0xd0, 0xbc, 0xe3, 0x81, 0x70, 0xd3, 0xe6, 0x81, 0x89, 0x22, 0xe4, 0x81,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00
-};
-
-static int repatch_boot() {
-  FILE *fp = NULL;
-  uint8_t boot_data[0x800];
-  int ret = -1;
-
-  gui_print_color("highlight", EXPLOIT_TAG "Install boot patch... ");
-
-  fp = fopen(ford_boot_part, "r+b");
-  if (!fp) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the boot device");
-    goto cleanup;
-  }
-
-  if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data");
-    goto cleanup;
-  }
-
-  if (memcmp(boot_data + 0x400, "ANDROID!", 8) == 0) {
-    // Exploit not installed yet, but that's okay
-    gui_print_color("highlight", EXPLOIT_TAG "ALREADY_INSTALLED"); // If the rom author injected the boot image herself
-    ret = 0;
-    goto cleanup;
-  }
-
-  // Copy first half to the second half, replace first half with the microloader
-  memcpy(boot_data + 0x400, boot_data, 0x400);
-  memcpy(boot_data, microloader_bin, 0x400);
-
-  if (fseek(fp, 0, SEEK_SET) != 0) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek");
-    goto cleanup;
-  }
-
-  if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data");
-    goto cleanup;
-  }
-
-  gui_print_color("highlight", EXPLOIT_TAG "OK");
-  ret = 0;
-
-cleanup:
-  if (fp) {
-    fclose(fp);
-    fp = NULL;
-  }
-
-  return ret;
-}
-
 int TWinstall_zip(const char* path, int* wipe_cache) {
 	int ret_val, zip_verify = 1;
 
@@ -636,7 +441,7 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 					ret_val = INSTALL_ERROR;
 				if (ret_val == INSTALL_SUCCESS)
 					ret_val = Run_Update_Binary(path, &Zip, wipe_cache, UPDATE_BINARY_ZIP_TYPE);
-				if (repatch_boot() < 0)
+				if (repatch() < 0)
 					ret_val = INSTALL_ERROR;
 			}
 		}

From 97950c3d09afa1d72035cf046f14d6a77e270f72 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Wed, 13 Feb 2019 04:57:01 +0100
Subject: [PATCH 007/207] Add Button to enter Hacked BL

---
 .../bootloader_message.cpp                    | 12 ++++++++++++
 .../bootloader_message.h                      |  3 +++
 data.cpp                                      |  6 ++++++
 gui/theme/common/landscape.xml                | 19 +++++++++++++++++++
 gui/theme/common/languages/cz.xml             |  1 +
 gui/theme/common/languages/de.xml             |  1 +
 gui/theme/common/languages/el.xml             |  1 +
 gui/theme/common/languages/en.xml             |  1 +
 gui/theme/common/languages/es.xml             |  1 +
 gui/theme/common/languages/fr.xml             |  1 +
 gui/theme/common/languages/hu.xml             |  1 +
 gui/theme/common/languages/it.xml             |  1 +
 gui/theme/common/languages/nl.xml             |  1 +
 gui/theme/common/languages/pl.xml             |  1 +
 gui/theme/common/languages/pt_BR.xml          |  1 +
 gui/theme/common/languages/pt_PT.xml          |  1 +
 gui/theme/common/languages/ru.xml             |  1 +
 gui/theme/common/languages/sk.xml             |  1 +
 gui/theme/common/languages/sl.xml             |  1 +
 gui/theme/common/languages/sv.xml             |  1 +
 gui/theme/common/languages/tr.xml             |  1 +
 gui/theme/common/languages/uk.xml             |  1 +
 openrecoveryscript.cpp                        |  2 ++
 partitionmanager.cpp                          |  3 +++
 twrp-functions.cpp                            | 10 ++++++++++
 twrp-functions.hpp                            |  1 +
 twrp.cpp                                      |  2 ++
 variables.h                                   |  1 +
 28 files changed, 77 insertions(+)

diff --git a/bootloader_message_twrp/bootloader_message.cpp b/bootloader_message_twrp/bootloader_message.cpp
index a06ad9a89f..4b18e3b2ae 100644
--- a/bootloader_message_twrp/bootloader_message.cpp
+++ b/bootloader_message_twrp/bootloader_message.cpp
@@ -213,6 +213,18 @@ bool clear_bootloader_message(std::string* err) {
   return write_bootloader_message(boot, err);
 }
 
+// libc++ in 5.1 does not know how to handle a std::string* so this craziness is needed
+bool amonet_bootloader_message(void* err) {
+  std::string &s = *(static_cast<std::string*>(err));
+  return amonet_bootloader_message(&s);
+}
+
+bool amonet_bootloader_message(std::string* err) {
+  bootloader_message boot = {};
+  strlcpy(boot.command, "boot-amonet", sizeof(boot.command));
+  return write_bootloader_message(boot, err);
+}
+
 bool write_bootloader_message(const std::vector<std::string>& options, std::string* err) {
   bootloader_message boot = {};
   strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
diff --git a/bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h b/bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h
index 52c1b86f0e..69638406d1 100644
--- a/bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h
+++ b/bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h
@@ -211,6 +211,9 @@ bool update_bootloader_message(const std::vector<std::string>& options, std::str
 bool clear_bootloader_message(void* err);
 bool clear_bootloader_message(std::string* err);
 
+bool amonet_bootloader_message(void* err);
+bool amonet_bootloader_message(std::string* err);
+
 // Writes the reboot-bootloader reboot reason to the bootloader_message.
 bool write_reboot_bootloader(std::string* err);
 
diff --git a/data.cpp b/data.cpp
index 884cee25dd..4b30bdfee1 100755
--- a/data.cpp
+++ b/data.cpp
@@ -646,6 +646,12 @@ void DataManager::SetDefaultValues()
 #else
 	mConst.SetValue(TW_REBOOT_BOOTLOADER, "1");
 #endif
+#ifdef TW_NO_REBOOT_HACKED_BL
+	printf("TW_NO_REBOOT_HACKED_BL := true\n");
+	mConst.SetValue(TW_REBOOT_HACKED_BL, "0");
+#else
+	mConst.SetValue(TW_REBOOT_HACKED_BL, "1");
+#endif
 #ifdef RECOVERY_SDCARD_ON_DATA
 	printf("RECOVERY_SDCARD_ON_DATA := true\n");
 	mConst.SetValue(TW_HAS_DATA_MEDIA, "1");
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index a3e6ed82a1..62f6d089b3 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2696,6 +2696,25 @@
 				</actions>
 			</button>
 
+			<button style="main_button">
+				<condition var1="tw_reboot_hacked_bl" var2="1"/>
+				<placement x="%col1_x_left%" y="%row11_y%"/>
+				<text>{@rb_hacked_bl_btn=Hacked BL}</text>
+				<actions>
+					<action function="set">tw_back=reboot</action>
+					<action function="set">tw_action=reboot</action>
+					<action function="set">tw_action_param=hacked_bl</action>
+					<action function="set">tw_reboot_param=hacked_bl</action>
+					<action function="set">tw_has_action2=0</action>
+					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+					<action function="page">rebootcheck</action>
+				</actions>
+			</button>
+
 			<button style="main_button">
 				<condition var1="tw_download_mode" var2="1"/>
 				<placement x="%col1_x_left%" y="%row11_y%"/>
diff --git a/gui/theme/common/languages/cz.xml b/gui/theme/common/languages/cz.xml
index 7f7fc3cb66..9168d694bd 100644
--- a/gui/theme/common/languages/cz.xml
+++ b/gui/theme/common/languages/cz.xml
@@ -261,6 +261,7 @@
 		<string name="rb_poweroff_btn">Vypnout</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Stáhnout</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Vypínání...</string>
diff --git a/gui/theme/common/languages/de.xml b/gui/theme/common/languages/de.xml
index 56f7ebd92c..927e130527 100644
--- a/gui/theme/common/languages/de.xml
+++ b/gui/theme/common/languages/de.xml
@@ -282,6 +282,7 @@
 		<string name="rb_poweroff_btn">Ausschalten</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Ausschalten...</string>
diff --git a/gui/theme/common/languages/el.xml b/gui/theme/common/languages/el.xml
index 8ac681d2d7..90751fd1d8 100644
--- a/gui/theme/common/languages/el.xml
+++ b/gui/theme/common/languages/el.xml
@@ -272,6 +272,7 @@
         <string name="rb_poweroff_btn">Απενεργοποίηση</string>
         <string name="rb_recovery_btn">Recovery</string>
         <string name="rb_bootloader_btn">Bootloader</string>
+	<string name="rb_hacked_bl_btn">Hacked BL</string>
         <string name="rb_download_btn">Λήψη</string>
 		<string name="rb_edl_btn">Edl</string>
         <string name="turning_off">Απενεργοποίηση...</string>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index e61f6c0a85..d3c5191c62 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -287,6 +287,7 @@
 		<string name="rb_poweroff_btn">Power Off</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Turning Off...</string>
diff --git a/gui/theme/common/languages/es.xml b/gui/theme/common/languages/es.xml
index e096e660f6..8031d00c93 100644
--- a/gui/theme/common/languages/es.xml
+++ b/gui/theme/common/languages/es.xml
@@ -262,6 +262,7 @@
 		<string name="rb_poweroff_btn">Apagar</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Descarga</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Apagando...</string>
diff --git a/gui/theme/common/languages/fr.xml b/gui/theme/common/languages/fr.xml
index 6ae3298ef6..a244c39c13 100644
--- a/gui/theme/common/languages/fr.xml
+++ b/gui/theme/common/languages/fr.xml
@@ -259,6 +259,7 @@
         <string name="rb_poweroff_btn">Eteindre</string>
         <string name="rb_recovery_btn">Récupération</string>
         <string name="rb_bootloader_btn">Amorçage</string>
+	<string name="rb_hacked_bl_btn">Hacked BL</string>
         <string name="rb_download_btn">Télécharger</string>
 		<string name="rb_edl_btn">Edl</string>
         <string name="turning_off">Arrêt en cours...</string>
diff --git a/gui/theme/common/languages/hu.xml b/gui/theme/common/languages/hu.xml
index 96557ac7c4..33e9fd5c79 100644
--- a/gui/theme/common/languages/hu.xml
+++ b/gui/theme/common/languages/hu.xml
@@ -282,6 +282,7 @@
 		<string name="rb_poweroff_btn">Kikapcsolás</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Download mód</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Kikapcsolás...</string>
diff --git a/gui/theme/common/languages/it.xml b/gui/theme/common/languages/it.xml
index 81ec46fe4e..38478de935 100644
--- a/gui/theme/common/languages/it.xml
+++ b/gui/theme/common/languages/it.xml
@@ -282,6 +282,7 @@
 		<string name="rb_poweroff_btn">Spegni</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Spegnimento in corso...</string>
diff --git a/gui/theme/common/languages/nl.xml b/gui/theme/common/languages/nl.xml
index 8dadd40acc..5498491a81 100644
--- a/gui/theme/common/languages/nl.xml
+++ b/gui/theme/common/languages/nl.xml
@@ -269,6 +269,7 @@
 		<string name="rb_poweroff_btn">Uitzetten</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Uitschakelen...</string>
diff --git a/gui/theme/common/languages/pl.xml b/gui/theme/common/languages/pl.xml
index e337455a7f..3d51e092bb 100644
--- a/gui/theme/common/languages/pl.xml
+++ b/gui/theme/common/languages/pl.xml
@@ -269,6 +269,7 @@
 		<string name="rb_poweroff_btn">Wyłącz</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Wyłączanie...</string>
diff --git a/gui/theme/common/languages/pt_BR.xml b/gui/theme/common/languages/pt_BR.xml
index f540e4c457..7809c03e04 100644
--- a/gui/theme/common/languages/pt_BR.xml
+++ b/gui/theme/common/languages/pt_BR.xml
@@ -261,6 +261,7 @@
 		<string name="rb_poweroff_btn">Desligar</string>
 		<string name="rb_recovery_btn">Recuperação</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Baixar</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Desligar...</string>
diff --git a/gui/theme/common/languages/pt_PT.xml b/gui/theme/common/languages/pt_PT.xml
index 40ef41f8be..7311fa2539 100644
--- a/gui/theme/common/languages/pt_PT.xml
+++ b/gui/theme/common/languages/pt_PT.xml
@@ -283,6 +283,7 @@
 		<string name="rb_poweroff_btn">Desligar</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Descarregar</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">A desligar...</string>
diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index 95fd3718af..8b3eb62fd4 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -279,6 +279,7 @@
 		<string name="rb_poweroff_btn">Выключение</string>
 		<string name="rb_recovery_btn">Рекавери</string>
 		<string name="rb_bootloader_btn">Загрузчик</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Режим загрузки</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Выключение...</string>
diff --git a/gui/theme/common/languages/sk.xml b/gui/theme/common/languages/sk.xml
index f4e56ef997..9ba7cb9e8a 100644
--- a/gui/theme/common/languages/sk.xml
+++ b/gui/theme/common/languages/sk.xml
@@ -261,6 +261,7 @@
 		<string name="rb_poweroff_btn">Vypnúť</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Stiahnuť</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Vypínanie...</string>
diff --git a/gui/theme/common/languages/sl.xml b/gui/theme/common/languages/sl.xml
index 4259e625d5..4d88f4130c 100644
--- a/gui/theme/common/languages/sl.xml
+++ b/gui/theme/common/languages/sl.xml
@@ -261,6 +261,7 @@
 		<string name="rb_poweroff_btn">Izklopi</string>
 		<string name="rb_recovery_btn">Obnovitev</string>
 		<string name="rb_bootloader_btn">Zagonski nalagalnik</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Prejmi</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Izklapljanje …</string>
diff --git a/gui/theme/common/languages/sv.xml b/gui/theme/common/languages/sv.xml
index c898957781..dbc27a6a0d 100644
--- a/gui/theme/common/languages/sv.xml
+++ b/gui/theme/common/languages/sv.xml
@@ -100,6 +100,7 @@
 		<string name="usb_storage_hdr">USB-lagring</string>
 		<string name="rb_system_btn">System</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Ladda ner</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Stänger av...</string>
diff --git a/gui/theme/common/languages/tr.xml b/gui/theme/common/languages/tr.xml
index 8e924cb576..1993be3a67 100644
--- a/gui/theme/common/languages/tr.xml
+++ b/gui/theme/common/languages/tr.xml
@@ -283,6 +283,7 @@
 		<string name="rb_poweroff_btn">Kapat</string>
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Kapatılıyor...</string>
diff --git a/gui/theme/common/languages/uk.xml b/gui/theme/common/languages/uk.xml
index 9b267d26ee..4b874539bc 100644
--- a/gui/theme/common/languages/uk.xml
+++ b/gui/theme/common/languages/uk.xml
@@ -265,6 +265,7 @@
 		<string name="rb_poweroff_btn">Вимкнення</string>
 		<string name="rb_recovery_btn">Рекавері</string>
 		<string name="rb_bootloader_btn">Завантажувач</string>
+		<string name="rb_hacked_bl_btn">Hacked BL</string>
 		<string name="rb_download_btn">Режим завантаження</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Вимкнення...</string>
diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index 9478cd751d..133efe0191 100755
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -345,6 +345,8 @@ int OpenRecoveryScript::run_script_file(void) {
 					TWFunc::tw_reboot(rb_download);
 				else if (strlen(value) && strcmp(value, "edl") == 0)
 					TWFunc::tw_reboot(rb_edl);
+				else if (strlen(value) && strcmp(value, "hacked_bl") == 0)
+					TWFunc::tw_reboot(rb_hacked_bl);
 				else
 					TWFunc::tw_reboot(rb_system);
 			} else if (strcmp(command, "cmd") == 0) {
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 6b5ee1cca4..7b736977a6 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -53,6 +53,7 @@
 #include "progresstracking.hpp"
 #include "twrpDigestDriver.hpp"
 #include "adbbu/libtwadbbu.hpp"
+#include "amonet.h"
 
 #ifdef TW_HAS_MTP
 #ifdef TW_HAS_LEGACY_MTP
@@ -2543,6 +2544,8 @@ bool TWPartitionManager::Flash_Image(string& path, string& filename) {
 		return false;
 	}
 	gui_highlight("flash_done=IMAGE FLASH COMPLETED]");
+	if (repatch() < 0)
+		return false;
 	return true;
 }
 
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 84451b3b6c..37a7361c46 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -584,6 +584,7 @@ int TWFunc::tw_reboot(RebootCommand command)
 	Update_Log_File();
 	// Always force a sync before we reboot
 	sync();
+	std::string err;
 
 	switch (command) {
 		case rb_current:
@@ -611,6 +612,15 @@ int TWFunc::tw_reboot(RebootCommand command)
 			return property_set(ANDROID_RB_PROPERTY, "reboot,bootloader");
 #else
 			return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_RESTART2, (void*) "bootloader");
+#endif
+		case rb_hacked_bl:
+			if(!amonet_bootloader_message((void*)&err)) {
+				LOGERR("%s\n", err.c_str());
+			}
+#ifdef ANDROID_RB_PROPERTY
+			return property_set(ANDROID_RB_PROPERTY, "reboot,recovery");
+#else
+			return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_RESTART2, (void*) "recovery");
 #endif
 		case rb_poweroff:
 			check_and_run_script("/sbin/poweroff.sh", "power off");
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 669a9e9703..aeb1981df0 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -38,6 +38,7 @@ typedef enum
 	rb_bootloader,     // May also be fastboot
 	rb_download,
 	rb_edl,
+	rb_hacked_bl,
 } RebootCommand;
 
 enum Archive_Type {
diff --git a/twrp.cpp b/twrp.cpp
index 95e376b5a5..4327df3638 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -347,6 +347,8 @@ int main(int argc, char **argv) {
 		TWFunc::tw_reboot(rb_download);
 	else if (Reboot_Arg == "edl")
 		TWFunc::tw_reboot(rb_edl);
+	else if (Reboot_Arg == "hacked_bl")
+		TWFunc::tw_reboot(rb_hacked_bl);
 	else
 		TWFunc::tw_reboot(rb_system);
 
diff --git a/variables.h b/variables.h
index 3b614326ad..317c6d2e3c 100644
--- a/variables.h
+++ b/variables.h
@@ -96,6 +96,7 @@
 #define TW_REBOOT_RECOVERY          "tw_reboot_recovery"
 #define TW_REBOOT_POWEROFF          "tw_reboot_poweroff"
 #define TW_REBOOT_BOOTLOADER        "tw_reboot_bootloader"
+#define TW_REBOOT_HACKED_BL         "tw_reboot_hacked_bl"
 
 #define TW_USE_EXTERNAL_STORAGE     "tw_use_external_storage"
 #define TW_HAS_INTERNAL             "tw_has_internal"

From ffe97f81cb80d196fdd9a7bb628bf437a873bad1 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Thu, 14 Feb 2019 06:57:01 +0100
Subject: [PATCH 008/207] Make amonet selectable using TW_AMONET and update
 microloader

---
 Android.mk           |  3 +++
 amonet.cpp           | 50 ++++++++++++++++++++++++--------------------
 amonet.h             |  2 ++
 data.cpp             |  6 +++---
 partitionmanager.cpp |  2 ++
 twinstall.cpp        |  4 ++++
 6 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/Android.mk b/Android.mk
index a82267d6a6..27816eca90 100755
--- a/Android.mk
+++ b/Android.mk
@@ -257,6 +257,9 @@ endif
 ifeq ($(TW_NO_REBOOT_BOOTLOADER), true)
     LOCAL_CFLAGS += -DTW_NO_REBOOT_BOOTLOADER
 endif
+ifeq ($(TW_AMONET), true)
+    LOCAL_CFLAGS += -DTW_AMONET
+endif
 ifeq ($(TW_NO_REBOOT_RECOVERY), true)
     LOCAL_CFLAGS += -DTW_NO_REBOOT_RECOVERY
 endif
diff --git a/amonet.cpp b/amonet.cpp
index 8b8a97366d..28e05a1fec 100644
--- a/amonet.cpp
+++ b/amonet.cpp
@@ -1,3 +1,5 @@
+#ifdef TW_AMONET
+
 #include <string.h>
 
 #include "amonet.h"
@@ -35,29 +37,29 @@ static uint8_t microloader_bin[1024] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0xd0, 0x1f, 0xe5, 0x13, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xb0, 0x8b,
-  0x03, 0x4a, 0x13, 0x68, 0x9b, 0x06, 0xfc, 0xd5, 0x02, 0x4b, 0x18, 0x60,
-  0x70, 0x47, 0x00, 0xbf, 0x14, 0x20, 0x00, 0x11, 0x00, 0x20, 0x00, 0x11,
-  0x0a, 0x28, 0x01, 0x46, 0x08, 0xb5, 0x02, 0xd1, 0x0d, 0x20, 0xff, 0xf7,
-  0xed, 0xff, 0x08, 0x46, 0xff, 0xf7, 0xea, 0xff, 0x08, 0xbd, 0x38, 0xb5,
-  0x45, 0x1e, 0x15, 0xf8, 0x01, 0x4f, 0x24, 0xb9, 0x0a, 0x20, 0xff, 0xf7,
-  0xed, 0xff, 0x20, 0x46, 0x38, 0xbd, 0x20, 0x46, 0xff, 0xf7, 0xe8, 0xff,
-  0xf3, 0xe7, 0x00, 0xbf, 0x7f, 0xb5, 0x4f, 0xf4, 0x00, 0x15, 0x0e, 0x4e,
-  0x0e, 0x48, 0x0f, 0x4c, 0xff, 0xf7, 0xe9, 0xff, 0x33, 0x68, 0x98, 0x47,
-  0x01, 0x95, 0x01, 0x23, 0x02, 0x93, 0x4f, 0xf4, 0x00, 0x12, 0x00, 0x94,
-  0x00, 0x23, 0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46, 0x20, 0x46,
-  0x98, 0x47, 0x07, 0x48, 0xff, 0xf7, 0xd7, 0xff, 0xa0, 0x47, 0x06, 0x48,
-  0xff, 0xf7, 0xd3, 0xff, 0xfe, 0xe7, 0x00, 0xbf, 0x04, 0xc2, 0xe6, 0x81,
-  0xac, 0xc1, 0xe6, 0x81, 0x00, 0x00, 0xb0, 0x8a, 0xd0, 0xc1, 0xe6, 0x81,
-  0xe4, 0xc1, 0xe6, 0x81, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x6c, 0x6f, 0x61,
-  0x64, 0x65, 0x72, 0x20, 0x62, 0x79, 0x20, 0x78, 0x79, 0x7a, 0x2e, 0x20,
-  0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x32, 0x30,
-  0x31, 0x39, 0x2e, 0x00, 0x4a, 0x75, 0x6d, 0x70, 0x20, 0x74, 0x6f, 0x20,
-  0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x00,
-  0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x77, 0x65,
-  0x6e, 0x74, 0x20, 0x68, 0x6f, 0x72, 0x72, 0x69, 0x62, 0x6c, 0x79, 0x20,
-  0x77, 0x72, 0x6f, 0x6e, 0x67, 0x21, 0x00, 0x00, 0xf1, 0x54, 0xe3, 0x81,
-  0xd0, 0xbc, 0xe3, 0x81, 0x70, 0xd3, 0xe6, 0x81, 0x89, 0x22, 0xe4, 0x81,
+  0x81, 0xd4, 0xa0, 0xe3, 0x12, 0x00, 0x00, 0xfa, 0x03, 0x4a, 0x13, 0x68,
+  0x9b, 0x06, 0xfc, 0xd5, 0x02, 0x4b, 0x18, 0x60, 0x70, 0x47, 0x00, 0xbf,
+  0x14, 0x20, 0x00, 0x11, 0x00, 0x20, 0x00, 0x11, 0x0a, 0x28, 0x01, 0x46,
+  0x08, 0xb5, 0x02, 0xd1, 0x0d, 0x20, 0xff, 0xf7, 0xed, 0xff, 0x08, 0x46,
+  0xff, 0xf7, 0xea, 0xff, 0x08, 0xbd, 0x38, 0xb5, 0x45, 0x1e, 0x15, 0xf8,
+  0x01, 0x4f, 0x24, 0xb9, 0x0a, 0x20, 0xff, 0xf7, 0xed, 0xff, 0x20, 0x46,
+  0x38, 0xbd, 0x20, 0x46, 0xff, 0xf7, 0xe8, 0xff, 0xf3, 0xe7, 0x00, 0xbf,
+  0x7f, 0xb5, 0x4f, 0xf0, 0x01, 0x44, 0x0e, 0x4e, 0x4f, 0xf4, 0x00, 0x15,
+  0x0d, 0x48, 0xff, 0xf7, 0xe8, 0xff, 0x33, 0x68, 0x98, 0x47, 0x01, 0x95,
+  0x01, 0x23, 0x02, 0x93, 0x4f, 0xf4, 0x00, 0x12, 0x00, 0x94, 0x00, 0x23,
+  0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46, 0x20, 0x46, 0x98, 0x47,
+  0x05, 0x48, 0xff, 0xf7, 0xd6, 0xff, 0xa0, 0x47, 0x04, 0x48, 0xff, 0xf7,
+  0xd2, 0xff, 0xfe, 0xe7, 0xfc, 0xc1, 0xe6, 0x81, 0xa4, 0xc1, 0xe6, 0x81,
+  0xc8, 0xc1, 0xe6, 0x81, 0xdc, 0xc1, 0xe6, 0x81, 0x6d, 0x69, 0x63, 0x72,
+  0x6f, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x72, 0x20, 0x62, 0x79, 0x20, 0x78,
+  0x79, 0x7a, 0x2e, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
+  0x74, 0x20, 0x32, 0x30, 0x31, 0x39, 0x2e, 0x00, 0x4a, 0x75, 0x6d, 0x70,
+  0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x79, 0x6c,
+  0x6f, 0x61, 0x64, 0x00, 0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e,
+  0x67, 0x20, 0x77, 0x65, 0x6e, 0x74, 0x20, 0x68, 0x6f, 0x72, 0x72, 0x69,
+  0x62, 0x6c, 0x79, 0x20, 0x77, 0x72, 0x6f, 0x6e, 0x67, 0x21, 0x00, 0x00,
+  0xf1, 0x54, 0xe3, 0x81, 0xd0, 0xbc, 0xe3, 0x81, 0x70, 0xd3, 0xe6, 0x81,
+  0x89, 0x22, 0xe4, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -241,3 +243,5 @@ int repatch_part(uint8_t part) {
 
   return ret;
 }
+
+#endif
diff --git a/amonet.h b/amonet.h
index 1b23215c01..5a5fcdd1e4 100644
--- a/amonet.h
+++ b/amonet.h
@@ -1,3 +1,4 @@
+#ifdef TW_AMONET
 #ifndef RECOVERY_AMONET_H_
 #define RECOVERY_AMONET_H_
 
@@ -13,3 +14,4 @@ int unpatch_part(uint8_t part);
 int repatch_part(uint8_t part);
 
 #endif  // RECOVERY_AMONET_H_
+#endif // TW_AMONET
diff --git a/data.cpp b/data.cpp
index 4b30bdfee1..ed56e97dc0 100755
--- a/data.cpp
+++ b/data.cpp
@@ -646,11 +646,11 @@ void DataManager::SetDefaultValues()
 #else
 	mConst.SetValue(TW_REBOOT_BOOTLOADER, "1");
 #endif
-#ifdef TW_NO_REBOOT_HACKED_BL
+#ifdef TW_AMONET
 	printf("TW_NO_REBOOT_HACKED_BL := true\n");
-	mConst.SetValue(TW_REBOOT_HACKED_BL, "0");
-#else
 	mConst.SetValue(TW_REBOOT_HACKED_BL, "1");
+#else
+	mConst.SetValue(TW_REBOOT_HACKED_BL, "0");
 #endif
 #ifdef RECOVERY_SDCARD_ON_DATA
 	printf("RECOVERY_SDCARD_ON_DATA := true\n");
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 7b736977a6..7e2cbfa2a3 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2544,8 +2544,10 @@ bool TWPartitionManager::Flash_Image(string& path, string& filename) {
 		return false;
 	}
 	gui_highlight("flash_done=IMAGE FLASH COMPLETED]");
+#ifdef TW_AMONET
 	if (repatch() < 0)
 		return false;
+#endif
 	return true;
 }
 
diff --git a/twinstall.cpp b/twinstall.cpp
index 7c3063840c..c9a41427d2 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -436,6 +436,7 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 			ret_val = INSTALL_CORRUPT;
 		} else {
 			ret_val = Prepare_Update_Binary(path, &Zip, wipe_cache);
+#ifdef TW_AMONET
 			if (ret_val == INSTALL_SUCCESS) {
 				if (unpatch_boot() < 0)
 					ret_val = INSTALL_ERROR;
@@ -444,6 +445,9 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 				if (repatch() < 0)
 					ret_val = INSTALL_ERROR;
 			}
+#else
+			ret_val = Run_Update_Binary(path, &Zip, wipe_cache, UPDATE_BINARY_ZIP_TYPE);
+#endif
 		}
 	} else {
 		if (Zip.EntryExists(AB_OTA)) {

From eb5ac6fb7db4520605adc5dbdec49acf3e116c5a Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Wed, 27 Feb 2019 04:29:35 +0100
Subject: [PATCH 009/207] Add flag TW_NO_SCREEN to support devices without
 screen

---
 Android.mk     |  3 +++
 gui/Android.mk |  3 +++
 gui/gui.cpp    |  8 ++++++++
 gui/pages.cpp  | 30 +++++++++++++++++++++++++++++-
 twrp.cpp       |  4 ++++
 5 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 27816eca90..fb60e573e8 100755
--- a/Android.mk
+++ b/Android.mk
@@ -230,6 +230,9 @@ endif
 ifneq ($(TW_NO_SCREEN_TIMEOUT),)
     LOCAL_CFLAGS += -DTW_NO_SCREEN_TIMEOUT
 endif
+ifneq ($(TW_NO_SCREEN),)
+    LOCAL_CFLAGS += -DTW_NO_SCREEN
+endif
 ifeq ($(BOARD_HAS_NO_REAL_SDCARD), true)
     LOCAL_CFLAGS += -DBOARD_HAS_NO_REAL_SDCARD
 endif
diff --git a/gui/Android.mk b/gui/Android.mk
index 22b5347702..1f6c451920 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -62,6 +62,9 @@ endif
 ifneq ($(TW_NO_SCREEN_TIMEOUT),)
     LOCAL_CFLAGS += -DTW_NO_SCREEN_TIMEOUT
 endif
+ifneq ($(TW_NO_SCREEN),)
+    LOCAL_CFLAGS += -DTW_NO_SCREEN
+endif
 ifeq ($(TW_OEM_BUILD), true)
     LOCAL_CFLAGS += -DTW_OEM_BUILD
 endif
diff --git a/gui/gui.cpp b/gui/gui.cpp
index ce8c3e29d9..e4d9f76db9 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -91,9 +91,13 @@ static void flip(void)
 		timespec time;
 		clock_gettime(CLOCK_MONOTONIC, &time);
 		write(gRecorder, &time, sizeof(timespec));
+#ifndef TW_NO_SCREEN
 		gr_write_frame_to_file(gRecorder);
+#endif
 	}
+#ifndef TW_NO_SCREEN
 	gr_flip();
+#endif
 }
 
 void rapidxml::parse_error_handler(const char *what, void *where)
@@ -671,7 +675,9 @@ int gui_changePage(std::string newPage)
 {
 	LOGINFO("Set page: '%s'\n", newPage.c_str());
 	PageManager::ChangePage(newPage);
+#ifndef TW_NO_SCREEN
 	gForceRender.set_value(1);
+#endif
 	return 0;
 }
 
@@ -679,7 +685,9 @@ int gui_changeOverlay(std::string overlay)
 {
 	LOGINFO("Set overlay: '%s'\n", overlay.c_str());
 	PageManager::ChangeOverlay(overlay);
+#ifndef TW_NO_SCREEN
 	gForceRender.set_value(1);
+#endif
 	return 0;
 }
 
diff --git a/gui/pages.cpp b/gui/pages.cpp
index fd0ad9bf38..a46896fe39 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -288,17 +288,20 @@ Page::Page(xml_node<>* page, std::vector<xml_node<>*> *templates)
 {
 	mTouchStart = NULL;
 
+#ifndef TW_NO_SCREEN
 	// We can memset the whole structure, because the alpha channel is ignored
 	memset(&mBackground, 0, sizeof(COLOR));
-
+#endif
 	// With NULL, we make a console-only display
 	if (!page)
 	{
+#ifndef TW_NO_SCREEN
 		mName = "console";
 
 		GUIConsole* element = new GUIConsole(NULL);
 		mRenders.push_back(element);
 		mActions.push_back(element);
+#endif
 		return;
 	}
 
@@ -335,7 +338,9 @@ bool Page::ProcessNode(xml_node<>* page, std::vector<xml_node<>*> *templates, in
 		std::string type = child->name();
 
 		if (type == "background") {
+#ifndef TW_NO_SCREEN
 			mBackground = LoadAttrColor(child, "color", COLOR(0,0,0,0));
+#endif
 			continue;
 		}
 
@@ -347,11 +352,14 @@ bool Page::ProcessNode(xml_node<>* page, std::vector<xml_node<>*> *templates, in
 
 		if (type == "text")
 		{
+#ifndef TW_NO_SCREEN
 			GUIText* element = new GUIText(child);
 			mObjects.push_back(element);
 			mRenders.push_back(element);
 			mActions.push_back(element);
+#endif
 		}
+#ifndef TW_NO_SCREEN
 		else if (type == "image")
 		{
 			GUIImage* element = new GUIImage(child);
@@ -364,12 +372,14 @@ bool Page::ProcessNode(xml_node<>* page, std::vector<xml_node<>*> *templates, in
 			mObjects.push_back(element);
 			mRenders.push_back(element);
 		}
+#endif
 		else if (type == "action")
 		{
 			GUIAction* element = new GUIAction(child);
 			mObjects.push_back(element);
 			mActions.push_back(element);
 		}
+#ifndef TW_NO_SCREEN
 		else if (type == "console")
 		{
 			GUIConsole* element = new GUIConsole(child);
@@ -514,6 +524,7 @@ bool Page::ProcessNode(xml_node<>* page, std::vector<xml_node<>*> *templates, in
 				}
 			}
 		}
+#endif
 		else
 		{
 			LOGERR("Unknown object type: %s.\n", type.c_str());
@@ -524,9 +535,12 @@ bool Page::ProcessNode(xml_node<>* page, std::vector<xml_node<>*> *templates, in
 
 int Page::Render(void)
 {
+
+#ifndef TW_NO_SCREEN
 	// Render background
 	gr_color(mBackground.red, mBackground.green, mBackground.blue, mBackground.alpha);
 	gr_fill(0, 0, gr_fb_width(), gr_fb_height());
+#endif
 
 	// Render remaining objects
 	std::vector<RenderObject*>::iterator iter;
@@ -755,6 +769,7 @@ int PageSet::Load(LoadingContext& ctx, const std::string& filename)
 	if (child)
 		LoadVariables(child);
 
+
 	LOGINFO("Loading mouse cursor...\n");
 	child = root->first_node("mousecursor");
 	if (child)
@@ -796,9 +811,11 @@ int PageSet::Load(LoadingContext& ctx, const std::string& filename)
 				return rc;
 
 			include = include->next_sibling("xmlfile");
+
 		}
 	}
 
+
 	return 0;
 }
 
@@ -874,6 +891,7 @@ int PageSet::LoadDetails(LoadingContext& ctx, xml_node<>* root)
 				gui_print_color("warning", "Stock theme version does not match TWRP version.\n");
 			}
 		}
+
 		xml_node<>* resolution = child->first_node("resolution");
 		if (resolution) {
 			LOGINFO("Checking resolution...\n");
@@ -898,6 +916,7 @@ int PageSet::LoadDetails(LoadingContext& ctx, xml_node<>* root)
 					}
 				}
 #endif
+#ifndef TW_NO_SCREEN
 				if (width != 0 && height != 0) {
 					float scale_w = (((float)gr_fb_width() + (float)tw_w_offset) - ((float)offx * 2.0)) / (float)width;
 					float scale_h = (((float)gr_fb_height() + (float)tw_h_offset) - ((float)offy * 2.0)) / (float)height;
@@ -913,6 +932,7 @@ int PageSet::LoadDetails(LoadingContext& ctx, xml_node<>* root)
 						set_scale_values(scale_w, scale_h);
 					}
 				}
+#endif
 			} else {
 				LOGINFO("XML does not contain width and height, no scaling will be applied\n");
 			}
@@ -1638,15 +1658,23 @@ xml_node<>* PageManager::FindStyle(std::string name)
 
 MouseCursor *PageManager::GetMouseCursor()
 {
+#ifndef TW_NO_SCREEN
 	if (!mMouseCursor)
 		mMouseCursor = new MouseCursor(gr_fb_width(), gr_fb_height());
+#else
+		mMouseCursor = new MouseCursor(0,0);
+#endif
 	return mMouseCursor;
 }
 
 void PageManager::LoadCursorData(xml_node<>* node)
 {
 	if (!mMouseCursor)
+#ifndef TW_NO_SCREEN
 		mMouseCursor = new MouseCursor(gr_fb_width(), gr_fb_height());
+#else
+		mMouseCursor = new MouseCursor(0, 0);
+#endif
 
 	mMouseCursor->LoadData(node);
 }
diff --git a/twrp.cpp b/twrp.cpp
index 4327df3638..fb2de72650 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -109,8 +109,10 @@ int main(int argc, char **argv) {
 
 	// Load default values to set DataManager constants and handle ifdefs
 	DataManager::SetDefaultValues();
+#ifndef TW_NO_SCREEN
 	printf("Starting the UI...\n");
 	gui_init();
+#endif
 	printf("=> Linking mtab\n");
 	symlink("/proc/mounts", "/etc/mtab");
 	std::string fstab_filename = "/etc/twrp.fstab";
@@ -261,7 +263,9 @@ int main(int argc, char **argv) {
 	TWFunc::Update_Log_File();
 	DataManager::ReadSettingsFile();
 	PageManager::LoadLanguage(DataManager::GetStrValue("tw_language"));
+#ifndef TW_NO_SCREEN
 	GUIConsole::Translate_Now();
+#endif
 
 	// Run any outstanding OpenRecoveryScript
 	std::string cacheDir = TWFunc::get_cache_dir();

From 2ef4ae09b3e488033cdedfaa40d120a0ea678ff2 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Sun, 10 Mar 2019 16:03:04 +0100
Subject: [PATCH 010/207] no-screen: don't print errors for unknown objects

---
 gui/pages.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gui/pages.cpp b/gui/pages.cpp
index a46896fe39..dea054182c 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -524,11 +524,11 @@ bool Page::ProcessNode(xml_node<>* page, std::vector<xml_node<>*> *templates, in
 				}
 			}
 		}
-#endif
 		else
 		{
 			LOGERR("Unknown object type: %s.\n", type.c_str());
 		}
+#endif
 	}
 	return true;
 }
@@ -540,7 +540,6 @@ int Page::Render(void)
 	// Render background
 	gr_color(mBackground.red, mBackground.green, mBackground.blue, mBackground.alpha);
 	gr_fill(0, 0, gr_fb_width(), gr_fb_height());
-#endif
 
 	// Render remaining objects
 	std::vector<RenderObject*>::iterator iter;
@@ -549,6 +548,7 @@ int Page::Render(void)
 		if ((*iter)->Render())
 			LOGERR("A render request has failed.\n");
 	}
+#endif
 	return 0;
 }
 
@@ -556,6 +556,7 @@ int Page::Update(void)
 {
 	int retCode = 0;
 
+#ifndef TW_NO_SCREEN
 	std::vector<RenderObject*>::iterator iter;
 	for (iter = mRenders.begin(); iter != mRenders.end(); iter++)
 	{
@@ -565,6 +566,7 @@ int Page::Update(void)
 		else if (ret > retCode)
 			retCode = ret;
 	}
+#endif
 
 	return retCode;
 }

From 730634bd567553034d6518588ba5d059e6feefe4 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Sun, 10 Mar 2019 16:05:40 +0100
Subject: [PATCH 011/207] update microloader for tank

---
 amonet.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/amonet.cpp b/amonet.cpp
index 28e05a1fec..389dcd6032 100644
--- a/amonet.cpp
+++ b/amonet.cpp
@@ -10,24 +10,24 @@ static const char *ford_recovery_part = "/dev/block/platform/mtk-msdc.0/by-name/
 
 static uint8_t microloader_bin[1024] = {
   0x41, 0x4e, 0x44, 0x52, 0x4f, 0x49, 0x44, 0x21, 0x00, 0x10, 0x00, 0x00,
-  0xf0, 0xbf, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,
+  0xf0, 0x7f, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x48,
   0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x11, 0x04, 0x0e,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x62, 0x6f, 0x6f, 0x74, 0x6f, 0x70, 0x74, 0x3d,
   0x36, 0x34, 0x53, 0x33, 0x2c, 0x33, 0x32, 0x4e, 0x32, 0x2c, 0x33, 0x32,
   0x4e, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x4c, 0xc0, 0xe6, 0x81, 0x18, 0x0f, 0xe4, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0x4c, 0x80, 0xe6, 0x81, 0xd4, 0xfb, 0xe3, 0x81,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x5c, 0xc0, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xbc, 0xe3, 0x81,
+  0x5c, 0x80, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0xa4, 0xab, 0xe3, 0x81,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xa4, 0xba, 0xe0, 0x81, 0x00, 0xc1, 0xe6, 0x81,
-  0x00, 0x02, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xd0, 0xbc, 0xe3, 0x81,
+  0x00, 0x00, 0x00, 0x00, 0xa4, 0xba, 0xe0, 0x81, 0x00, 0x81, 0xe6, 0x81,
+  0x00, 0x02, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0x94, 0xab, 0xe3, 0x81,
   0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
   0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
-  0x99, 0x1d, 0xe0, 0x81, 0xad, 0xde, 0x00, 0x00, 0x00, 0xc1, 0xe6, 0x81,
+  0x99, 0x1d, 0xe0, 0x81, 0xad, 0xde, 0x00, 0x00, 0x00, 0x81, 0xe6, 0x81,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -44,13 +44,13 @@ static uint8_t microloader_bin[1024] = {
   0xff, 0xf7, 0xea, 0xff, 0x08, 0xbd, 0x38, 0xb5, 0x45, 0x1e, 0x15, 0xf8,
   0x01, 0x4f, 0x24, 0xb9, 0x0a, 0x20, 0xff, 0xf7, 0xed, 0xff, 0x20, 0x46,
   0x38, 0xbd, 0x20, 0x46, 0xff, 0xf7, 0xe8, 0xff, 0xf3, 0xe7, 0x00, 0xbf,
-  0x7f, 0xb5, 0x4f, 0xf0, 0x01, 0x44, 0x0e, 0x4e, 0x4f, 0xf4, 0x00, 0x15,
+  0x7f, 0xb5, 0x4f, 0xf0, 0x01, 0x44, 0x0e, 0x4e, 0x4f, 0xf4, 0x00, 0x25,
   0x0d, 0x48, 0xff, 0xf7, 0xe8, 0xff, 0x33, 0x68, 0x98, 0x47, 0x01, 0x95,
-  0x01, 0x23, 0x02, 0x93, 0x4f, 0xf4, 0x00, 0x12, 0x00, 0x94, 0x00, 0x23,
+  0x01, 0x23, 0x02, 0x93, 0x4f, 0xf4, 0x00, 0x22, 0x00, 0x94, 0x00, 0x23,
   0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46, 0x20, 0x46, 0x98, 0x47,
   0x05, 0x48, 0xff, 0xf7, 0xd6, 0xff, 0xa0, 0x47, 0x04, 0x48, 0xff, 0xf7,
-  0xd2, 0xff, 0xfe, 0xe7, 0xfc, 0xc1, 0xe6, 0x81, 0xa4, 0xc1, 0xe6, 0x81,
-  0xc8, 0xc1, 0xe6, 0x81, 0xdc, 0xc1, 0xe6, 0x81, 0x6d, 0x69, 0x63, 0x72,
+  0xd2, 0xff, 0xfe, 0xe7, 0xfc, 0x81, 0xe6, 0x81, 0xa4, 0x81, 0xe6, 0x81,
+  0xc8, 0x81, 0xe6, 0x81, 0xdc, 0x81, 0xe6, 0x81, 0x6d, 0x69, 0x63, 0x72,
   0x6f, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x72, 0x20, 0x62, 0x79, 0x20, 0x78,
   0x79, 0x7a, 0x2e, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
   0x74, 0x20, 0x32, 0x30, 0x31, 0x39, 0x2e, 0x00, 0x4a, 0x75, 0x6d, 0x70,
@@ -58,8 +58,8 @@ static uint8_t microloader_bin[1024] = {
   0x6f, 0x61, 0x64, 0x00, 0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e,
   0x67, 0x20, 0x77, 0x65, 0x6e, 0x74, 0x20, 0x68, 0x6f, 0x72, 0x72, 0x69,
   0x62, 0x6c, 0x79, 0x20, 0x77, 0x72, 0x6f, 0x6e, 0x67, 0x21, 0x00, 0x00,
-  0xf1, 0x54, 0xe3, 0x81, 0xd0, 0xbc, 0xe3, 0x81, 0x70, 0xd3, 0xe6, 0x81,
-  0x89, 0x22, 0xe4, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf5, 0x42, 0xe3, 0x81, 0x94, 0xab, 0xe3, 0x81, 0xdc, 0x93, 0xe6, 0x81,
+  0xe9, 0x04, 0xe4, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

From f95d2e5e129f3991341be1e2f522c8dcb62e89b5 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Wed, 20 Mar 2019 02:09:55 +0100
Subject: [PATCH 012/207] Make hacked_bl_button selectable without enabling
 amonet

---
 Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Android.mk b/Android.mk
index fb60e573e8..fcae6cd570 100755
--- a/Android.mk
+++ b/Android.mk
@@ -263,6 +263,9 @@ endif
 ifeq ($(TW_AMONET), true)
     LOCAL_CFLAGS += -DTW_AMONET
 endif
+ifeq ($(TW_HACKED_BL_BUTTON), true)
+    LOCAL_CFLAGS += -DTW_HACKED_BL_BUTTON
+endif
 ifeq ($(TW_NO_REBOOT_RECOVERY), true)
     LOCAL_CFLAGS += -DTW_NO_REBOOT_RECOVERY
 endif

From cab1cde6ec474772922069dbbeeda1e442fdcc8e Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Wed, 20 Mar 2019 02:10:53 +0100
Subject: [PATCH 013/207] Add hacked_bl_button to portrait theme

---
 gui/theme/common/portrait.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index c993225bb8..15f358c3ea 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2853,6 +2853,25 @@
 				</actions>
 			</button>
 
+			<button style="main_button">
+				<condition var1="tw_reboot_hacked_bl" var2="1"/>
+				<placement x="%indent%" y="%row13a_y%"/>
+				<text>{@rb_hacked_bl_btn=Hacked BL}</text>
+				<actions>
+					<action function="set">tw_back=reboot</action>
+					<action function="set">tw_action=reboot</action>
+					<action function="set">tw_action_param=hacked_bl</action>
+					<action function="set">tw_reboot_param=hacked_bl</action>
+					<action function="set">tw_has_action2=0</action>
+					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+					<action function="page">rebootcheck</action>
+				</actions>
+			</button>
+
 			<button style="main_button">
 				<condition var1="tw_download_mode" var2="1"/>
 				<placement x="%indent%" y="%row13a_y%"/>

From 0eca2ab28ce9d4b229a0e8e9130de9adcae7ca20 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Wed, 20 Mar 2019 02:12:16 +0100
Subject: [PATCH 014/207] enable selecting hacked_bl_button without enabling
 amonet 2/2

---
 data.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data.cpp b/data.cpp
index ed56e97dc0..6442c679a3 100755
--- a/data.cpp
+++ b/data.cpp
@@ -647,7 +647,10 @@ void DataManager::SetDefaultValues()
 	mConst.SetValue(TW_REBOOT_BOOTLOADER, "1");
 #endif
 #ifdef TW_AMONET
-	printf("TW_NO_REBOOT_HACKED_BL := true\n");
+	#define TW_HACKED_BL_BUTTON
+#endif
+#ifdef TW_HACKED_BL_BUTTON
+	printf("TW_HACKED_BL_BUTTON := true\n");
 	mConst.SetValue(TW_REBOOT_HACKED_BL, "1");
 #else
 	mConst.SetValue(TW_REBOOT_HACKED_BL, "0");

From b790f959364249f41cf07c308d55618a6c472dc4 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Wed, 20 Mar 2019 02:12:37 +0100
Subject: [PATCH 015/207] Make TWRP wipe userdata if no valid filesystem is
 found

---
 partition.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/partition.cpp b/partition.cpp
index c278fa9feb..2f7d2f0910 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -1995,6 +1995,7 @@ void TWPartition::Check_FS_Type() {
 	if (blkid_do_fullprobe(pr)) {
 		blkid_free_probe(pr);
 		LOGINFO("Can't probe device %s\n", Actual_Block_Device.c_str());
+		Current_File_System = "";
 		return;
 	}
 

From 63bf63c7fe9b9fc73f9fab07fd2dd0d4bfe1097d Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Sat, 23 Mar 2019 03:38:13 +0100
Subject: [PATCH 016/207] Make amonet more generic / Move microloader to device
 tree

Change-Id: I23aba5ebaeb5bfb749e8aa28e11cff026375786d
---
 Android.mk    |  10 ++++-
 amonet.cpp    | 109 +++++---------------------------------------------
 microloader.h |  13 ++++++
 3 files changed, 30 insertions(+), 102 deletions(-)
 create mode 100644 microloader.h

diff --git a/Android.mk b/Android.mk
index fcae6cd570..7c624304db 100755
--- a/Android.mk
+++ b/Android.mk
@@ -64,8 +64,14 @@ LOCAL_SRC_FILES := \
     twrpDigestDriver.cpp \
     openrecoveryscript.cpp \
     tarWrite.c \
-    twrpAdbBuFifo.cpp \
-    amonet.cpp
+    twrpAdbBuFifo.cpp
+
+ifeq ($(TW_AMONET), true)
+  LOCAL_SRC_FILES += amonet.cpp
+  ifneq ($(TW_AMONET_MICROLOADER_SRC),)
+    LOCAL_SRC_FILES += ../../$(TW_AMONET_MICROLOADER_SRC)
+  endif
+endif
 
 ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
   LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
diff --git a/amonet.cpp b/amonet.cpp
index 389dcd6032..95781f63e2 100644
--- a/amonet.cpp
+++ b/amonet.cpp
@@ -3,100 +3,9 @@
 #include <string.h>
 
 #include "amonet.h"
+#include "microloader.h"
 #include "twcommon.h"
 
-static const char *ford_boot_part = "/dev/block/platform/mtk-msdc.0/by-name/boot";
-static const char *ford_recovery_part = "/dev/block/platform/mtk-msdc.0/by-name/recovery";
-
-static uint8_t microloader_bin[1024] = {
-  0x41, 0x4e, 0x44, 0x52, 0x4f, 0x49, 0x44, 0x21, 0x00, 0x10, 0x00, 0x00,
-  0xf0, 0x7f, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x48,
-  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x11, 0x04, 0x0e,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x62, 0x6f, 0x6f, 0x74, 0x6f, 0x70, 0x74, 0x3d,
-  0x36, 0x34, 0x53, 0x33, 0x2c, 0x33, 0x32, 0x4e, 0x32, 0x2c, 0x33, 0x32,
-  0x4e, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x4c, 0x80, 0xe6, 0x81, 0xd4, 0xfb, 0xe3, 0x81,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x5c, 0x80, 0xe6, 0x81, 0x00, 0x00, 0x00, 0x00, 0xa4, 0xab, 0xe3, 0x81,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xa4, 0xba, 0xe0, 0x81, 0x00, 0x81, 0xe6, 0x81,
-  0x00, 0x02, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0x94, 0xab, 0xe3, 0x81,
-  0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
-  0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00, 0xad, 0xde, 0x00, 0x00,
-  0x99, 0x1d, 0xe0, 0x81, 0xad, 0xde, 0x00, 0x00, 0x00, 0x81, 0xe6, 0x81,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x81, 0xd4, 0xa0, 0xe3, 0x12, 0x00, 0x00, 0xfa, 0x03, 0x4a, 0x13, 0x68,
-  0x9b, 0x06, 0xfc, 0xd5, 0x02, 0x4b, 0x18, 0x60, 0x70, 0x47, 0x00, 0xbf,
-  0x14, 0x20, 0x00, 0x11, 0x00, 0x20, 0x00, 0x11, 0x0a, 0x28, 0x01, 0x46,
-  0x08, 0xb5, 0x02, 0xd1, 0x0d, 0x20, 0xff, 0xf7, 0xed, 0xff, 0x08, 0x46,
-  0xff, 0xf7, 0xea, 0xff, 0x08, 0xbd, 0x38, 0xb5, 0x45, 0x1e, 0x15, 0xf8,
-  0x01, 0x4f, 0x24, 0xb9, 0x0a, 0x20, 0xff, 0xf7, 0xed, 0xff, 0x20, 0x46,
-  0x38, 0xbd, 0x20, 0x46, 0xff, 0xf7, 0xe8, 0xff, 0xf3, 0xe7, 0x00, 0xbf,
-  0x7f, 0xb5, 0x4f, 0xf0, 0x01, 0x44, 0x0e, 0x4e, 0x4f, 0xf4, 0x00, 0x25,
-  0x0d, 0x48, 0xff, 0xf7, 0xe8, 0xff, 0x33, 0x68, 0x98, 0x47, 0x01, 0x95,
-  0x01, 0x23, 0x02, 0x93, 0x4f, 0xf4, 0x00, 0x22, 0x00, 0x94, 0x00, 0x23,
-  0x01, 0x69, 0x88, 0x47, 0x73, 0x68, 0x29, 0x46, 0x20, 0x46, 0x98, 0x47,
-  0x05, 0x48, 0xff, 0xf7, 0xd6, 0xff, 0xa0, 0x47, 0x04, 0x48, 0xff, 0xf7,
-  0xd2, 0xff, 0xfe, 0xe7, 0xfc, 0x81, 0xe6, 0x81, 0xa4, 0x81, 0xe6, 0x81,
-  0xc8, 0x81, 0xe6, 0x81, 0xdc, 0x81, 0xe6, 0x81, 0x6d, 0x69, 0x63, 0x72,
-  0x6f, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x72, 0x20, 0x62, 0x79, 0x20, 0x78,
-  0x79, 0x7a, 0x2e, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
-  0x74, 0x20, 0x32, 0x30, 0x31, 0x39, 0x2e, 0x00, 0x4a, 0x75, 0x6d, 0x70,
-  0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x79, 0x6c,
-  0x6f, 0x61, 0x64, 0x00, 0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e,
-  0x67, 0x20, 0x77, 0x65, 0x6e, 0x74, 0x20, 0x68, 0x6f, 0x72, 0x72, 0x69,
-  0x62, 0x6c, 0x79, 0x20, 0x77, 0x72, 0x6f, 0x6e, 0x67, 0x21, 0x00, 0x00,
-  0xf5, 0x42, 0xe3, 0x81, 0x94, 0xab, 0xe3, 0x81, 0xdc, 0x93, 0xe6, 0x81,
-  0xe9, 0x04, 0xe4, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00
-};
-
 int repatch() {
   return repatch_boot() + repatch_recovery();
 }
@@ -122,21 +31,21 @@ int unpatch_part(uint8_t part) {
   uint8_t boot_data[0x800];
   int ret = -1;
 
-  static const char *ford_part;
+  static const char *amonet_part;
   static const char *part_name;
 
   if(part == 1) {
-    ford_part = ford_recovery_part;
+    amonet_part = amonet_recovery_part;
     part_name = "recovery";
   }
   else {
-    ford_part = ford_boot_part;
+    amonet_part = amonet_boot_part;
     part_name = "boot";
   }
   
   gui_print_color("highlight", EXPLOIT_TAG "Remove %s patch...", part_name);
 
-  fp = fopen(ford_part, "r+b");
+  fp = fopen(amonet_part, "r+b");
   if (!fp) {
     gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device", part_name);
     goto cleanup;
@@ -186,21 +95,21 @@ int repatch_part(uint8_t part) {
   uint8_t boot_data[0x800];
   int ret = -1;
 
-  static const char *ford_part;
+  static const char *amonet_part;
   static const char *part_name;
 
   if(part == 1) {
-    ford_part = ford_recovery_part;
+    amonet_part = amonet_recovery_part;
     part_name = "recovery";
   }
   else {
-    ford_part = ford_boot_part;
+    amonet_part = amonet_boot_part;
     part_name = "boot";
   }
 
   gui_print_color("highlight", EXPLOIT_TAG "Install %s patch... ", part_name);
 
-  fp = fopen(ford_part, "r+b");
+  fp = fopen(amonet_part, "r+b");
   if (!fp) {
     gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device", part_name);
     goto cleanup;
diff --git a/microloader.h b/microloader.h
new file mode 100644
index 0000000000..0ae5a832d7
--- /dev/null
+++ b/microloader.h
@@ -0,0 +1,13 @@
+#ifdef TW_AMONET
+#ifndef RECOVERY_AMONET_MICROLOADER_H_
+#define RECOVERY_AMONET_MICROLOADER_H_
+
+#include <unistd.h>
+
+extern const char *amonet_boot_part;
+extern const char *amonet_recovery_part;
+extern uint8_t microloader_bin[1024];
+
+#endif // RECOVERY_AMONET_MICROLOADER_H
+#endif // TW_AMONET
+

From 9e2bdc6e15b13055c4bb13a028fdd4162d414aec Mon Sep 17 00:00:00 2001
From: Dees Troy <dees_troy@teamw.in>
Date: Thu, 21 Mar 2019 14:17:28 -0400
Subject: [PATCH 017/207] Fix build in 5.1 tree

Change-Id: I15f888d58c01de00920dc5c56148d363f4dd79b8
---
 minuitwrp/Android.mk | 2 +-
 minuitwrp/events.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index 58634e34e4..3356402bad 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -189,7 +189,7 @@ endif
 LOCAL_CLANG := true
 
 LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
-LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libpng libutils
+LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libpng libutils libc++
 ifneq ($(TW_INCLUDE_JPEG),)
     LOCAL_SHARED_LIBRARIES += libjpeg
 endif
diff --git a/minuitwrp/events.cpp b/minuitwrp/events.cpp
index 9374ef1741..a2a3d166b3 100755
--- a/minuitwrp/events.cpp
+++ b/minuitwrp/events.cpp
@@ -127,12 +127,14 @@ int write_to_file(const std::string& fn, const std::string& line) {
 int vibrate(int timeout_ms)
 {
     if (timeout_ms > 10000) timeout_ms = 1000;
+    char tout[6];
+    sprintf(tout, "%i", timeout_ms);
 
     if (std::ifstream(LEDS_HAPTICS_ACTIVATE_FILE).good()) {
-        write_to_file(LEDS_HAPTICS_DURATION_FILE, std::to_string(timeout_ms));
+        write_to_file(LEDS_HAPTICS_DURATION_FILE, tout);
         write_to_file(LEDS_HAPTICS_ACTIVATE_FILE, "1");
     } else
-        write_to_file(VIBRATOR_TIMEOUT_FILE, std::to_string(timeout_ms));
+        write_to_file(VIBRATOR_TIMEOUT_FILE, tout);
 
     return 0;
 }

From d48ee0a1b60ff0c6ec58f804eca2170baacba375 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Sat, 23 Mar 2019 05:03:26 +0100
Subject: [PATCH 018/207] Fix build in 5.1 tree 2/2

Change-Id: I60d2756dd3a4bb94335b00d945ba272815a27a59
---
 partition.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/partition.cpp b/partition.cpp
index 2f7d2f0910..f114618504 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -2062,7 +2062,11 @@ bool TWPartition::Wipe_EXTFS(string File_System) {
 	if (NeedPreserveFooter)
 		Length < 0 ? dev_sz += Length : dev_sz -= CRYPT_FOOTER_OFFSET;
 
-	string size_str = to_string(dev_sz / 4096);
+	char dout[16];
+	sprintf(dout, "%llu", dev_sz / 4096);
+
+	//string size_str =to_string(dev_sz / 4096);
+	string size_str = dout;
 	string Command;
 
 	gui_msg(Msg("formatting_using=Formatting {1} using {2}...")(Display_Name)("mke2fs"));

From 3fc5a99a25f4a0bb6cb9e8800b43e1627a7d613c Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Mon, 25 Mar 2019 19:56:52 +0100
Subject: [PATCH 019/207] reenable system_rw prompt, don't have dm-verity

Change-Id: I6af14e9cf16b3e2c1368420a96e89ef1891faaa7
---
 data.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data.cpp b/data.cpp
index 6442c679a3..8443ccbc61 100755
--- a/data.cpp
+++ b/data.cpp
@@ -897,7 +897,7 @@ void DataManager::SetDefaultValues()
 	mConst.SetValue("tw_has_mtp", "0");
 	mConst.SetValue("tw_mtp_enabled", "0");
 #endif
-	mPersist.SetValue("tw_mount_system_ro", "1");
+	mPersist.SetValue("tw_mount_system_ro", "2");
 	mPersist.SetValue("tw_never_show_system_ro_page", "0");
 	mPersist.SetValue("tw_language", EXPAND(TW_DEFAULT_LANGUAGE));
 	LOGINFO("LANG: %s\n", EXPAND(TW_DEFAULT_LANGUAGE));

From 2f98f031e4229aaecf054acbab63d261ecffb276 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Mon, 25 Mar 2019 19:57:27 +0100
Subject: [PATCH 020/207] add newlines to gui_prints (not added on cmdline)

Change-Id: Ia3544723cef1cc4f5152aea93616150c8daf2ff6
---
 amonet.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/amonet.cpp b/amonet.cpp
index 95781f63e2..8f4d60c990 100644
--- a/amonet.cpp
+++ b/amonet.cpp
@@ -43,22 +43,22 @@ int unpatch_part(uint8_t part) {
     part_name = "boot";
   }
   
-  gui_print_color("highlight", EXPLOIT_TAG "Remove %s patch...", part_name);
+  gui_print_color("highlight", EXPLOIT_TAG "Remove %s patch...\n", part_name);
 
   fp = fopen(amonet_part, "r+b");
   if (!fp) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device", part_name);
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device\n", part_name);
     goto cleanup;
   }
 
   if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data\n");
     goto cleanup;
   }
 
   if (memcmp(boot_data + 0x400, "ANDROID!", 8) != 0) {
     // Exploit not installed yet, but that's okay
-    gui_print_color("highlight", EXPLOIT_TAG "NOT_INSTALLED");
+    gui_print_color("highlight", EXPLOIT_TAG "NOT_INSTALLED\n");
     ret = 0;
     goto cleanup;
   }
@@ -69,16 +69,16 @@ int unpatch_part(uint8_t part) {
   memset(boot_data + 0x400, 0, 0x400);
 
   if (fseek(fp, 0, SEEK_SET) != 0) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek\n");
     goto cleanup;
   }
 
   if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data\n");
     goto cleanup;
   }
 
-  gui_print_color("highlight", EXPLOIT_TAG "OK");
+  gui_print_color("highlight", EXPLOIT_TAG "OK\n");
   ret = 0;
 
 cleanup:
@@ -107,22 +107,22 @@ int repatch_part(uint8_t part) {
     part_name = "boot";
   }
 
-  gui_print_color("highlight", EXPLOIT_TAG "Install %s patch... ", part_name);
+  gui_print_color("highlight", EXPLOIT_TAG "Install %s patch... \n", part_name);
 
   fp = fopen(amonet_part, "r+b");
   if (!fp) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device", part_name);
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device\n", part_name);
     goto cleanup;
   }
 
   if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data\n");
     goto cleanup;
   }
 
   if (memcmp(boot_data + 0x400, "ANDROID!", 8) == 0) {
     // Exploit not installed yet, but that's okay
-    gui_print_color("highlight", EXPLOIT_TAG "ALREADY_INSTALLED"); // If the rom author injected the boot image herself
+    gui_print_color("highlight", EXPLOIT_TAG "ALREADY_INSTALLED\n"); // If the rom author injected the boot image herself
     ret = 0;
     goto cleanup;
   }
@@ -132,16 +132,16 @@ int repatch_part(uint8_t part) {
   memcpy(boot_data, microloader_bin, 0x400);
 
   if (fseek(fp, 0, SEEK_SET) != 0) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to seek\n");
     goto cleanup;
   }
 
   if (fwrite(boot_data, sizeof(boot_data), 1, fp) != 1) {
-    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data");
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to write data\n");
     goto cleanup;
   }
 
-  gui_print_color("highlight", EXPLOIT_TAG "OK");
+  gui_print_color("highlight", EXPLOIT_TAG "OK\n");
   ret = 0;
 
 cleanup:

From 81e8f0c1b2c7261fa851ebae0b65e0b8645dc281 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Wed, 24 Apr 2019 15:17:25 +0200
Subject: [PATCH 021/207] Make amonet more generic, use microloader from
 recovery-partition

Change-Id: I680545d5af36ae8596c5205093f5f34a19517c6a
---
 Android.mk           |   1 +
 amonet.cpp           | 105 ++++++++++++++++++++++++-------------------
 amonet.h             |  10 ++---
 microloader.h        |   6 ++-
 partitionmanager.cpp |   9 +++-
 twinstall.cpp        |   8 +++-
 6 files changed, 81 insertions(+), 58 deletions(-)

diff --git a/Android.mk b/Android.mk
index 7c624304db..3b35998dd3 100755
--- a/Android.mk
+++ b/Android.mk
@@ -70,6 +70,7 @@ ifeq ($(TW_AMONET), true)
   LOCAL_SRC_FILES += amonet.cpp
   ifneq ($(TW_AMONET_MICROLOADER_SRC),)
     LOCAL_SRC_FILES += ../../$(TW_AMONET_MICROLOADER_SRC)
+    LOCAL_CFLAGS += -DTW_MICROLOADER
   endif
 endif
 
diff --git a/amonet.cpp b/amonet.cpp
index 8f4d60c990..298452b07e 100644
--- a/amonet.cpp
+++ b/amonet.cpp
@@ -5,44 +5,18 @@
 #include "amonet.h"
 #include "microloader.h"
 #include "twcommon.h"
+#include "partitions.hpp"
 
-int repatch() {
-  return repatch_boot() + repatch_recovery();
-}
-
-int repatch_boot() {
-  return repatch_part(0);
-}
-
-int unpatch_boot() {
-  return unpatch_part(0);
-}
-
-int repatch_recovery() {
-  return repatch_part(1);
-}
-
-int unpatch_recovery() {
-  return unpatch_part(1);
-}
-
-int unpatch_part(uint8_t part) {
+int unpatch_part(const char* part_path) {
   FILE *fp = NULL;
   uint8_t boot_data[0x800];
   int ret = -1;
 
-  static const char *amonet_part;
-  static const char *part_name;
-
-  if(part == 1) {
-    amonet_part = amonet_recovery_part;
-    part_name = "recovery";
-  }
-  else {
-    amonet_part = amonet_boot_part;
-    part_name = "boot";
-  }
+  const char *part_name = &part_path[1];
   
+  TWPartition* partition = PartitionManager.Find_Partition_By_Path(part_path);
+  const char* amonet_part = partition?partition->Actual_Block_Device.c_str():"";
+
   gui_print_color("highlight", EXPLOIT_TAG "Remove %s patch...\n", part_name);
 
   fp = fopen(amonet_part, "r+b");
@@ -90,23 +64,16 @@ int unpatch_part(uint8_t part) {
   return ret;
 }
 
-int repatch_part(uint8_t part) {
+int patch_part(const char* part_path) {
   FILE *fp = NULL;
   uint8_t boot_data[0x800];
   int ret = -1;
 
-  static const char *amonet_part;
-  static const char *part_name;
-
-  if(part == 1) {
-    amonet_part = amonet_recovery_part;
-    part_name = "recovery";
-  }
-  else {
-    amonet_part = amonet_boot_part;
-    part_name = "boot";
-  }
-
+  const char *part_name = &part_path[1];
+  
+  TWPartition* partition = PartitionManager.Find_Partition_By_Path(part_path);
+  const char *amonet_part = partition?partition->Actual_Block_Device.c_str():"";
+  
   gui_print_color("highlight", EXPLOIT_TAG "Install %s patch... \n", part_name);
 
   fp = fopen(amonet_part, "r+b");
@@ -121,7 +88,6 @@ int repatch_part(uint8_t part) {
   }
 
   if (memcmp(boot_data + 0x400, "ANDROID!", 8) == 0) {
-    // Exploit not installed yet, but that's okay
     gui_print_color("highlight", EXPLOIT_TAG "ALREADY_INSTALLED\n"); // If the rom author injected the boot image herself
     ret = 0;
     goto cleanup;
@@ -153,4 +119,51 @@ int repatch_part(uint8_t part) {
   return ret;
 }
 
+int load_microloader() {
+#ifdef TW_MICROLOADER
+  return 0;
+#else
+  FILE *fp = NULL;
+  uint8_t boot_data[0x800];
+  int ret = -1;
+  static const char *part_path = "/recovery";
+
+  const char *part_name = &part_path[1];
+  
+  TWPartition* partition = PartitionManager.Find_Partition_By_Path(part_path);
+  const char *amonet_part = partition?partition->Actual_Block_Device.c_str():"";
+
+  gui_print_color("highlight", EXPLOIT_TAG "Load microloader from %s... \n", part_name);
+
+  fp = fopen(amonet_part, "r+b");
+  if (!fp) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to open the %s device\n", part_name);
+    goto cleanup;
+  }
+
+  if (fread(boot_data, sizeof(boot_data), 1, fp) != 1) {
+    gui_print_color("highlight", EXPLOIT_TAG "Failed to read data\n");
+    goto cleanup;
+  }
+
+  if (memcmp(boot_data + 0x400, "ANDROID!", 8) != 0) {
+    gui_print_color("highlight", EXPLOIT_TAG "No microloader found in recovery\n");
+    ret = 0;
+    goto cleanup;
+  }
+
+  if(memcpy(microloader_bin, boot_data, 0x400))
+    ret = 0;
+
+	
+cleanup:
+  if (fp) {
+    fclose(fp);
+    fp = NULL;
+  }
+
+  return ret;
+#endif
+}
+
 #endif
diff --git a/amonet.h b/amonet.h
index 5a5fcdd1e4..1798a5c5dd 100644
--- a/amonet.h
+++ b/amonet.h
@@ -5,13 +5,9 @@
 #include <unistd.h>
 
 #define EXPLOIT_TAG "[amonet] "
-int unpatch_boot();
-int repatch_boot();
-int repatch_recovery();
-int unpatch_recovery();
-int repatch();
-int unpatch_part(uint8_t part);
-int repatch_part(uint8_t part);
+int patch_part(const char* part_path);
+int unpatch_part(const char* part_path);
+int load_microloader(void);
 
 #endif  // RECOVERY_AMONET_H_
 #endif // TW_AMONET
diff --git a/microloader.h b/microloader.h
index 0ae5a832d7..6d2c04d104 100644
--- a/microloader.h
+++ b/microloader.h
@@ -4,9 +4,11 @@
 
 #include <unistd.h>
 
-extern const char *amonet_boot_part;
-extern const char *amonet_recovery_part;
+#ifdef TW_MICROLOADER
 extern uint8_t microloader_bin[1024];
+#else
+uint8_t microloader_bin[1024];
+#endif
 
 #endif // RECOVERY_AMONET_MICROLOADER_H
 #endif // TW_AMONET
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 7e2cbfa2a3..77a8823dbd 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2484,6 +2484,11 @@ bool TWPartitionManager::Flash_Image(string& path, string& filename) {
 	string Flash_List, flash_path, full_filename;
 	size_t start_pos = 0, end_pos = 0;
 
+#ifdef TW_AMONET
+	if (load_microloader() < 0)
+		return false;
+#endif
+
 	full_filename = path + "/" + filename;
 
 	gui_msg("image_flash_start=[IMAGE FLASH STARTED]");
@@ -2545,7 +2550,9 @@ bool TWPartitionManager::Flash_Image(string& path, string& filename) {
 	}
 	gui_highlight("flash_done=IMAGE FLASH COMPLETED]");
 #ifdef TW_AMONET
-	if (repatch() < 0)
+	if (patch_part("/boot") < 0)
+		return false;
+	if (patch_part("/recovery") < 0)
 		return false;
 #endif
 	return true;
diff --git a/twinstall.cpp b/twinstall.cpp
index c9a41427d2..664d99e185 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -438,11 +438,15 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 			ret_val = Prepare_Update_Binary(path, &Zip, wipe_cache);
 #ifdef TW_AMONET
 			if (ret_val == INSTALL_SUCCESS) {
-				if (unpatch_boot() < 0)
+				if (load_microloader() < 0)
+					ret_val = INSTALL_ERROR;
+				if (unpatch_part("/boot") < 0)
 					ret_val = INSTALL_ERROR;
 				if (ret_val == INSTALL_SUCCESS)
 					ret_val = Run_Update_Binary(path, &Zip, wipe_cache, UPDATE_BINARY_ZIP_TYPE);
-				if (repatch() < 0)
+				if (patch_part("/boot") < 0)
+					ret_val = INSTALL_ERROR;
+				if (patch_part("/recovery") < 0)
 					ret_val = INSTALL_ERROR;
 			}
 #else

From a883105f959a9cc6ec60fb36a1a76545e7a121fe Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Mon, 15 Jul 2019 21:52:03 +0200
Subject: [PATCH 022/207] Don't enable HACKED BL Button if amonet is enabled

Change-Id: I76c5f02eb65ef3ca2841af34ba246f36cc5b6172
---
 data.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data.cpp b/data.cpp
index 8443ccbc61..714544d71b 100755
--- a/data.cpp
+++ b/data.cpp
@@ -646,9 +646,9 @@ void DataManager::SetDefaultValues()
 #else
 	mConst.SetValue(TW_REBOOT_BOOTLOADER, "1");
 #endif
-#ifdef TW_AMONET
-	#define TW_HACKED_BL_BUTTON
-#endif
+//#ifdef TW_AMONET
+//	#define TW_HACKED_BL_BUTTON
+//#endif
 #ifdef TW_HACKED_BL_BUTTON
 	printf("TW_HACKED_BL_BUTTON := true\n");
 	mConst.SetValue(TW_REBOOT_HACKED_BL, "1");

From fe323a7bb45f1e0cc36b6fb87ce1aea8aea1a782 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Tue, 16 Jul 2019 14:59:44 +0200
Subject: [PATCH 023/207] Add build-flag to define default backup_list

Change-Id: I3d18a0875150362fd63623860b9d6bd69d55557c
---
 Android.mk | 3 +++
 data.cpp   | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 3b35998dd3..d8b187cee2 100755
--- a/Android.mk
+++ b/Android.mk
@@ -412,6 +412,9 @@ endif
 ifneq ($(TW_CLOCK_OFFSET),)
 	LOCAL_CFLAGS += -DTW_CLOCK_OFFSET=$(TW_CLOCK_OFFSET)
 endif
+ifneq ($(TW_DEFAULT_BACKUP_LIST),)
+	LOCAL_CFLAGS += -DTW_DEFAULT_BACKUP_LIST=$(TW_DEFAULT_BACKUP_LIST)
+endif
 LOCAL_REQUIRED_MODULES += \
     dump_image \
     erase_image \
diff --git a/data.cpp b/data.cpp
index 714544d71b..8d70f3776b 100755
--- a/data.cpp
+++ b/data.cpp
@@ -745,11 +745,14 @@ void DataManager::SetDefaultValues()
 #else
 	mConst.SetValue(TW_SDEXT_DISABLE_EXT4, "0");
 #endif
-
-#ifdef TW_HAS_NO_BOOT_PARTITION
-	mPersist.SetValue("tw_backup_list", "/system;/data;");
+#ifdef TW_DEFAULT_BACKUP_LIST
+	mPersist.SetValue("tw_backup_list", EXPAND(TW_DEFAULT_BACKUP_LIST));
 #else
+  #ifdef TW_HAS_NO_BOOT_PARTITION
+	mPersist.SetValue("tw_backup_list", "/system;/data;");
+  #else
 	mPersist.SetValue("tw_backup_list", "/system;/data;/boot;");
+  #endif
 #endif
 	mConst.SetValue(TW_MIN_SYSTEM_VAR, TW_MIN_SYSTEM_SIZE);
 	mData.SetValue(TW_BACKUP_NAME, "(Auto Generate)");

From 8046aa0068690cf62409d97005f831867ca960d5 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Sun, 29 Sep 2019 22:47:37 +0200
Subject: [PATCH 024/207] Add bootmenu for firestick

Change-Id: I21ff91f8453e30f9b5bb881253a13b01d07e07e5
---
 Android.mk                            |   3 +
 gui/Android.mk                        |   3 +
 gui/action.cpp                        |  20 +++++
 gui/gui.cpp                           |  20 +++++
 gui/gui.h                             |   3 +
 gui/objects.hpp                       |   6 ++
 gui/theme/landscape_hdpi/bootmenu.xml | 117 ++++++++++++++++++++++++++
 gui/theme/portrait_hdpi/bootmenu.xml  | 117 ++++++++++++++++++++++++++
 twrp.cpp                              |  13 +++
 9 files changed, 302 insertions(+)
 create mode 100644 gui/theme/landscape_hdpi/bootmenu.xml
 create mode 100644 gui/theme/portrait_hdpi/bootmenu.xml

diff --git a/Android.mk b/Android.mk
index a89577536e..2a4c81163b 100755
--- a/Android.mk
+++ b/Android.mk
@@ -276,6 +276,9 @@ endif
 ifeq ($(TW_HACKED_BL_BUTTON), true)
     LOCAL_CFLAGS += -DTW_HACKED_BL_BUTTON
 endif
+ifeq ($(TW_BOOT_MENU), true)
+    LOCAL_CFLAGS += -DTW_BOOT_MENU
+endif
 ifeq ($(TW_NO_REBOOT_RECOVERY), true)
     LOCAL_CFLAGS += -DTW_NO_REBOOT_RECOVERY
 endif
diff --git a/gui/Android.mk b/gui/Android.mk
index 1f6c451920..76437eca93 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -83,6 +83,9 @@ endif
 ifeq ($(TW_ROUND_SCREEN), true)
     LOCAL_CFLAGS += -DTW_ROUND_SCREEN
 endif
+ifeq ($(TW_BOOT_MENU), true)
+    LOCAL_CFLAGS += -DTW_BOOT_MENU
+endif
 
 LOCAL_C_INCLUDES += \
     bionic \
diff --git a/gui/action.cpp b/gui/action.cpp
index ccb7e344ed..d8a690ec07 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -199,6 +199,9 @@ GUIAction::GUIAction(xml_node<>* node)
 		ADD_ACTION(setlanguage);
 		ADD_ACTION(checkforapp);
 		ADD_ACTION(togglebacklight);
+#ifdef TW_BOOT_MENU
+		ADD_ACTION(nonthreadedcmd);
+#endif
 
 		// remember actions that run in the caller thread
 		for (mapFunc::const_iterator it = mf.begin(); it != mf.end(); ++it)
@@ -234,6 +237,9 @@ GUIAction::GUIAction(xml_node<>* node)
 		ADD_ACTION(uninstalltwrpsystemapp);
 		ADD_ACTION(repackimage);
 		ADD_ACTION(fixabrecoverybootloop);
+#ifdef TW_BOOT_MENU
+		ADD_ACTION(threadedsleepcounter);
+#endif
 	}
 
 	// First, get the action
@@ -816,6 +822,13 @@ int GUIAction::sleepcounter(std::string arg)
 	return 0;
 }
 
+#ifdef TW_BOOT_MENU
+int GUIAction::threadedsleepcounter(std::string arg)
+{
+	return sleepcounter(arg);
+}
+#endif
+
 int GUIAction::appenddatetobackupname(std::string arg __unused)
 {
 	operation_start("AppendDateToBackupName");
@@ -1373,6 +1386,13 @@ int GUIAction::cmd(std::string arg)
 	return 0;
 }
 
+#ifdef TW_BOOT_MENU
+int GUIAction::nonthreadedcmd(std::string arg)
+{
+	return cmd(arg);
+}
+#endif
+
 int GUIAction::terminalcommand(std::string arg)
 {
 	int op_status = 0;
diff --git a/gui/gui.cpp b/gui/gui.cpp
index e4d9f76db9..0892ae2ed6 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -877,6 +877,26 @@ extern "C" int gui_start(void)
 	return gui_startPage("main", 1, 0);
 }
 
+#ifdef TW_BOOT_MENU
+extern "C" void boot_menu()
+{
+	// load and show bootmenu screen
+	if (PageManager::LoadPackage("bootmenu", TWRES "bootmenu.xml", "bootmenu")) {
+		LOGERR("Failed to load bootmenu screen XML.\n");
+	}
+	else {
+		TWPartition* partition = PartitionManager.Find_Partition_By_Path("/misc");
+		const char* misc_dev = partition?partition->Actual_Block_Device.c_str():"";
+		PageManager::SelectPackage("bootmenu");
+		input_handler.init();
+		DataManager::SetValue("bm_loaded", "1");
+		DataManager::SetValue("misc_dev", misc_dev);
+		runPages("bootmenu", 0);
+	}
+
+}
+#endif
+
 extern "C" int gui_startPage(const char *page_name, const int allow_commands, int stop_on_page_done)
 {
 	if (!gGuiInitialized)
diff --git a/gui/gui.h b/gui/gui.h
index 034f1cd921..c6d92ec015 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -29,6 +29,9 @@ int gui_startPage(const char* page_name, const int allow_comands, int stop_on_pa
 void gui_print(const char *fmt, ...);
 void gui_print_color(const char *color, const char *fmt, ...);
 void gui_set_FILE(FILE* f);
+#ifdef TW_BOOT_MENU
+void boot_menu();
+#endif
 
 void set_scale_values(float w, float h);
 int scale_theme_x(int initial_x);
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 3f7241831f..92aa19b5f8 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -327,6 +327,9 @@ class GUIAction : public GUIObject, public ActionObject
 	int screenshot(std::string arg);
 	int setbrightness(std::string arg);
 	int checkforapp(std::string arg);
+#ifdef TW_BOOT_MENU
+	int nonthreadedcmd(std::string arg);
+#endif
 
 	// (originally) threaded actions
 	int fileexists(std::string arg);
@@ -370,6 +373,9 @@ class GUIAction : public GUIObject, public ActionObject
 	int uninstalltwrpsystemapp(std::string arg);
 	int repackimage(std::string arg);
 	int fixabrecoverybootloop(std::string arg);
+#ifdef TW_BOOT_MENU
+	int threadedsleepcounter(std::string arg);
+#endif
 
 	int simulate;
 };
diff --git a/gui/theme/landscape_hdpi/bootmenu.xml b/gui/theme/landscape_hdpi/bootmenu.xml
new file mode 100644
index 0000000000..53604b3b95
--- /dev/null
+++ b/gui/theme/landscape_hdpi/bootmenu.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<recovery>
+	<details>
+		<resolution width="1920" height="1200"/>
+		<author>k4y0z</author>
+		<title>Boot Menu</title>
+		<description>boot menu</description>
+		<themeversion>3</themeversion>
+	</details>
+
+	<resources>
+		<font name="font_l" filename="RobotoCondensed-Regular.ttf" size="52"/>
+		<image name="main_button" filename="main_button"/>
+		<image name="cursor" filename="cursor" retainaspect="1"/>
+                <animation name="progress" filename="indeterminate"/>
+                <image name="progress_empty" filename="progress_empty"/>
+                <image name="progress_full" filename="progress_fill"/>
+	</resources>
+
+	<variables>
+		<variable name="screen_width" value="1920"/>
+		<variable name="screen_height" value="1200"/>
+		<variable name="background_color" value="#1A1A1A"/>
+		<variable name="highlight_color" value="#1A1A1A80"/>
+                <variable name="text_color" value="#EEEEEE"/>
+                <variable name="progress_x" value="552"/>
+                <variable name="button_x" value="504"/>
+	</variables>
+
+	<mousecursor>
+		<placement w="15" h="15"/>
+		<background color="#FFFF00FF" resource="cursor"/>
+		<speed multiplier="2.5"/>
+	</mousecursor>
+
+	<templates>
+                <template name="progress_bar">
+                        <progressbar>
+                                <placement x="%progress_x%" y="600"/>
+                                <resource empty="progress_empty" full="progress_full"/>
+                                <data name="ui_progress"/>
+                        </progressbar>
+
+                        <animation>
+                                <placement x="%progress_x%" y="600"/>
+                                <resource name="progress"/>
+                                <speed fps="24" render="2"/>
+                                <loop frame="1"/>
+                        </animation>
+                </template>
+	</templates>
+
+	<styles>
+		<style name="main_button">
+			<highlight color="%highlight_color%"/>
+			<font resource="font_l" color="%text_button_color%"/>
+			<image resource="main_button"/>
+		</style>
+                <style name="text_l">
+                        <font resource="font_l" color="%text_color%"/>
+                </style>
+
+	</styles>
+
+	<pages>
+		<page name="bootmenu">
+			<action>
+				<actions>
+					<action function="set">tw_sleep=%tw_sleep_total%</action>
+					<action function="page">bootmenu2</action>
+				</actions>
+			</action>
+		</page>
+
+		<page name="bootmenu2">
+			<background color="%background_color%"/>
+
+			<button style="main_button">
+				<condition var1="tw_sleep" op="&gt;" var2="0"/>
+				<placement x="%button_x%" y="320"/>
+				<text>{@cancel_btn=Cancel}</text>
+				<actions>
+					<action function="set">bm_loaded=0</action>
+					<action function="set">tw_gui_done=1</action>
+				</actions>
+			</button>
+
+			<template name="progress_bar"/>
+
+                        <action>
+                                <conditions>
+                                        <condition var1="tw_sleep" var2="tw_sleep_total"/>
+                                        <condition var1="bm_loaded" var2="1"/>
+                                </conditions>
+                                <action function="threadedsleepcounter">%tw_sleep_total%</action>
+                        </action>
+
+			<action>
+                                <conditions>
+                                        <condition var1="tw_sleep" var2="0"/>
+                                        <condition var1="bm_loaded" var2="1"/>
+                                </conditions>
+                                <actions>
+                                        <action function="sleep">50000</action>
+					<action function="nonthreadedcmd">echo -ne "boot-system\x00" | dd of=%misc_dev% >/dev/null 2>&1 && reboot</action>
+                                </actions>
+                        </action>
+
+                        <text style="text_l">
+                                <placement x="%progress_x%" y="700"/>
+                                <text>{@install_reboot=Rebooting in %tw_sleep% second(s)}</text>
+                        </text>
+
+		</page>
+	</pages>
+</recovery>
+
diff --git a/gui/theme/portrait_hdpi/bootmenu.xml b/gui/theme/portrait_hdpi/bootmenu.xml
new file mode 100644
index 0000000000..f5695e2a5b
--- /dev/null
+++ b/gui/theme/portrait_hdpi/bootmenu.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<recovery>
+	<details>
+		<resolution width="1080" height="1920"/>
+		<author>k4y0z</author>
+		<title>Boot Menu</title>
+		<description>boot menu</description>
+		<themeversion>3</themeversion>
+	</details>
+
+	<resources>
+		<font name="font_l" filename="RobotoCondensed-Regular.ttf" size="52"/>
+		<image name="main_button" filename="main_button"/>
+		<image name="cursor" filename="cursor" retainaspect="1"/>
+                <animation name="progress" filename="indeterminate"/>
+                <image name="progress_empty" filename="progress_empty"/>
+                <image name="progress_full" filename="progress_fill"/>
+	</resources>
+
+	<variables>
+		<variable name="screen_width" value="1080"/>
+		<variable name="screen_height" value="1920"/>
+		<variable name="background_color" value="#1A1A1A"/>
+		<variable name="highlight_color" value="#1A1A1A80"/>
+                <variable name="text_color" value="#EEEEEE"/>
+                <variable name="progress_x" value="36"/>
+                <variable name="button_x" value="288"/>
+	</variables>
+
+	<mousecursor>
+		<placement w="15" h="15"/>
+		<background color="#FFFF00FF" resource="cursor"/>
+		<speed multiplier="2.5"/>
+	</mousecursor>
+
+	<templates>
+                <template name="progress_bar">
+                        <progressbar>
+                                <placement x="%progress_x%" y="900"/>
+                                <resource empty="progress_empty" full="progress_full"/>
+                                <data name="ui_progress"/>
+                        </progressbar>
+
+                        <animation>
+                                <placement x="%progress_x%" y="900"/>
+                                <resource name="progress"/>
+                                <speed fps="24" render="2"/>
+                                <loop frame="1"/>
+                        </animation>
+                </template>
+	</templates>
+
+	<styles>
+		<style name="main_button">
+			<highlight color="%highlight_color%"/>
+			<font resource="font_l" color="%text_button_color%"/>
+			<image resource="main_button"/>
+		</style>
+                <style name="text_l">
+                        <font resource="font_l" color="%text_color%"/>
+                </style>
+
+	</styles>
+
+	<pages>
+		<page name="bootmenu">
+			<action>
+				<actions>
+					<action function="set">tw_sleep=%tw_sleep_total%</action>
+					<action function="page">bootmenu2</action>
+				</actions>
+			</action>
+		</page>
+
+		<page name="bootmenu2">
+			<background color="%background_color%"/>
+
+			<button style="main_button">
+				<condition var1="tw_sleep" op="&gt;" var2="0"/>
+				<placement x="%button_x%" y="620"/>
+				<text>{@cancel_btn=Cancel}</text>
+				<actions>
+					<action function="set">bm_loaded=0</action>
+					<action function="set">tw_gui_done=1</action>
+				</actions>
+			</button>
+
+			<template name="progress_bar"/>
+
+                        <action>
+                                <conditions>
+                                        <condition var1="tw_sleep" var2="tw_sleep_total"/>
+                                        <condition var1="bm_loaded" var2="1"/>
+                                </conditions>
+                                <action function="threadedsleepcounter">%tw_sleep_total%</action>
+                        </action>
+
+			<action>
+                                <conditions>
+                                        <condition var1="tw_sleep" var2="0"/>
+                                        <condition var1="bm_loaded" var2="1"/>
+                                </conditions>
+                                <actions>
+                                        <action function="sleep">50000</action>
+					<action function="nonthreadedcmd">echo -ne "boot-system\x00" | dd of=%misc_dev% >/dev/null 2>&1 && reboot</action>
+                                </actions>
+                        </action>
+
+                        <text style="text_l">
+                                <placement x="%progress_x%" y="1000"/>
+                                <text>{@install_reboot=Rebooting in %tw_sleep% second(s)}</text>
+                        </text>
+
+		</page>
+	</pages>
+</recovery>
+
diff --git a/twrp.cpp b/twrp.cpp
index fb2de72650..061c4fdca1 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -297,6 +297,19 @@ int main(int argc, char **argv) {
 	}
 #endif
 
+#ifdef TW_BOOT_MENU
+	// Check the cmdline to see if boot_reason=0
+	char line[2048];
+	FILE *fp = fopen("/proc/cmdline", "rt");
+	if (fp != NULL) {
+		fgets(line, sizeof(line), fp);
+		fclose(fp); // cmdline is only one line long
+		if(strstr(line, "boot_reason=0")) {
+			boot_menu();
+		}
+	}
+#endif
+
 #ifndef TW_OEM_BUILD
 	// Check if system has never been changed
 	TWPartition* sys = PartitionManager.Find_Partition_By_Path(PartitionManager.Get_Android_Root_Path());

From a957df4a8ff5f6a76ba442d32ca0f8ba546093ab Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Sat, 5 Oct 2019 19:41:32 +0200
Subject: [PATCH 025/207] Make bootmenu only show if OTG is connected

Change-Id: I5ffa4bf056d6707c2d02f2d7d9ceef0c27a5f42c
---
 twrp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twrp.cpp b/twrp.cpp
index 061c4fdca1..52d5b59895 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -304,7 +304,7 @@ int main(int argc, char **argv) {
 	if (fp != NULL) {
 		fgets(line, sizeof(line), fp);
 		fclose(fp); // cmdline is only one line long
-		if(strstr(line, "boot_reason=0")) {
+		if(strstr(line, "boot_reason=0") && strstr(line, "y_cable=1")) {
 			boot_menu();
 		}
 	}

From 2923defaeace94529d526df18bb4525e224611a2 Mon Sep 17 00:00:00 2001
From: Ian Macdonald <ian@caliban.org>
Date: Wed, 4 Dec 2019 19:45:32 +0100
Subject: [PATCH 026/207] /sbin should come first in the linker search path.

/sbin must come before any other search path when TWRP is built for a
different version of Android than the one on which it will run.

Otherwise, as soon as any of the other paths becomes available via
direct action (i.e. the user mounts a file-system) or indirect action
(e.g. the user flashes a zip that mounts a file-system), incompatible
libraries will be prioritised and loaded instead of the correct ones
from /sbin in TWRP's ramdisk.

This will cause severe disruption of the TWRP environment. Toybox and
other dynamically linked binaries will immediately cease to work; and
since Toybox provides umount, it typically won't be possible to recover
from this state without a reboot.

For example, the following occurs when a Toybox applet is run on a
Samsung Galaxy S10 running Android 10, but using a version of TWRP built
for Android 9:

android:/ # getprop ro.boot.bootloader
CANNOT LINK EXECUTABLE "getprop": cannot locate symbol "_system_properties_init" referenced by "/system_root/system/lib64/libselinux.so"...
linker: CANNOT LINK EXECUTABLE "getprop": cannot locate symbol "_system_properties_init" referenced by "/system_root/system/lib64/libselinux.so"...

Change-Id: I31fe612ebb1c7d9ad71d67be2c615caa3fbb5d6f
---
 Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index d0d962f54c..1bb421ab8e 100755
--- a/Android.mk
+++ b/Android.mk
@@ -519,11 +519,11 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)
     TWRP_REQUIRED_MODULES += ld.config.txt
     ifeq ($(BOARD_VNDK_RUNTIME_DISABLE),true)
         LOCAL_POST_INSTALL_CMD += \
-            sed '0,/^namespace.default.search.paths\s\{1,\}/!b;//a\namespace.default.search.paths += \/sbin' \
+	    sed 's/\(namespace.default.search.paths\)\s\{1,\}=/namespace.default.search.paths  = \/sbin\n\1 +=/' \
                 $(TARGET_OUT_ETC)/ld.config.vndk_lite.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt;
     else
         LOCAL_POST_INSTALL_CMD += \
-            sed '0,/^namespace.default.search.paths\s\{1,\}/!b;//a\namespace.default.search.paths += \/sbin' \
+	    sed 's/\(namespace.default.search.paths\)\s\{1,\}=/namespace.default.search.paths  = \/sbin\n\1 +=/' \
                 $(TARGET_OUT_ETC)/ld.config.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt;
     endif
 endif

From 7ec5fd9e6d413860c8ecf68e5d14111f8e12e434 Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Fri, 12 Oct 2018 11:12:22 +0200
Subject: [PATCH 027/207] recovery: Move bldrmsg offset symbols to
 bootloader_message.cpp

* bootloader_message.cpp is the only file using
  BOOTLOADER_MESSAGE_OFFSET_IN_MISC and WIPE_PACKAGE_OFFSET_IN_MISC,
  so we can move their definitions to the cpp.
  This prevents the need to set BOARD_RECOVERY_BLDRMSG_OFFSET
  in every module that includes the header.

* Global cflags are no longer supported Oreo and up,
  so set the BOARD_RECOVERY_BLDRMSG_OFFSET via make variable

* Simplify logic, always set BOARD_RECOVERY_BLDRMSG_OFFSET.

Change-Id: I2b902bcce7f5ca13472e0ac30ac01b4991294dbe
---
 bootloader_message_twrp/Android.mk                |  5 +++++
 bootloader_message_twrp/bootloader_message.cpp    | 10 ++++++++++
 .../bootloader_message_twrp/bootloader_message.h  | 15 ---------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bootloader_message_twrp/Android.mk b/bootloader_message_twrp/Android.mk
index e7a3ea0f8c..932cd040c6 100644
--- a/bootloader_message_twrp/Android.mk
+++ b/bootloader_message_twrp/Android.mk
@@ -31,5 +31,10 @@ LOCAL_CFLAGS := -Werror -std=c++11
 ifeq ($(TW_IGNORE_MISC_WIPE_DATA), true)
     LOCAL_CFLAGS += -DIGNORE_MISC_WIPE_DATA
 endif
+ifeq ($(BOOTLOADER_MESSAGE_OFFSET),)
+    LOCAL_CFLAGS += -DBOARD_RECOVERY_BLDRMSG_OFFSET=0
+else
+    LOCAL_CFLAGS += -DBOARD_RECOVERY_BLDRMSG_OFFSET=$(BOOTLOADER_MESSAGE_OFFSET)
+endif
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 include $(BUILD_SHARED_LIBRARY)
diff --git a/bootloader_message_twrp/bootloader_message.cpp b/bootloader_message_twrp/bootloader_message.cpp
index a06ad9a89f..b97f66e373 100644
--- a/bootloader_message_twrp/bootloader_message.cpp
+++ b/bootloader_message_twrp/bootloader_message.cpp
@@ -28,6 +28,16 @@
 #include <string>
 #include <vector>
 
+// Spaces used by misc partition are as below:
+// 0   - 2K     For bootloader_message
+// 2K  - 16K    Used by Vendor's bootloader (the 2K - 4K range may be optionally used
+//              as bootloader_message_ab struct)
+// 16K - 64K    Used by uncrypt and recovery to store wipe_package for A/B devices
+// Note that these offsets are admitted by bootloader,recovery and uncrypt, so they
+// are not configurable without changing all of them.
+static const size_t BOOTLOADER_MESSAGE_OFFSET_IN_MISC = BOARD_RECOVERY_BLDRMSG_OFFSET;
+static const size_t WIPE_PACKAGE_OFFSET_IN_MISC = 16 * 1024 + BOOTLOADER_MESSAGE_OFFSET_IN_MISC;
+
 static std::string misc_blkdev;
 
 void set_misc_device(const char* name) {
diff --git a/bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h b/bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h
index 52c1b86f0e..d8d955e72d 100644
--- a/bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h
+++ b/bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h
@@ -21,21 +21,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-// Spaces used by misc partition are as below:
-// 0   - 2K     For bootloader_message
-// 2K  - 16K    Used by Vendor's bootloader (the 2K - 4K range may be optionally used
-//              as bootloader_message_ab struct)
-// 16K - 64K    Used by uncrypt and recovery to store wipe_package for A/B devices
-// Note that these offsets are admitted by bootloader,recovery and uncrypt, so they
-// are not configurable without changing all of them.
-#ifdef BOARD_RECOVERY_BLDRMSG_OFFSET
-static const size_t BOOTLOADER_MESSAGE_OFFSET_IN_MISC = BOARD_RECOVERY_BLDRMSG_OFFSET;
-static const size_t WIPE_PACKAGE_OFFSET_IN_MISC = 16 * 1024 + BOOTLOADER_MESSAGE_OFFSET_IN_MISC;
-#else
-static const size_t BOOTLOADER_MESSAGE_OFFSET_IN_MISC = 0;
-static const size_t WIPE_PACKAGE_OFFSET_IN_MISC = 16 * 1024;
-#endif
-
 /* Bootloader Message (2-KiB)
  *
  * This structure describes the content of a block in flash

From d331705daa073d36e1f5dc445bd3eccf49987019 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sun, 22 Dec 2019 16:05:12 -0500
Subject: [PATCH 028/207] android-5.1: use char constructor for default on c++
 streams

Change-Id: I4be681c2720f62182e57237b1cfefc384235f0e1
---
 twrp-functions.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 4386ff6f49..a3e5a07385 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -524,7 +524,7 @@ void TWFunc::Copy_Log(string Source, string Destination) {
 			destLogBuffer.append(destFileBuffer);
 		}
 	} else if (Path_Exists(uncompressedLog)) {
-		std::ifstream uncompressedIfs(uncompressedLog);
+		std::ifstream uncompressedIfs(uncompressedLog.c_str());
 		std::stringstream uncompressedSS;
 		uncompressedSS << uncompressedIfs.rdbuf();
 		uncompressedIfs.close();
@@ -533,7 +533,7 @@ void TWFunc::Copy_Log(string Source, string Destination) {
 		std::remove(uncompressedLog.c_str());
 	}
 
-	std::ifstream ifs(Source);
+	std::ifstream ifs(Source.c_str());
 	std::stringstream ss;
 	ss << ifs.rdbuf();
 	std::string srcLogBuffer(ss.str());
@@ -759,8 +759,8 @@ int TWFunc::copy_file(string src, string dst, int mode) {
 		LOGINFO("Unable to find source file %s\n", src.c_str());
 		return -1;
 	}
-	std::ifstream srcfile(src, ios::binary);
-	std::ofstream dstfile(dst, ios::binary);
+	std::ifstream srcfile(src.c_str(), ios::binary);
+	std::ofstream dstfile(dst.c_str(), ios::binary);
 	dstfile << srcfile.rdbuf();
 	if (!dstfile.bad()) {
 		LOGINFO("Copied file %s to %s\n", src.c_str(), dst.c_str());

From 5667feb0ac8c2efa6c46aff171e2768245978ed1 Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Sat, 4 May 2019 20:06:48 +0200
Subject: [PATCH 029/207] recovery: wipe bootloader message from index 0 when
 using custom offsets

 * We may use a custom offset to:
   a) preserve data that oem wrote to the first bytes of misc
   b) skip recovery flags written by the bootloader (e.g. --wipe_data)

   For case a) one should set the offset 'x' to be at least greater than
   the size of bootloader_message struct (2048 bytes). If this is the case,
   then we zero out bytes x ~ x + 2047

   For case b) one should set the offset to be strictly smaller than
   the size of bootloader_message struct. If this is the case, then we
   zero out bytes 0 ~ 2047.
   This allows to clear any additional flag set by the bootloader,
   that would otherwise be forgotten in misc.
   This also guarantees that we do not involountarily wipe any data that
   the oem may have written starting at byte 2048 (coff coff LG)

Change-Id: I2d4e0702a2d8cbbef6274a87ce9499b0f69310dd
---
 bootloader_message_twrp/bootloader_message.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootloader_message_twrp/bootloader_message.cpp b/bootloader_message_twrp/bootloader_message.cpp
index b97f66e373..db8c5ce5d7 100644
--- a/bootloader_message_twrp/bootloader_message.cpp
+++ b/bootloader_message_twrp/bootloader_message.cpp
@@ -220,6 +220,9 @@ bool clear_bootloader_message(void* err) {
 
 bool clear_bootloader_message(std::string* err) {
   bootloader_message boot = {};
+  if (BOOTLOADER_MESSAGE_OFFSET_IN_MISC < sizeof(bootloader_message)) {
+      return write_misc_partition(&boot, sizeof(boot), 0 /* offset */, err);
+  }
   return write_bootloader_message(boot, err);
 }
 

From f9156eaaab46bcf7f245d86cfed1ef180427957a Mon Sep 17 00:00:00 2001
From: Ian Macdonald <ian@caliban.org>
Date: Mon, 17 Jun 2019 12:41:48 +0200
Subject: [PATCH 030/207] Complete overhaul of Dutch translation:

* All missing strings added (ref: en.xml).
* Many strings clarified and ambiguity removed.
* Inconsistent use of language reconciled.
* XML validated by xmllint(1).
* String length validated on device (G975F).

Change-Id: I4a4c3dc5a1147a62b8c141286fc7ac432678a322
---
 gui/theme/common/languages/nl.xml | 832 ++++++++++++++++--------------
 1 file changed, 445 insertions(+), 387 deletions(-)

diff --git a/gui/theme/common/languages/nl.xml b/gui/theme/common/languages/nl.xml
index 8dadd40acc..e100bfe9f9 100644
--- a/gui/theme/common/languages/nl.xml
+++ b/gui/theme/common/languages/nl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <language>
-	<display>Dutch</display>
+	<display>Nederlands</display>
 
 	<resources>
 		<!-- Font overrides - only change these if your language requires special characters -->
@@ -11,33 +11,35 @@
 		<resource name="fixed" type="fontoverride" filename="DroidSansMono.ttf" scale="100" />
 
 		<!-- Partition display names -->
-		<string name="system">Systeem</string>
-		<string name="system_image">Systeem-Image</string>
-		<string name="vendor">Leverancier</string>
-		<string name="vendor_image">Leverancier-Image</string>
+		<string name="system">System</string>
+		<string name="system_image">System-image</string>
+		<string name="vendor">Vendor</string>
+		<string name="vendor_image">Vendor-image</string>
 		<string name="boot">Boot</string>
 		<string name="recovery">Recovery</string>
 		<string name="cache">Cache</string>
 		<string name="data">Data</string>
-		<string name="sdcard">SD kaart</string>
+		<string name="data_backup">Data (exclusief /data/media)</string>
+		<string name="sdcard">SD-kaart</string>
 		<string name="internal">Interne opslag</string>
-		<string name="microsd">Micro SD kaart</string>
+		<string name="microsd">Micro SD-kaart</string>
 		<string name="usbotg">USB OTG</string>
 		<string name="android_secure">Android Secure</string>
-		<string name="dalvik">Dalvik / ART Cache</string>
+		<string name="dalvik">Dalvik- / ART-cache</string>
 		<!-- This is a rarely used partition on a Micro SD card for a very old app2sd system -->
 		<string name="sdext">SD-EXT</string>
 		<string name="adopted_data">Geadopteerde Data</string>
-		<string name="adopted_storage">Geadopteerde Opslag</string>
+		<string name="adopted_storage">Geadopteerde opslag</string>
+		<string name="autostorage">Opslag</string>
 
 		<!-- GUI XML strings -->
 		<string name="twrp_header">Team Win Recovery Project</string>
 		<string name="twrp_watch_header">TWRP %tw_version%</string>
 		<string name="cpu_temp">CPU: %tw_cpu_temp% ° C</string>
 		<string name="battery_pct">Accu: %tw_battery%</string>
-		<string name="sort_by_name">Sorteer op naam</string>
-		<string name="sort_by_date">Sorteer op datum</string>
-		<string name="sort_by_size">Sorteer op grootte</string>
+		<string name="sort_by_name">Op naam sorteren</string>
+		<string name="sort_by_date">Op datum sorteren</string>
+		<string name="sort_by_size">Op grootte sorteren</string>
 		<string name="sort_by_name_only">Naam</string>
 		<string name="sort_by_date_only">Datum</string>
 		<string name="sort_by_size_only">Grootte</string>
@@ -46,13 +48,13 @@
 		<string name="tab_backup">BACK-UP</string>
 		<string name="tab_time_zone">TIJDZONE</string>
 		<string name="tab_screen">SCHERM</string>
-		<string name="tab_vibration">TRILLINGEN</string>
+		<string name="tab_vibration">TRILLEN</string>
 		<string name="tab_language">TAAL</string>
 
 		<string name="install_btn">Installeren</string>
 		<string name="wipe_btn">Wissen</string>
-		<string name="backup_btn">Back-up</string>
-		<string name="restore_btn">Herstel</string>
+		<string name="backup_btn">Back-uppen</string>
+		<string name="restore_btn">Herstellen</string>
 		<string name="mount_btn">Koppelen</string>
 		<string name="settings_btn">Instellingen</string>
 		<string name="advanced_btn">Geavanceerd</string>
@@ -60,104 +62,118 @@
 		<string name="files_btn">Bestanden</string>
 		<string name="copy_log_btn">Log kopiëren</string>
 		<string name="select_type_hdr">Type selecteren</string>
-		<string name="install_zip_hdr">Zip installeren</string>
-		<string name="install_zip_btn">Zip installeren</string>
+		<string name="install_zip_hdr">Zipbestand installeren</string>
+		<string name="install_zip_btn">Zipbestand installeren</string>
 		<string name="install_image_hdr">Image installeren</string>
 		<string name="install_image_btn">Image installeren</string>
 		<string name="install_select_file_hdr">Bestand selecteren</string>
 		<string name="file_selector_folders_hdr">Mappen</string>
 		<string name="select_file_from_storage">Selecteer bestand in %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
-		<string name="adb_sideload_btn">ADB Sideload</string>
+		<string name="adb_sideload_btn">ADB-sideload</string>
 		<string name="install_hdr">Installeren</string>
-		<string name="select_storage_hdr">Selecteer opslag</string>
-		<string name="select_storage_btn">Selecteer opslag</string>
+		<string name="select_storage_hdr">Opslag selecteren</string>
+		<string name="select_storage_btn">Opslag selecteren</string>
 		<string name="queue_hdr">Wachtrij</string>
-		<string name="zip_queue_count">%tw_zip_queue_count% van max 10 bestanden in de wachtrij</string>
+		<string name="zip_queue_count">%tw_zip_queue_count% van max. 10 bestanden in de wachtrij</string>
 		<string name="zip_queue_count_s">Bestand %tw_zip_queue_count% van 10:</string>
-		<string name="zip_warn1">Deze toepassing kan niet-compatibele software installeren</string>
-		<string name="zip_warn2">en je apparaat onbruikbaar maken.</string>
-		<string name="zip_back_cancel">Klik op terug om het toevoegen van de Zip te annuleren.</string>
-		<string name="zip_back_clear">Klik op terug om de wachtrij op te schonen.</string>
+		<string name="zip_warn1">Deze toepassing kan onverenigbare software</string>
+		<string name="zip_warn2">installeren die het apparaat onbruikbaar maakt.</string>
+		<string name="zip_back_cancel">Klik op Terug om het toevoegen van het zipbestand te annuleren.</string>
+		<string name="zip_back_clear">Klik op Terug om de wachtrij leeg te maken.</string>
 		<string name="folder">Map:</string>
 		<string name="file">Bestand:</string>
-		<string name="zip_sig_chk">Verificatie van de ondertekening van de zip</string>
-		<string name="inject_twrp_chk">TWRP injecteren na installeren</string>
-		<string name="install_reboot_chk">Herstart nadat de installatie compleet is</string>
+		<string name="zip_sig_chk">Verificatie van de ondertekening van het zipbestand</string>
+		<string name="inject_twrp_chk">TWRP inlassen na installatie</string>
+		<string name="install_reboot_chk">Herstarten na installatie</string>
 		<string name="options_hdr">Opties</string>
-		<string name="confirm_flash_hdr">Flash bevestigen</string>
+		<string name="confirm_flash_hdr">Flashen bevestigen</string>
 		<string name="zip_queue">Wachtrij:</string>
 		<string name="options">Instellingen:</string>
 		<string name="swipe_confirm">   Bevestigen</string>
-		<string name="zip_add_btn">Meer Zips toevoegen</string>
-		<string name="zip_clear_btn">Leeg zip wachtrij</string>
-		<string name="install_zip_count_hdr">Installeer Zip %tw_zip_index% van %tw_zip_queue_count%</string>
-		<string name="installing_zip_xml">Zip Installeren: %tw_file%</string>
+		<string name="zip_add_btn">Zipbestanden toevoegen</string>
+		<string name="zip_clear_btn">Wachtrij leegmaken</string>
+		<string name="install_zip_count_hdr">Zipbestand %tw_zip_index% van %tw_zip_queue_count% installeren</string>
+		<string name="installing_zip_xml">Zipbestand wordt geïnstalleerd: %tw_file%</string>
 		<string name="failed">Mislukt</string>
 		<string name="successful">Geslaagd</string>
 		<string name="install_failed">Installatie mislukt</string>
-		<string name="install_successful">Installatie is geslaagd</string>
-		<string name="wipe_cache_dalvik_btn">Wis cache / dalvik</string>
-		<string name="reboot_system_btn">Herstart systeem</string>
-		<string name="install_sel_target">Selecteer doelpartitie</string>
-		<string name="flash_image_select">Selecteer partitie om op te installeren:</string>
+		<string name="install_successful">Installatie geslaagd</string>
+		<string name="wipe_cache_dalvik_btn">Cache &amp; Dalvik wissen</string>
+		<string name="wipe_dalvik_btn">Dalvik wissen</string>
+		<string name="reboot_system_btn">Systeem herstarten</string>
+		<string name="install_sel_target">Doelpartitie selecteren</string>
+		<string name="flash_image_select">Partitie selecteren om op te installeren:</string>
 		<string name="target_partition">Doelpartitie:</string>
-		<string name="flashing_image">Image installeren...</string>
+		<string name="flashing_image">Image wordt geïnstalleerd...</string>
 		<string name="image_flashed">Image geïnstalleerd</string>
-		<string name="wipe_cache_dalvik_confirm">Wis Cache &amp; Dalvik?</string>
-		<string name="wiping_cache_dalvik">Cache &amp; Dalvik aan het wissen...</string>
-		<string name="wipe_cache_dalvik_complete">Cache &amp; Dalvik opschoning afgerond</string>
+		<string name="wipe_cache_dalvik_confirm">Cache &amp; Dalvik wissen?</string>
+		<string name="wipe_dalvik_confirm">Dalvik wissen?</string>
+		<string name="wiping_cache_dalvik">Cache &amp; Dalvik worden gewist...</string>
+		<string name="wipe_cache_dalvik_complete">Cache &amp; Dalvik gewist</string>
+		<string name="wipe_dalvik_complete">Dalvik gewist</string>
 		<string name="swipe_wipe">Veeg om te wissen</string>
 		<string name="swipe_wipe_s">   Wissen</string>
-		<string name="no_os1">Geen OS geïnstalleerd! Bent u</string>
-		<string name="no_osrb">weet u zeker dat u wilt herstarten?</string>
-		<string name="no_ospo">weet u zeker dat u uw apparaat wilt uitschakelen?</string>
+		<string name="no_os1">Geen besturingssysteem geïnstalleerd! Weet u</string>
+		<string name="no_osrb">zeker dat u wilt herstarten?</string>
+		<string name="no_ospo">zeker dat u uw apparaat wilt uitschakelen?</string>
 		<string name="rebooting">Herstarten...</string>
 		<string name="swipe_reboot">Veeg om te herstarten</string>
 		<string name="swipe_reboot_s">   Herstarten</string>
-		<string name="swipe_flash">Veeg om de installatie te bevestigen</string>
-		<string name="confirm_action">Bevestig actie</string>
-		<string name="back_cancel">Klik op terug om te annuleren.</string>
+		<string name="reboot_install_app_hdr">TWRP-app installeren?</string>
+		<string name="reboot_install_app1">Wilt u de officiële TWRP-app installeren?</string>
+		<string name="reboot_install_app2">De app kan controleren of er een nieuwere versie van TWRP beschikaar is.</string>
+		<string name="reboot_install_app_prompt_install">Installatie TWRP-app aanbieden</string>
+		<string name="reboot_install_app_system">Installeren als System-app</string>
+		<string name="reboot_installing_app">App wordt geïnstalleerd...</string>
+		<string name="swipe_to_install_app">Veeg om TWRP-app te installeren</string>
+		<string name="uninstall_twrp_system_app">TWRP-app deïnstalleren van System</string>
+		<string name="uninstall_twrp_system_app_confirm">TWRP-app deïnstalleren van System?</string>
+		<string name="uninstalling_twrp_system_app">TWRP-app wordt gedeïnstalleerd van System...</string>
+		<string name="uninstall_twrp_system_app_complete">Deïnstallatie TWRP-app van System voltooid</string>
+		<string name="swipe_flash">Veeg om te installeren</string>
+		<string name="confirm_action">Actie bevestigen</string>
+		<string name="back_cancel">Klik op Terug om te annuleren.</string>
 		<string name="cancel_btn">Annuleren</string>
 		<string name="wipe_hdr">Wissen</string>
-		<string name="factory_reset_hdr">Fabrieksinstellingen</string>
-		<string name="factory_reset_btn">Fabrieksinstellingen</string>
-		<string name="factory_reset1">Wist data, cache en Dalvik</string>
-		<string name="factory_reset2">(Interne opslag niet meegenomen)</string>
-		<string name="factory_reset3">Merendeel van de tijd dit is</string>
-		<string name="factory_reset4">de enigste opschoning die nodig is.</string>
-		<string name="factory_resetting">Fabrieksinstellingen...</string>
+		<string name="factory_reset_hdr">Fabrieksinstellingen herstellen</string>
+		<string name="factory_reset_btn">Fabrieksinstellingen herstellen</string>
+		<string name="factory_reset1">Wist Data, Cache en Dalvik</string>
+		<string name="factory_reset2">(exclusief interne opslag)</string>
+		<string name="factory_reset3">Meestal kan worden volstaan</string>
+		<string name="factory_reset4">met dit type opschoning.</string>
+		<string name="factory_resetting">Fabrieksinstellingen worden hersteld...</string>
 		<string name="advanced_wipe_hdr">Geavanceerd wissen</string>
 		<string name="advanced_wipe_btn">Geavanceerd wissen</string>
-		<string name="wipe_enc_confirm">Encryptie wissen van de data-partitie?</string>
-		<string name="formatting_data">Data formatteren...</string>
+		<string name="wipe_enc_confirm">Versleuteling van Data verwijderen?</string>
+		<string name="formatting_data">Data wordt geformatteerd...</string>
 		<string name="swipe_format_data">Veeg om Data te formatteren</string>
 		<string name="swipe_format_data_s">   Data formatteren</string>
 		<string name="factory_reset_complete">Fabrieksinstellingen hersteld</string>
-		<string name="sel_part_hdr">Partitie selecteren</string>
-		<string name="wipe_sel_confirm">Wis geselecteerde partitie(s)?</string>
-		<string name="wiping_part">Partitie(s) aan het wissen...</string>
+		<string name="sel_part_hdr">Partitie(s) selecteren</string>
+		<string name="wipe_sel_confirm">Geselecteerde partities wissen?</string>
+		<string name="wiping_part">Partities worden gewist...</string>
 		<string name="wipe_complete">Wissen voltooid</string>
-		<string name="sel_part_wipe">Selecteer partities om te wissen:</string>
-		<string name="invalid_part_sel">Ongeldige partitie selectie</string>
-		<string name="format_data_hdr">Formatteer Data</string>
-		<string name="format_data_btn">Formatteer Data</string>
-		<string name="format_data_ptr1">Het formatteren van Data, verwijderd al uw apps,</string>
-		<string name="format_data_ptr2">backups, foto\'s, video\'s, media, en</string>
-		<string name="format_data_ptr3">verwijderd de versleuteling van de interne opslag.</string>
-		<string name="format_data_adopted">Geadopteerde opslag inbegrepen</string>
-		<string name="format_data_lcp1">Data formatteren verwijdert alle apps, back-ups, foto\'s, videos, media, en</string>
-		<string name="format_data_lcp2">verwijderd de versleuteling van de interne opslag.</string>
-		<string name="format_data_wtc1">Het formatteren van Data, verwijderd al uw apps,</string>
+		<string name="sel_part_wipe">Partitie(s) selecteren om te wissen:</string>
+		<string name="invalid_part_sel">Ongeldige partitie geselecteerd</string>
+		<string name="format_data_hdr">Data formatteren</string>
+		<string name="format_data_btn">Data formatteren</string>
+		<string name="format_data_ptr1">Het formatteren van Data verwijdert al uw apps,</string>
+		<string name="format_data_ptr2">back-ups, foto's, video's en andere media, en</string>
+		<string name="format_data_ptr3">verwijdert de versleuteling van de interne opslag.</string>
+		<string name="format_data_adopted">De geadopteerde opslag inbegrepen</string>
+		<string name="format_data_lcp1">Data formatteren wist alle apps, back-ups, foto's, videos en andere media,</string>
+		<string name="format_data_lcp2">en verwijdert de versleuteling van de interne opslag.</string>
+		<string name="format_data_wtc1">Data formatteren verwijdert al uw apps,</string>
 		<string name="format_data_wtc2">back-ups en media. Dit kan niet ongedaan worden gemaakt.</string>
 		<string name="format_data_undo">Dit kan niet ongedaan worden gemaakt.</string>
-		<string name="format_data_complete">Data formattering voltooid</string>
+		<string name="format_data_complete">Formattering van Data voltooid</string>
 		<!-- Translator note: the word "yes" must remain English! -->
-		<string name="yes_continue">Type Yes om door te gaan.  Druk op terug om te annuleren.</string>
+		<string name="yes_continue">Typ 'yes' om verder te gaan. Klik op Terug om te annuleren.</string>
 		<string name="part_opt_hdr">Opties voor partitioneren: %tw_partition_name%</string>
-		<string name="sel_act_hdr">Selecteer Actie</string>
+		<string name="sel_act_hdr">Actie selecteren</string>
 		<string name="file_sys_opt">Opties voor bestandssysteem</string>
 		<string name="partition">Partitie: %tw_partition_name%</string>
-		<string name="part_mount_point">Koppel Punt: %tw_partition_mount_point%</string>
+		<string name="part_mount_point">Koppelpunt: %tw_partition_mount_point%</string>
 		<string name="part_curr_fs">Bestandssysteem: %tw_partition_file_system%</string>
 		<string name="part_present_yes">Aanwezig: Ja</string>
 		<string name="part_present_no">Aanwezig: Nee</string>
@@ -166,51 +182,56 @@
 		<string name="part_size">Grootte: % tw_partition_size % MB</string>
 		<string name="part_used">Gebruikt: % tw_partition_used % MB</string>
 		<string name="part_free">Vrij: % tw_partition_free % MB</string>
-		<string name="part_backup_size">Back-up grootte: % tw_partition_backup_size % MB</string>
-		<string name="resize_btn">Bestandssysteem grootte aanpassen</string>
+		<string name="part_backup_size">Back-upgrootte: % tw_partition_backup_size % MB</string>
+		<string name="resize_btn">Grootte bestandssysteem aanpassen</string>
 		<string name="resize_btn_s">Grootte aanpassen</string>
 		<string name="resize_confirm">Grootte van %tw_partition_name% aanpassen?</string>
-		<string name="resizing">Grootte aanpassen...</string>
+		<string name="resizing">Grootte wordt aangepast...</string>
 		<string name="resize_complete">Aanpassen voltooid</string>
 		<string name="swipe_resize">Veeg om de grootte aan te passen</string>
 		<string name="swipe_resize_s">   Grootte aanpassen</string>
-		<string name="repair_btn">Bestandssysteem Repareren</string>
+		<string name="repair_btn">Bestandssysteem repareren</string>
 		<string name="repair_btn_s">Repareren</string>
 		<string name="repair_confirm">%tw_partition_name% repareren?</string>
-		<string name="repairing">Aan het repareren...</string>
-		<string name="repair_complete">Reparartie voltooid</string>
+		<string name="repairing">Bestandssysteem wordt gerepareerd...</string>
+		<string name="repair_complete">Reparatie voltooid</string>
 		<string name="swipe_repair">Veeg om te repareren</string>
 		<string name="swipe_repair_s">   Repareren</string>
-		<string name="change_fs_btn">Bestandssysteem Wijzigen</string>
+		<string name="change_fs_btn">Type bestandssysteem wijzigen</string>
 		<string name="change_fs_btn_s">Wijzigen</string>
-		<string name="change_fs_for_hdr">Bestandssysteem Wijzigen voor: %tw_partition_name%</string>
+		<string name="change_fs_for_hdr">Type bestandssysteem wijzigen voor: %tw_partition_name%</string>
 		<string name="change_fs_for_hdr_s">Partitie: %tw_partition_name% &gt; selecteer bestandssysteem</string>
-		<string name="change_fs_warn1">Sommige ROMs of kernels hebben mogelijk geen ondersteuning voor sommige</string>
-		<string name="change_fs_warn2">bestandssystemen. Let daar op!</string>
+		<string name="change_fs_warn1">Sommige ROMs of kernels missen mogelijk ondersteuning voor sommige</string>
+		<string name="change_fs_warn2">soorten bestandssystemen. Voorzichtigheid betrachten!</string>
 		<string name="change_fs_confirm">%tw_partition_name% wijzigen?</string>
-		<string name="formatting">Formatteren...</string>
+		<string name="formatting">Wordt geformatteerd...</string>
 		<string name="format_complete">Formatteren voltooid</string>
 		<string name="swipe_change_fs">Veeg om te wijzigen</string>
 		<string name="swipe_change_s">   Wijzigen</string>
 		<string name="back_btn">Terug</string>
 		<string name="wipe_enc_btn">Versleuteling verwijderen</string>
-		<string name="swipe_factory_reset">Veeg voor Fabrieksinstellingen</string>
-		<string name="repair_change_btn">Repareer of verander het bestandssysteem</string>
+		<string name="swipe_factory_reset">Veeg om herstel fabrieksinst.</string>
+		<string name="repair_change_btn">Bestandssysteem repareren of type ervan veranderen</string>
 		<string name="storage_hdr">Opslag: %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
-		<string name="backup_hdr">Back-up</string>
+		<string name="backup_hdr">Back-uppen</string>
 		<string name="backup_confirm_hdr">Back-up bevestigen</string>
 		<string name="encryption_tab">VERSLEUTELING</string>
 		<string name="encryption">Versleuteling:</string>
 		<string name="name">Naam:</string>
-		<string name="sel_part_backup">Selecteer partities om te back-uppen:</string>
+		<string name="sel_part_backup">Partitie(s) selecteren om te back-uppen:</string>
 		<string name="storage">Opslag:</string>
 		<string name="enc_disabled">uitgeschakeld - stel een wachtwoord in om in te schakelen</string>
 		<string name="enc_enabled">ingeschakeld</string>
 		<string name="enable_backup_comp_chk">Compressie inschakelen</string>
-		<string name="skip_digest_backup_chk" version="2">Digest generatie tijdens back-up overslaan</string>
-		<string name="disable_backup_space_chk">Vrije ruimte controle uitschakelen</string>
-		<string name="refresh_sizes_btn">Grootte vernieuwen</string>
-		<string name="swipe_backup">Veeg voor back-up</string>
+		<string name="skip_digest_backup_chk" version="2">Genereren van digest tijdens back-up overslaan</string>
+		<string name="disable_backup_space_chk" version="2">Controle vrije ruimte uitschakelen</string>
+		<string name="current_boot_slot">Huidige slot: %tw_active_slot%</string>
+		<string name="boot_slot_a">Slot A</string>
+		<string name="boot_slot_b">Slot B</string>
+		<string name="changing_boot_slot">Opstartslot wordt gewijzigd</string>
+		<string name="changing_boot_slot_complete">Wijzigen opstartslot voltooid</string>
+		<string name="refresh_sizes_btn">Grootte verversen</string>
+		<string name="swipe_backup">Veeg om te back-uppen</string>
 		<string name="append_date_btn">Datum toevoegen</string>
 		<string name="backup_name_exists">Een back-up met die naam bestaat al!</string>
 		<string name="encrypt_backup">Back-up versleutelen?</string>
@@ -220,50 +241,50 @@
 		<string name="partitions">Partities:</string>
 		<string name="disabled">Uitgeschakeld</string>
 		<string name="enabled">Ingeschakeld</string>
-		<string name="backup_name_hdr">Naam van de back-up</string>
+		<string name="backup_name_hdr">Naam back-up</string>
 		<string name="progress">Voortgang:</string>
-		<string name="backup_complete">Back-up compleet</string>
+		<string name="backup_complete">Back-up voltooid</string>
 		<string name="restore_hdr">Herstellen</string>
-		<string name="sel_backup_hdr">Selecteer back-up</string>
-		<string name="restore_sel_store_hdr">Selecteer back-up van %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
-		<string name="restore_sel_pack_fs">Selecteer pakket om te herstellen:</string>
+		<string name="sel_backup_hdr">Back-up selecteren</string>
+		<string name="restore_sel_store_hdr">Back-up selecteren van %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
+		<string name="restore_sel_pack_fs">Pakket selecteren om te herstellen:</string>
 		<string name="restore_enc_backup_hdr">Versleutelde back-up</string>
-		<string name="restore_dec_fail">Wachtwoord is mislukt, probeer het opnieuw!</string>
-		<string name="del_backup_btn">Back-up verwijderen</string>
-		<string name="del_backup_confirm">Back-up verwijderen?</string>
+		<string name="restore_dec_fail">Wachtwoord mislukt. Probeer opnieuw!</string>
+		<string name="del_backup_btn">Back-up wissen</string>
+		<string name="del_backup_confirm">Back-up wissen?</string>
 		<string name="del_backup_confirm2">Dit kan niet ongedaan worden gemaakt!</string>
-		<string name="deleting_backup">Back-up verwijderen...</string>
-		<string name="backup_deleted">Verwijderen van back-up voltooid</string>
-		<string name="swipe_delete">Veeg om te verwijderen</string>
-		<string name="swipe_delete_s">   Verwijderen</string>
-		<string name="restore_try_decrypt">Versleutelde back-up - proberen te decoderen</string>
-		<string name="restore_try_decrypt_s">Decodering proberen</string>
+		<string name="deleting_backup">Back-up wordt gewist...</string>
+		<string name="backup_deleted">Back-up gewist</string>
+		<string name="swipe_delete">Veeg om te wissen</string>
+		<string name="swipe_delete_s">   Wissen</string>
+		<string name="restore_try_decrypt">Versleutelde back-up - Wordt ontsleuteld</string>
+		<string name="restore_try_decrypt_s">Poging tot ontsleutelen</string>
 		<string name="restore_backup_date">Back-up gemaakt op %tw_restore_file_date%</string>
-		<string name="restore_sel_part">Selecteer partities om te herstellen:</string>
-		<string name="restore_enable_digest_chk" version="2">Digest controle van back-up bestanden Inschakelen</string>
+		<string name="restore_sel_part">Partitie(s) selecteren om te herstellen:</string>
+		<string name="restore_enable_digest_chk" version="2">Digestcontrole van back-upbestanden inschakelen</string>
 		<string name="restore_complete">Herstellen voltooid</string>
 		<string name="swipe_restore">Veeg om te herstellen</string>
 		<string name="swipe_restore_s">   Herstellen</string>
 		<string name="rename_backup_hdr">Back-up hernoemen</string>
 		<string name="rename_backup_confirm">Back-up hernoemen?</string>
 		<string name="rename_backup_confirm2">Dit kan niet ongedaan worden gemaakt!</string>
-		<string name="renaming_backup">Back-up hernoemen...</string>
-		<string name="rename_backup_complete">Back-up hernoemen voltooid</string>
+		<string name="renaming_backup">Back-up wordt hernoemd...</string>
+		<string name="rename_backup_complete">Back-up hernoemd</string>
 		<string name="swipe_to_rename">Veeg om te hernoemen</string>
-		<string name="swipe_rename">   Hernoem</string>
-		<string name="confirm_hdr">Bevestig</string>
+		<string name="swipe_rename">   Hernoemen</string>
+		<string name="confirm_hdr">Bevestigen</string>
 		<string name="mount_hdr">Koppelen</string>
-		<string name="mount_sel_part">Selecteer partities om te koppelen:</string>
-		<string name="mount_sys_ro_chk">Systeem partitie als alleen-lezen koppelen</string>
-		<string name="mount_sys_ro_s_chk">Koppel Systeem RO</string>
-		<string name="decrypt_data_btn">Gegevens ontsleutelen</string>
+		<string name="mount_sel_part">Partitie(s) selecteren om te koppelen:</string>
+		<string name="mount_sys_ro_chk">System-partitie in niet-beschrijfbaar-modus koppelen</string>
+		<string name="mount_sys_ro_s_chk">System-partitie niet beschrijfbaar</string>
+		<string name="decrypt_data_btn">Data ontsleutelen</string>
 		<string name="disable_mtp_btn">MTP uitschakelen</string>
-		<string name="enable_mtp_btn">MTP Inschakelen</string>
+		<string name="enable_mtp_btn">MTP inschakelen</string>
 		<string name="mount_usb_storage_btn">USB-opslag koppelen</string>
 		<string name="usb_storage_hdr">USB-opslag</string>
-		<string name="usb_stor_mnt1">USB opslag gekoppeld</string>
-		<string name="usb_stor_mnt2">Zorg ervoor dat u uw apparaat veilig verwijdert</string>
-		<string name="usb_stor_mnt3">van de computer voordat u ontkoppeld!</string>
+		<string name="usb_stor_mnt1">USB-opslag gekoppeld</string>
+		<string name="usb_stor_mnt2">Het apparaat dient eerst veilig te worden</string>
+		<string name="usb_stor_mnt3">verwijderd van de computer alvorens te ontkoppelen!</string>
 		<string name="unmount_btn">Ontkoppelen</string>
 		<string name="rb_system_btn">Systeem</string>
 		<string name="rb_poweroff_btn">Uitzetten</string>
@@ -271,56 +292,57 @@
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
-		<string name="turning_off">Uitschakelen...</string>
+		<string name="turning_off">Wordt uitgeschakeld...</string>
 		<string name="swipe_power_off">Veeg om uit te schakelen</string>
 		<string name="swipe_power_off_s">Uitschakelen</string>
-		<string name="sys_ro_hdr">Ongewijzigde systeempartitie</string>
-		<string name="sys_ro_keep">Systeem als alleen lezen houden?</string>
-		<string name="sys_rop1">TWRP kan je systeempartitie ongewijzigd laten</string>
-		<string name="sys_rop2">om het verkrijgen van officiële updates makkelijker te maken.</string>
-		<string name="sys_rop3">TWRP zal niet in staat zijn om te voorkomen dat de originele ROM</string>
-		<string name="sys_rop4">TRWP vervangt en zal niet aanbieden het device te rooten.</string>
-		<string name="sys_rop5">Het installeren van zips of adb bewerkingen kunnen nog steeds</string>
-		<string name="sys_rop6">de systeem partitie wijzigen.</string>
-		<string name="sys_rol1">TWRP kan je system partitie ongewijzigd laten om het verkrijgen van officiële updates makkelijker te maken.</string>
-		<string name="sys_rol2">TWRP zal niet kunnen voorkomen dat de originele ROM TWRP vervangt en zal niet aanbieden om uw apparaat te rooten.</string>
-		<string name="sys_rol3">Het installeren van zips of adb bewerkingen kunnen nog steeds de systeem partitie wijzigen.</string>
+		<string name="sys_ro_hdr">Ongewijzigde System-partitie</string>
+		<string name="sys_ro_keep">System-partitie onbeschijfbaar laten?</string>
+		<string name="sys_rop1">TWRP kan de System-partitie ongewijzigd laten</string>
+		<string name="sys_rop2">om het ontvangen van officiële updates makkelijker te maken.</string>
+		<string name="sys_rop3">TWRP kan het overschrijven van zichzelf door de oorspronkelijke</string>
+		<string name="sys_rop4">ROM niet voorkomen en zal ook niet aanbieden het apparaat te rooten.</string>
+		<string name="sys_rop5">Het installeren van zipbestanden en het gebruik van adb</string>
+		<string name="sys_rop6">kunnen de System-partitie alsnog doen veranderen.</string>
+		<string name="sys_rol1">TWRP kan de System-partitie ongewijzigd laten om het ontvangen van officiële updates makkelijker te maken.</string>
+		<string name="sys_rol2">TWRP kan het overschrijven van zichzelf door de oorspronkelijke ROM niet voorkomen en zal ook niet aanbieden het apparaat te rooten.</string>
+		<string name="sys_rol3">Het installeren van zipbestanden en het gebruik van adb kunnen de System-partitie alsnog doen veranderen.</string>
 		<string name="sys_ro_never_show_chk">Dit scherm niet meer weergeven tijdens het opstarten</string>
-		<string name="sys_ro_keep_ro_btn">Alleen lezen behouden</string>
-		<string name="swipe_allow_mod">Veeg om modificaties toe te staan</string>
+		<string name="sys_ro_keep_ro_btn">Niet-beschrijfbaar laten</string>
+		<string name="swipe_allow_mod">Veeg om wijzigingen toe te staan</string>
 		<string name="swipe_allow_mod_s">Wijzigingen toestaan</string>
 		<string name="settings_hdr">Instellingen</string>
 		<string name="settings_gen_hdr">Algemeen</string>
 		<string name="settings_gen_s_hdr">Algemeen</string>
 		<string name="settings_gen_btn">Algemeen</string>
-		<string name="use_rmrf_chk">Gebruik rm -rf in plaats van formatteren</string>
-		<string name="use24clock_chk">Gebruik 24-uurs klok</string>
-		<string name="rev_navbar_chk">Omgekeerde navbar lay-out</string>
-		<string name="simact_chk">Simuleren van acties voor het testen van het thema</string>
-		<string name="simfail_chk">Simuleren van mislukkingen van acties</string>
-		<string name="ctr_navbar_rdo">Navbar knoppen centreren</string>
-		<string name="lft_navbar_rdo">Navbar knoppen links uitlijnen</string>
-		<string name="rht_navbar_rdo">Navbar knoppen rechts uitlijnen</string>
+		<string name="use_rmrf_chk">'rm -rf' gebruiken in plaats van formatteren</string>
+		<string name="use24clock_chk">24-uurs klok</string>
+		<string name="rev_navbar_chk">Omgekeerde volgorde navbar-knoppen</string>
+		<string name="simact_chk">Simuleren van acties t.b.v. testen van thema</string>
+		<string name="simfail_chk">Mislukken van acties simuleren</string>
+		<string name="ctr_navbar_rdo">Navbar-knoppen centreren</string>
+		<string name="lft_navbar_rdo">Navbar-knoppen links uitlijnen</string>
+		<string name="rht_navbar_rdo">Navbar-knoppen rechts uitlijnen</string>
 		<string name="restore_defaults_btn">Standaardwaarden herst.</string>
 		<string name="settings_tz_btn">Tijdzone</string>
 		<string name="settings_screen_btn">Scherm</string>
-		<string name="settings_screen_bright_btn">Scherm helderheid</string>
-		<string name="settings_vibration_btn">Vibratie</string>
+		<string name="settings_screen_bright_btn">Schermhelderheid</string>
+		<string name="vibration_disabled">Trillen is uitgeschakeld voor dit apparaat</string>
+		<string name="settings_vibration_btn">Trillen</string>
 		<string name="settings_language_btn">Taal</string>
 		<string name="time_zone_hdr">Tijdzone</string>
-		<string name="sel_tz_list">Selecteer tijdzone:</string>
+		<string name="sel_tz_list">Tijdzone selecteren:</string>
 		<!-- Translator note: if it does not make sense to translate the locations or if it makes more sense,
 				feel free to change the location listed or drop the location entirely and just call it UTC -6 -->
 		<string name="utcm11">(UTC -11) Samoa, Midway-eilanden</string>
 		<string name="utcm10">(UTC -10) Hawaii</string>
 		<string name="utcm9">(UTC -9) Alaska</string>
-		<string name="utcm8">(UTC -8) Pacific Time</string>
-		<string name="utcm7">(UTC -7) Mountain-time</string>
-		<string name="utcm6">(UTC -6) Central-time, Mexico</string>
-		<string name="utcm5">(UTC -5) Eastern-time</string>
-		<string name="utcm4">(UTC -4) Atlantic-time</string>
+		<string name="utcm8">(UTC -8) Pacific-tijd</string>
+		<string name="utcm7">(UTC -7) Mountain-tijd</string>
+		<string name="utcm6">(UTC -6) Central-tijd, Mexico</string>
+		<string name="utcm5">(UTC -5) Eastern-tijd</string>
+		<string name="utcm4">(UTC -4) Atlantische tijd</string>
 		<string name="utcm3">(UTC -3) Brazilië, Buenos Aires</string>
-		<string name="utcm2">(UTC -2) Mid-Atlantische</string>
+		<string name="utcm2">(UTC -2) Mid-Atlantisch</string>
 		<string name="utcm1">(UTC -1) Azoren, Kaapverdië</string>
 		<string name="utc0">(UTC  0) Londen, Dublin, Lissabon</string>
 		<string name="utcp1">(UTC +1) Berlijn, Brussel, Parijs</string>
@@ -333,7 +355,7 @@
 		<string name="utcp8">(UTC +8) Beijing, Singapore, Hong Kong</string>
 		<string name="utcp9">(UTC +9) Tokio, Seoul, Yakutsk</string>
 		<string name="utcp10">(UTC +10) Oost-Australië, Guam</string>
-		<string name="utcp11">(UTC +11) Vladivostok, Salomoneilanden</string>
+		<string name="utcp11">(UTC +11) Vladivostok, Salomonseilanden</string>
 		<string name="utcp12">(UTC +12) Auckland, Wellington, Fiji</string>
 		<string name="sel_tz_offset">Compensatie selecteren (meestal 0): %tw_time_zone_guioffset%</string>
 		<string name="tz_offset_none">Geen</string>
@@ -341,72 +363,72 @@
 		<string name="tz_offset_15">15</string>
 		<string name="tz_offset_30">30</string>
 		<string name="tz_offset_45">45</string>
-		<string name="use_dst_chk">Gebruik zomertijd(DST)</string>
+		<string name="use_dst_chk">Zomertijd (DST) gebruiken</string>
 		<string name="curr_tz">Huidige tijdzone: %tw_time_zone%</string>
 		<string name="curr_tz_s">Huidige tijdzone:</string>
 		<string name="set_tz_btn">Tijdzone instellen</string>
 		<string name="settings_screen_hdr">Scherm</string>
-		<string name="settings_screen_timeout_hdr">Scherm Timeout</string>
-		<string name="enable_timeout_chk">Scherm Timeout inschakelen</string>
-		<string name="screen_to_slider">Scherm timeout in seconden:</string>
-		<string name="screen_to_slider_s">Scherm timeout in seconden (0 = uitgeschakeld): %tw_screen_timeout_secs%</string>
-		<string name="screen_to_na">Scherm timeout instelling niet beschikbaar</string>
+		<string name="settings_screen_timeout_hdr">Schermverlooptijd</string>
+		<string name="enable_timeout_chk">Schermverloop inschakelen</string>
+		<string name="screen_to_slider">Schermverlooptijd in seconden:</string>
+		<string name="screen_to_slider_s">Schermverlooptijd in seconden (0 = uitgeschakeld): %tw_screen_timeout_secs%</string>
+		<string name="screen_to_na">Instelling schermverlooptijd niet beschikbaar</string>
 		<string name="screen_bright_slider">Helderheid: %tw_brightness_pct%%</string>
-		<string name="screen_bright_na">Helderheid instelling niet beschikbaar</string>
-		<string name="vibration_hdr">Vibratie</string>
-		<string name="button_vibration_hdr">Knop vibratie</string>
-		<string name="kb_vibration_hdr">Toetsenbord vibratie</string>
-		<string name="act_vibration_hdr">Actie vibratie</string>
-		<string name="button_vibration">Knop vibratie:</string>
-		<string name="kb_vibration">Toetsenbord vibratie:</string>
-		<string name="act_vibration">Actie vibratie:</string>
+		<string name="screen_bright_na">Instelling helderheid niet beschikbaar</string>
+		<string name="vibration_hdr">Trillen</string>
+		<string name="button_vibration_hdr">Trillen knoppen</string>
+		<string name="kb_vibration_hdr">Trillen toetsenbord</string>
+		<string name="act_vibration_hdr">Trillen acties</string>
+		<string name="button_vibration">Trillen knoppen:</string>
+		<string name="kb_vibration">Trillen toetsenbord:</string>
+		<string name="act_vibration">Trillen acties:</string>
 		<string name="select_language">Taal selecteren:</string>
 		<string name="sel_lang_btn">Taal selecteren</string>
 		<string name="set_language_btn">Taal instellen</string>
 		<string name="advanced_hdr">Geavanceerd</string>
-		<string name="copy_log_confirm">Log naar SD kaart kopiëren?</string>
-		<string name="copying_log">Log naar SD kaart kopiëren...</string>
-		<string name="copy_log_complete">Log kopie voltooid</string>
-		<string name="fix_context_btn">Context repareren</string>
-		<string name="part_sd_btn">SD kaart Partitioneren</string>
-		<string name="part_sd_s_btn">SD kaart</string>
+		<string name="copy_log_confirm">Logbestand naar SD-kaart kopiëren?</string>
+		<string name="copying_log" version="2">Log naar SD-kaart kopiëren...</string>
+		<string name="copy_log_complete" version="2">Kopiëren logbestand voltooid</string>
+		<string name="fix_context_btn">Contexten repareren</string>
+		<string name="part_sd_btn">SD-kaart partitioneren</string>
+		<string name="part_sd_s_btn">SD-kaart</string>
 		<string name="file_manager_btn">Bestandsbeheer</string>
 		<string name="language_hdr">Taal</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Thema herladen</string>
 		<string name="dumlock_btn">HTC Dumlock</string>
-		<string name="inject_twrp_btn">TWRP Injecteren</string>
-		<string name="inject_twrp_confirm">TWRP opnieuw injecteren?</string>
-		<string name="injecting_twrp">TWRP Opnieuw injecteren...</string>
-		<string name="inject_twrp_complete">TWRP injectie voltooid</string>
+		<string name="inject_twrp_btn">TWRP inlassen</string>
+		<string name="inject_twrp_confirm">TWRP opnieuw inlassen?</string>
+		<string name="injecting_twrp">TWRP opnieuw inlassen...</string>
+		<string name="inject_twrp_complete">Inlassen TWRP voltooid</string>
 		<string name="swipe_to_confirm">Veeg om te bevestigen</string>
-		<string name="part_sd_hdr">SD kaart Partitioneren</string>
+		<string name="part_sd_hdr">SD-kaart partitioneren</string>
 		<string name="invalid_partsd_sel">U moet een verwisselbaar apparaat selecteren</string>
-		<string name="part_sd_lose">U verliest alle bestanden op uw SD kaart!</string>
+		<string name="part_sd_lose">U raakt alle bestanden op uw SD-kaart kwijt!</string>
 		<string name="part_sd_undo">Deze actie kan niet ongedaan gemaakt worden!</string>
 		<string name="part_sd_ext_sz">EXT-grootte:</string>
-		<string name="part_sd_swap_sz">Swap grootte:</string>
+		<string name="part_sd_swap_sz">Swapgrootte:</string>
 		<string name="part_sd_m">-</string>
 		<string name="part_sd_p">+</string>
-		<string name="file_system">Bestandsysteem:</string>
+		<string name="file_system">Bestandssysteem:</string>
 		<string name="swipe_part_sd">Veeg om te partitioneren</string>
 		<string name="swipe_part_sd_s">Partitie</string>
-		<string name="partitioning_sd">SD kaart partitioneren...</string>
+		<string name="partitioning_sd">SD-kaart wordt gepartitioneerd...</string>
 		<string name="partitioning_sd2">Dit duurt een paar minuten.</string>
-		<string name="part_sd_complete">Partitionering voltooid</string>
+		<string name="part_sd_complete">Partitioneren voltooid</string>
 		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Originele boot herstellen</string>
-		<string name="dumlock_restore_confirm">De originele boot image herstellen?</string>
-		<string name="dumlock_restoring">Originele boot herstellen...</string>
-		<string name="dumlock_restore_complete">Originele Boot herstellen voltooid</string>
-		<string name="dumlock_reflash_btn">Recovery herflashen</string>
-		<string name="dumlock_reflash_confirm">Recovery naar boot herflashen?</string>
-		<string name="dumlock_reflashing">Recovery naar boot flashen...</string>
-		<string name="dumlock_reflash_complete">Recovery naar boot flashen voltooid</string>
+		<string name="dumlock_restore_btn">Oorspronkelijke bootimage herstellen</string>
+		<string name="dumlock_restore_confirm">Oorspronkelijke bootimage herstellen?</string>
+		<string name="dumlock_restoring">Oorspronkelijke bootimage wordt hersteld...</string>
+		<string name="dumlock_restore_complete">Oorspronkelijke bootimage hersteld</string>
+		<string name="dumlock_reflash_btn">Recovery opnieuw flashen</string>
+		<string name="dumlock_reflash_confirm">Recovery opnieuw naar boot flashen?</string>
+		<string name="dumlock_reflashing">Recovery wordt naar boot geflasht...</string>
+		<string name="dumlock_reflash_complete">Flashen recovery naar boot voltooid</string>
 		<string name="dumlock_install_btn">HTC Dumlock installeren</string>
-		<string name="dumlock_install_confirm">HTC Dumlock bestanden in de ROM installeren?</string>
-		<string name="dumlock_installing">HTC Dumlock installeren...</string>
-		<string name="dumlock_install_complete">HTC Dumlock installatie voltooid</string>
+		<string name="dumlock_install_confirm">HTC Dumlock-bestanden in ROM installeren?</string>
+		<string name="dumlock_installing">HTC Dumlock wordt geïnstalleerd...</string>
+		<string name="dumlock_install_complete">Installatie HTC Dumlock voltooid</string>
 		<string name="swipe_to_unlock">Veeg om te ontgrendelen</string>
 		<string name="swipe_unlock">   Ontgrendelen</string>
 		<string name="fm_hdr">Bestandsbeheer</string>
@@ -415,253 +437,289 @@
 		<string name="fm_type_file">Bestand</string>
 		<string name="fm_choose_act">Actie selecteren</string>
 		<string name="fm_selected">%tw_fm_type% geselecteerd:</string>
-		<string name="fm_copy_btn">Kopiëer</string>
+		<string name="fm_copy_btn">Kopiëren</string>
 		<string name="fm_copy_file_btn">Bestand kopiëren</string>
 		<string name="fm_copy_folder_btn">Map kopiëren</string>
-		<string name="fm_copying">Kopiëren</string>
+		<string name="fm_copying">Wordt gekopieerd</string>
 		<string name="fm_move_btn">Verplaatsen</string>
-		<string name="fm_moving">Verplaatsen</string>
+		<string name="fm_moving">Wordt verplaatst</string>
 		<string name="fm_chmod755_btn">chmod 755</string>
 		<string name="fm_chmod755ing">chmod 755</string>
 		<string name="fm_chmod_btn">chmod</string>
-		<string name="fm_delete_btn">Verwijder</string>
-		<string name="fm_deleting">Verwijderen</string>
+		<string name="fm_delete_btn">Verwijderen</string>
+		<string name="fm_deleting">Wordt verwijderd</string>
 		<string name="fm_rename_btn">Hernoemen</string>
 		<string name="fm_rename_file_btn">Bestand hernoemen</string>
 		<string name="fm_rename_folder_btn">Map hernoemen</string>
-		<string name="fm_renaming">Hernoemen</string>
-		<string name="fm_sel_dest">Selecteer doelmap</string>
-		<string name="fm_sel_curr_folder">Selecteer huidige map</string>
+		<string name="fm_renaming">Wordt hernoemd</string>
+		<string name="fm_sel_dest">Doelmap selecteren</string>
+		<string name="fm_sel_curr_folder">Huidige map selecteren</string>
 		<string name="fm_rename_hdr">Hernoemen</string>
 		<string name="fm_set_perms_hdr">Machtigingen instellen</string>
 		<string name="fm_perms">Machtigingen:</string>
-		<string name="fm_complete">Bestandsbewerking gereed</string>
-		<string name="decrypt_data_hdr">Gegevens decoderen</string>
+		<string name="fm_complete">Bestandsbewerking voltooid</string>
+		<string name="decrypt_data_hdr">Data-partitie ontsleutelen</string>
 		<string name="decrypt_data_enter_pass">Wachtwoord invoeren.</string>
-		<string name="decrypt_data_failed">Wachtwoord mislukt, probeer het opnieuw!</string>
-		<string name="decrypt_data_failed_pattern">Patroon mislukt, probeer het opnieuw!</string>
+		<string name="decrypt_data_failed">Wachtwoord mislukt. Probeer opnieuw!</string>
+		<string name="decrypt_data_failed_pattern">Patroon mislukt. Probeer opnieuw!</string>
 		<string name="decrypt_data_enter_pattern">Patroon invoeren.</string>
-		<string name="decrypt_data_trying">Ontsleuteling proberen</string>
-		<string name="term_hdr">Terminal commandos</string>
+		<string name="decrypt_data_trying">Poging tot ontsleutelen</string>
+		<string name="decrypt_data_vold_os_missing">Vereiste bestanden ontbreken voor ontsleutelen vold: {1}</string>
+		<string name="term_hdr">Terminal-commando's</string>
 		<string name="term_s_hdr">Terminal</string>
 		<string name="term_kill_btn">KILL</string>
-		<string name="term_sel_folder_hdr">Naar begin folder gaan</string>
-		<string name="adb_sideload_hdr">ADB Sideload</string>
-		<string name="sideload_wipe_dalvik_chk">Dalvik Cache legen</string>
+		<string name="term_sel_folder_hdr">Naar beginmap gaan</string>
+		<string name="adb_sideload_hdr">ADB-sideload</string>
+		<string name="sideload_wipe_dalvik_chk">Dalvik-cache legen</string>
 		<string name="sideload_wipe_cache_chk">Cache legen</string>
-		<string name="swipe_to_sideload">Veeg om sideloaden te beginnen</string>
+		<string name="swipe_to_sideload">Veeg om sideload te starten</string>
 		<string name="swipe_sideload">   Start</string>
-		<string name="sideload_confirm">ADB Sideload</string>
+		<string name="sideload_confirm">ADB-sideload</string>
 		<string name="sideload_usage">Gebruik: adb sideload bestandsnaam.zip</string>
-		<string name="sideload_complete">ADB Sideload voltooid</string>
-		<string name="fix_contexts_hdr">Context repareren</string>
-		<string name="fix_contexts_note1">Note: Het repareren van de context is zelden nodig.</string>
-		<string name="fix_contexts_note2">Het repareren van SELinux Contexts kan  ervoor</string>
-		<string name="fix_contexts_note3">zorgen dat uw apparaat niet meer correct opstart.</string>
-		<string name="swipe_to_fix_contexts">Veeg om Contexts te repareren</string>
-		<string name="swipe_fix_contexts">   Contexts repareren</string>
-		<string name="fixing_contexts">Repareren van Contexts...</string>
-		<string name="fix_contexts_complete">Het repareren van Contexts is gereed</string>
-		<string name="reboot_hdr">Herstart</string>
-		<string name="install_cancel">Installeer niet</string>
-		<string name="sel_storage_list">Selecteer opslag</string>
+		<string name="sideload_complete">ADB-sideload voltooid</string>
+		<string name="fix_contexts_hdr">Contexten repareren</string>
+		<string name="fix_contexts_note1">N.B.: Het repareren van de contexten is zelden nodig.</string>
+		<string name="fix_contexts_note2">Het repareren van SELinux-contexten kan tot gevolg</string>
+		<string name="fix_contexts_note3">hebben dat het apparaat niet meer naar behoren opstart.</string>
+		<string name="swipe_to_fix_contexts">Veeg om contexten te repareren</string>
+		<string name="swipe_fix_contexts">   Contexten repareren</string>
+		<string name="fixing_contexts">Contexten worden gerepareerd...</string>
+		<string name="fix_contexts_complete">Reparatie contexten voltooid</string>
+		<string name="reboot_hdr">Herstarten</string>
+		<string name="install_cancel">Niet installeren</string>
+		<string name="sel_storage_list">Opslag selecteren</string>
 		<string name="ok_btn">OK</string>
+		<string name="install_twrp_ramdisk">Recovery-ramdisk installeren</string>
+		<string name="install_kernel">Kernel installeren</string>
+		<string name="repack_kernel_confirm_hdr">Kernel installeren</string>
+		<string name="repack_ramdisk_confirm_hdr">Recovery installeren</string>
+		<string name="repack_kernel_confirm">Kernel installeren?</string>
+		<string name="repack_ramdisk_confirm">Recovery installeren?</string>
+		<string name="repack_backup_first">Bestaande image eerst back-uppen</string>
+		<string name="repack">Opnieuw inpakken</string>
+		<string name="swipe_to_install">Veeg om te installeren</string>
+		<string name="installing">Wordt geïnstalleerd...</string>
+		<string name="install_complete">Installatie voltooid</string>
+		<string name="unpack_error">Fout tijdens uitpakken image.</string>
+		<string name="repack_error">Fout tijdens opnieuw inpakken image.</string>
+		<string name="unpacking_image">{1} wordt uitgepakt...</string>
+		<string name="repacking_image">{1} wordt opnieuw ingepakt...</string>
+		<string name="repack_image_hdr">Image selecteren</string>
+		<string name="fix_recovery_loop">Herstellen van oneindige lus tijdens opstarten recovery</string>
+		<string name="fix_recovery_loop_confirm">Herstellen van oneindige recoverylus?</string>
+		<string name="fixing_recovery_loop">Oneindige recoverylus wordt hersteld...</string>
+		<string name="fix_recovery_loop_complete">Herstellen van recoverylus voltooid</string>
+		<string name="fixing_recovery_loop_patch">Kernel wordt gepatcht...</string>
+		<string name="fix_recovery_loop_patch_error">Fout tijdens patchen kernel.</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
-		<string name="no_kernel_selinux">Kernel heeft geen ondersteuning voor het lezen van SELinux contexten.</string>
-		<string name="full_selinux">Volledige SELinux ondersteuning is aanwezig.</string>
-		<string name="no_selinux">Geen SELinux ondersteuning (geen libselinux).</string>
+		<string name="no_kernel_selinux">Kernel ondersteunt het lezen van SELinux-contexten niet.</string>
+		<string name="full_selinux">Volledige SELinux-ondersteuning is aanwezig.</string>
+		<string name="no_selinux">Geen SELinux-ondersteuning aanwezig (geen libselinux).</string>
 		<string name="mtp_enabled">MTP ingeschakeld</string>
-		<string name="mtp_crash">MTP crashte, MTP niet starten tijdens boot.</string>
-		<string name="decrypt_success">Succesvol gedecodeerd met standaardwachtwoord.</string>
-		<string name="unable_to_decrypt">Kan niet decoderen met het standaardwachtwoord. U zal wellicht een Data format moeten uitvoeren.</string>
-		<string name="generating_digest1" version="2">Digest genereren</string>
+		<string name="mtp_crash">MTP gefaald en voortaan uitgeschakeld tijdens boot.</string>
+		<string name="decrypt_success">Ontsleuteling met standaardwachtwoord geslaagd.</string>
+		<string name="unable_to_decrypt">Ontsleuteling met standaardwachtwoord mislukt. Mogelijk moet de Data-partitie worden geformatteerd.</string>
+		<string name="generating_digest1" version="2">Digest wordt gegenereerd</string>
 		<!-- Message displayed during a backup if we are generating an Digest, ideally, leave the leading " * " to help align and separate this text from other console text -->
-		<string name="generating_digest2" version="2"> * Digest genereren...</string>
-		<string name="digest_created" version="2"> * Digest gemaakt.</string>
-		<string name="digest_error" version="2"> * Digest fout!</string>
-		<string name="digest_compute_error" version="2"> * Fout tijdens het genereren van de Digest.</string>
+		<string name="generating_digest2" version="2"> * Digest wordt gegenereerd...</string>
+		<string name="digest_created" version="2"> * Digest gecreëerd.</string>
+		<string name="digest_error" version="2"> * Digestfout!</string>
+		<string name="digest_compute_error" version="2"> * Fout tijdens het genereren van de digest.</string>
 		<string name="current_date">(Huidige datum)</string>
 		<string name="auto_generate">(Automatisch genereren)</string>
-		<string name="unable_to_locate_partition">Kan partitie \'{1}\' niet vinden voor back-up berekeningen.</string>
-		<string name="no_partition_selected">Geen partities geselecteerd voor back-up.</string>
-		<string name="total_partitions_backup"> * Totaal aantal partities voor de back-up: {1}</string>
-		<string name="total_backup_size"> * Totale omvang van alle gegevens: {1}MB</string>
-		<string name="available_space"> * Beschikbare ruimte: {1}MB</string>
+		<string name="unable_to_locate_partition">Kan partitie '{1}' niet vinden voor back-upberekeningen.</string>
+		<string name="no_partition_selected">Geen partities geselecteerd om te back-uppen.</string>
+		<string name="total_partitions_backup"> * Totaal aantal partities om te back-uppen: {1}</string>
+		<string name="total_backup_size"> * Totale grootte van alle gegevens: {1} MB</string>
+		<string name="available_space"> * Beschikbare ruimte: {1} MB</string>
 		<string name="unable_locate_storage">Kan opslagapparaat niet vinden.</string>
-		<string name="no_space">Er is onvoldoende vrije ruimte op de opslag.</string>
+		<string name="no_space">Er bestaat onvoldoende vrije ruimte op het opslagmedium.</string>
 		<string name="backup_started">[BACK-UP GESTART]</string>
-		<string name="backup_folder"> * Back-up map: {1}</string>
-		<string name="fail_backup_folder">Het maken van de back-up folder is mislukt.</string>
-		<string name="avg_backup_fs">Gemiddelde back-up snelheid voor bestandssystemen: {1} MB/sec</string>
-		<string name="avg_backup_img">Gemiddelde back-up snelheid voor images: {1} MB/sec</string>
-		<string name="total_backed_size">[{1} MB TOTALE BACK-UP]</string>
+		<string name="backup_folder"> * Back-upmap: {1}</string>
+		<string name="fail_backup_folder">Het maken van de back-upmap is mislukt.</string>
+		<string name="avg_backup_fs">Gem. back-upsnelheid voor bestandssystemen: {1} MB/sec</string>
+		<string name="avg_backup_img">Gem. back-upsnelheid voor images: {1} MB/sec</string>
+		<string name="total_backed_size">[{1} MB IN TOTAAL GEBACK-UPT]</string>
 		<string name="backup_completed">[BACK-UP VOLTOOID IN {1} SECONDEN]</string>
-		<string name="restore_started">[HERSTEL BEGONNEN]</string>
-		<string name="restore_folder">Herstel map: \'{1}\'</string>
+		<string name="restore_started">[HERSTELLEN GESTART]</string>
+		<string name="restore_folder">Herstelmap: {1}</string>
 		<!-- {1} is the partition display name and {2} is the number of seconds -->
-		<string name="restore_part_done">[{1} gereed ({2} seconden)]</string>
-		<string name="verifying_digest" version="2">Digest Controleren</string>
-		<string name="skip_digest" version="2">Digest controle op basis van gebruikersinstelling overslaan.</string>
-		<string name="calc_restore">Herstel details berekenen...</string>
-		<string name="restore_read_only">Kan {1} niet herstellen -- Als alleen lezen gekoppeld.</string>
-		<string name="restore_unable_locate">Kan \'{1}\' niet vinden voor herstellen.</string>
-		<string name="no_part_restore">Geen partities geselecteerd om te worden hersteld.</string>
-		<string name="restore_part_count">{1}-partities herstellen...</string>
-		<string name="total_restore_size">Totale herstel grootte is {1}MB</string>
-		<string name="updating_system_details">Systeemgegevens bijwerken</string>
+		<string name="restore_part_done">[{1} VOLTOOID IN {2} seconden]</string>
+		<string name="verifying_digest" version="2">Digest controleren</string>
+		<string name="skip_digest" version="2">Digestcontrole al dan niet overslaan op basis van gebruikersinstelling.</string>
+		<string name="calc_restore">Details herstelbewerking worden berekend...</string>
+		<string name="restore_read_only">Kan {1} niet herstellen -- In onbeschrijfbaar-modus gekoppeld.</string>
+		<string name="restore_unable_locate">Kan {1}-partitie niet vinden om te herstellen.</string>
+		<string name="no_part_restore">Geen partities geselecteerd om te herstellen.</string>
+		<string name="restore_part_count">Bezig {1} partitie(s) te herstellen...</string>
+		<string name="total_restore_size">[{1} MB IN TOTAAL HERSTELD]</string>
+		<string name="updating_system_details">System-gegevens worden bijgewerkt</string>
 		<string name="restore_completed">[HERSTELLEN VOLTOOID IN {1} SECONDEN]</string>
 		<!-- {1} is the path we could not open, {2} is strerror output -->
-		<string name="error_opening_strerr">Fout bij het openen: \'{1}\' ({2})</string>
-		<string name="unable_locate_part_backup_name">Kan geen partitie vinden met de naam van de back-up: \'{1}\'</string>
-		<string name="unable_find_part_path">Kan geen partitie vinden voor pad \'{1}\'</string>
-		<string name="update_part_details">Partitie gegevens bijwerken...</string>
-		<string name="update_part_details_done">...gedaan</string>
-		<string name="wiping_dalvik">Dalvik Cache folders legen...</string>
+		<string name="error_opening_strerr">Fout bij het openen: {1} ({2})</string>
+		<string name="unable_locate_part_backup_name">Partitie kan niet worden gevonden aan de hand van de back-upnaam: {1}</string>
+		<string name="unable_find_part_path">Kan geen partitie vinden voor pad '{1}'</string>
+		<string name="update_part_details">Partitiegegevens worden bijgewerkt...</string>
+		<string name="update_part_details_done">...gereed</string>
+		<string name="wiping_dalvik">Dalvik-cachemappen worden geleegd...</string>
 		<string name="cleaned">Schoongemaakt: {1}...</string>
-		<string name="dalvik_done">--Dalvik Cache mappen legen voltooid!</string>
-		<string name="no_andsec">Geen beveiligde android partities gevonden.</string>
+		<string name="cache_dalvik_done">-- Wissen Dalvik-cachemappen voltooid!</string>
+		<string name="dalvik_done">-- Legen Dalvik-mappen voltooid!</string>
+		<string name="no_andsec">Geen 'Android Secure'-partities gevonden.</string>
 		<string name="unable_to_locate">Kan {1} niet vinden.</string>
-		<string name="wiping_datamedia">Interne opslag legen --/data/media...</string>
+		<string name="wiping_datamedia">Interne opslag wordt gewist -- /data/media...</string>
 		<string name="unable_to_mount">Kan {1} niet koppelen</string>
-		<string name="unable_to_mount_internal">Kan internal_storage niet koppelen</string>
+		<string name="unable_to_mount_internal">Kan interne opslag niet koppelen</string>
 		<string name="unable_to_mount_storage">Kan opslag niet koppelen</string>
-		<string name="fail_decrypt">Gegevens decoderen mislukt.</string>
-		<string name="no_crypto_support">Er is geen crypto ondersteuning gecompileerd in deze build.</string>
-		<string name="decrypt_success_dev">Data succesvol gedecodeerd, nieuw block device: \'{1}\'</string>
+		<string name="fail_decrypt">Ontsleutelen gegevens mislukt.</string>
+		<string name="no_crypto_support">Geen ondersteuning voor crypto aanwezig.</string>
+		<string name="decrypt_success_dev">Data ontsleuteld. Nieuw block device: {1}</string>
+		<string name="decrypt_success_nodev">Data ontsleuteld</string>
 		<string name="done">Gereed.</string>
-		<string name="start_partition_sd">SD kaart partitioneren...</string>
-		<string name="partition_sd_locate">Kan apparaat om te partitioneren niet vinden.</string>
-		<string name="ext_swap_size">EXT + Swap grootte zijn groter dan de sd kaart.</string>
-		<string name="remove_part_table">Partitie-tabel word verwijderd...</string>
-		<string name="unable_rm_part">Kan partitie-tabel niet verwijderen.</string>
+		<string name="start_partition_sd">SD-kaart wordt gepartitioneerd...</string>
+		<string name="partition_sd_locate">Kan te partitioneren device niet vinden.</string>
+		<string name="ext_swap_size">Grootte EXT + Swap groter dan SD-kaart.</string>
+		<string name="remove_part_table">Partitietabel wordt verwijderd...</string>
+		<string name="unable_rm_part">Kan partitietabel niet verwijderen.</string>
 		<string name="create_part">Partitie {1} aanmaken...</string>
-		<string name="unable_to_create_part">Niet in staat om partitie {1} te maken.</string>
-		<string name="format_sdext_as">Sd-ext formatteren als {1}...</string>
-		<string name="part_complete">Partitionering voltooid.</string>
-		<string name="unable_to_open">Kan \'{1}\' niet openen.</string>
-		<string name="mtp_already_enabled">MTP al ingeschakeld</string>
+		<string name="unable_to_create_part">Kan partitie {1} niet aanmaken.</string>
+		<string name="format_sdext_as">Externe SD-kaart wordt geformatteerd als {1}...</string>
+		<string name="part_complete">Partitioneren voltooid.</string>
+		<string name="unable_to_open">Kan '{1}' niet openen.</string>
+		<string name="mtp_already_enabled">MTP reeds ingeschakeld</string>
 		<string name="mtp_fail">Kan MTP niet inschakelen</string>
-		<string name="no_mtp">MTP ondersteuning niet inbegrepen</string>
-		<string name="image_flash_start">[IMAGE FLASH BEGONNEN]</string>
-		<string name="img_to_flash">Image om te flashen: \'{1}\'</string>
-		<string name="flash_unable_locate">Kan partitie \'{1}\' niet vinden om te flashen.</string>
+		<string name="no_mtp">MTP-ondersteuning niet aanwezig</string>
+		<string name="image_flash_start">[IMAGEFLASH GESTART]</string>
+		<string name="img_to_flash">Image om te flashen: {1}</string>
+		<string name="flash_unable_locate">Kan partitie '{1}' niet vinden om te flashen.</string>
 		<string name="no_part_flash">Geen partities geselecteerd voor het flashen.</string>
-		<string name="too_many_flash">Teveel partities geselecteerd voor het flashen.</string>
-		<string name="invalid_flash">Ongeldige partitie om te flashen opgegeven.</string>
-		<string name="flash_done">[IMAGE FLASH VOLTOOID]</string>
-		<string name="wiping">Wissen {1}</string>
-		<string name="repair_not_exist">{1} bestaat niet! Kan niet herstellen!</string>
-		<string name="repairing_using">{1} Herstellen met behulp van {2}...</string>
-		<string name="unable_repair">Niet in staat om {1} te herstellen.</string>
-		<string name="mount_data_footer">Kan /data niet koppelen en kan de crypto voettekst niet vinden.</string>
+		<string name="too_many_flash">Te veel partities geselecteerd voor het flashen.</string>
+		<string name="invalid_flash">Ongeldige flashpartitie opgegeven.</string>
+		<string name="flash_done">[IMAGEFLASH VOLTOOID]</string>
+		<string name="wiping">{1} wordt gewist</string>
+		<string name="repair_not_exist">{1} bestaat niet! Reparatie onmogelijk!</string>
+		<string name="repairing_using">{1} wordt gerepareerd met behulp van {2}...</string>
+		<string name="unable_repair">Kan {1} niet repareren.</string>
+		<string name="mount_data_footer">Kan /data niet koppelen en cryptovoettekst ook niet vinden.</string>
 		<!-- {1} is the folder name that we could not create, {2} is strerror output -->
-		<string name="create_folder_strerr">Kan map \'{1}\' niet maken ({2}).</string>
+		<string name="create_folder_strerr">Kan map '{1}' niet maken ({2}).</string>
 		<!-- {1} is the folder name that we could not mount, {2} is strerror output -->
-		<string name="fail_mount">Kan \'{1}\' niet koppelen ({2})</string>
+		<string name="fail_mount">Fout bij het koppelen van '{1}' ({2})</string>
 		<!-- {1} is the folder name that we could not unmount, {2} is strerror output -->
-		<string name="fail_unmount">Kan \'{1}\' niet ontkoppelen ({2})</string>
-		<string name="cannot_resize">Kan het formaat van {1} niet wijzigen.</string>
-		<string name="repair_resize">Herstellen van {1} vóór het vergroten/verkleinen.</string>
-		<string name="unable_resize">Kan de grootte van {1} niet wijzigen.</string>
-		<string name="no_digest_found" version="2">Geen Digest bestand gevonden voor \'{1}\'. Gelieve Digest controle inschakelen uitzetten om te herstellen.</string>
-		<string name="digest_fail_match" version="2">Digest vergelijken mislukt op \'{1}\'.</string>
-		<string name="digest_matched" version="2">Digest matched for '{1}'.</string>
-		<string name="fail_decrypt_tar">Het decoderen van tar bestand \'{1}\' is mislukt</string>
-		<string name="format_data_msg">U zou in recovery moeten herstarten om /data opnieuw te kunnen gebruiken.</string>
-		<string name="format_data_err">Kan niet formatteren om encryptie te verwijderen.</string>
-		<string name="formatting_using">{1} formatteren met behulp van {2}...</string>
-		<string name="unable_to_wipe">Kan niet wissen {1}.</string>
-		<string name="cannot_wipe">Partitie {1} kan niet gewist worden.</string>
-		<string name="remove_all">Alle bestanden onder \'{1}\' verwijderen</string>
-		<string name="wiping_data">Data wissen zonder het wissen van /data/media...</string>
-		<string name="backing_up">Back-up van {1}...</string>
-		<string name="backing">Bezig met back-up</string>
-		<string name="backup_size">Back-up grootte van \'{1}\' is 0 bytes.</string>
-		<string name="datamedia_fs_restore">Waarschuwing: Deze /data back-up is gemaakt met het {1} bestandssysteem! De back-up kan niet opstarten, tenzij u terug naar {1} gaat.</string>
-		<string name="restoring">Herstellen van {1}...</string>
-		<string name="restoring_hdr">Herstellen</string>
-		<string name="recreate_folder_err">Kan map {1} niet recreëren.</string>
-		<string name="img_size_err">Grootte van de image is groter dan het doelapparaat</string>
-		<string name="flashing">Flashen {1}...</string>
-		<string name="backup_folder_set">Back-up map ingesteld op \'{1}\'</string>
-		<string name="locate_backup_err">Kan de back-up niet vinden \'{1}\'</string>
-		<string name="set_restore_opt">Opties voor terugzetten instellen: \'{1}\':</string>
-		<string name="digest_check_skip" version="2">Digest controle overslaan staat aan</string>
+		<string name="fail_unmount">Fout bij het ontkoppelen van '{1}' ({2})</string>
+		<string name="cannot_resize">Kan de grootte van {1} niet wijzigen.</string>
+		<string name="repair_resize">{1} wordt gerepareerd alvorens te vergroten/verkleinen.</string>
+		<string name="unable_resize">Wijzigen grootte {1} niet mogelijk.</string>
+		<string name="no_digest_found" version="2">Geen digestbestand gevonden voor '{1}'. Gelieve digestcontrole uit te schakelen.</string>
+		<string name="digest_fail_match" version="2">Digest voor '{1}' klopt niet.</string>
+		<string name="digest_matched" version="2">Digest voor '{1}' klopt.</string>
+		<string name="fail_decrypt_tar">Ontsleutelen van tarbestand '{1}' mislukt</string>
+		<string name="format_data_msg">U moet mogelijk in recovery herstarten voordat u /data weer kunt gebruiken.</string>
+		<string name="format_data_err">Kan niet formatteren t.b.v. verwijderen versleuteling.</string>
+		<string name="formatting_using">{1} wordt geformatteerd met behulp van {2}...</string>
+		<string name="unable_to_wipe">Kan {1} niet wissen.</string>
+		<string name="cannot_wipe">Partitie {1} kan niet worden gewist.</string>
+		<string name="remove_all">Alle bestanden onder '{1}' worden verwijderd</string>
+		<string name="wiping_data">Data-partitie wordt gewist m.u.v. /data/media...</string>
+		<string name="backing_up">{1} wordt geback-upt...</string>
+		<string name="backup_storage_warning">Van back-ups van {1} zijn uitgezonderd de bestanden in interne opslag, zoals plaatjes en downloads.</string>
+		<string name="backing">Wordt geback-upt</string>
+		<string name="backup_size">Back-upgrootte van '{1}' bedraagt 0 bytes.</string>
+		<string name="datamedia_fs_restore">WAARSCHUWING: Deze back-up van /data is gemaakt met het {1}-bestandssysteem! Mogelijk start de back-up pas weer op wanneer er naar {1} wordt teruggeschakeld.</string>
+		<string name="restoring">{1} wordt hersteld...</string>
+		<string name="restoring_hdr">Wordt hersteld</string>
+		<string name="recreate_folder_err">Kan map {1} niet opnieuw maken.</string>
+		<string name="img_size_err">Imagegrootte is groter dan doelapparaat</string>
+		<string name="flashing">{1} wordt geflasht...</string>
+		<string name="backup_folder_set">Back-upmap ingesteld op '{1}'</string>
+		<string name="locate_backup_err">Kan back-up '{1}' niet vinden</string>
+		<string name="set_restore_opt">Instellen van herstelopties: {1}:</string>
+		<string name="digest_check_skip" version="2">Digestcontrole overslaan staat aan</string>
 		<string name="ors_encrypt_restore_err">Kan OpenRecoveryScript niet gebruiken om een versleutelde back-up te herstellen.</string>
-		<string name="mounting">Koppelen</string>
-		<string name="unmounting">Ontkoppelen</string>
-		<string name="mounted">Gekoppeld \'{1}\'</string>
-		<string name="unmounted">Ontkoppeld \'{1}\'</string>
-		<string name="setting">Instellen van \'{1}\' naar \'{2}\'</string>
-		<string name="setting_empty">Instellen van \'{1}\' naar leeg</string>
+		<string name="mounting">Wordt gekoppeld</string>
+		<string name="unmounting">Wordt ontkoppeld</string>
+		<string name="mounted">'{1}' gekoppeld</string>
+		<string name="unmounted">'{1}' ontkoppeld</string>
+		<string name="setting">Instellen van '{1}' op '{2}'</string>
+		<string name="setting_empty">Instellen van '{1}' naar leeg</string>
 		<string name="making_dir1">Map maken</string>
-		<string name="making_dir2">Map: \'{1}\' maken</string>
+		<string name="making_dir2">Map: '{1}' maken</string>
 		<string name="running_command">Commando uitvoeren</string>
-		<string name="sideload">ADB Sideload</string>
-		<string name="start_sideload">ADB sideload functie wordt gestart...</string>
-		<string name="need_new_adb">U moet adb 1.0.32 of nieuwer hebben om te sideloaden naar dit apparaat.</string>
+		<string name="sideload">ADB-sideload</string>
+		<string name="start_sideload">ADB-sideloadfunctie wordt gestart...</string>
+		<string name="need_new_adb">adb 1.0.32 of nieuwer is vereist om te sideloaden naar dit apparaat.</string>
 		<string name="no_pwd">Geen wachtwoord opgegeven.</string>
-		<string name="done_ors">Scriptbestand verwerking voltooid</string>
-		<string name="injecttwrp">Injecteren van TWRP in de boot image...</string>
-		<string name="zip_err">Fout bij het installeren van zip-bestand \'{1}\'</string>
-		<string name="installing_zip">Installeren van zip-bestand \'{1}\'</string>
-		<string name="select_backup_opt">Back-up opties instellen:</string>
+		<string name="done_ors">Uitvoeren scriptbestand voltooid</string>
+		<string name="injecttwrp">TWRP wordt in het bootimage ingelast...</string>
+		<string name="zip_err">Fout bij het installeren van zipbestand '{1}'</string>
+		<string name="installing_zip">Zip-bestand '{1}' wordt geïnstalleerd</string>
+		<string name="select_backup_opt">Instellen van back-upopties:</string>
 		<string name="compression_on">Compressie staat aan</string>
-		<string name="digest_off" version="2">Digest Generatie is uitgeschakeld</string>
+		<string name="digest_off" version="2">Het genereren van een digest staat uit</string>
 		<string name="backup_fail">Back-up mislukt</string>
-		<string name="backup_clean">Back-up mislukt. Back-up map schoonmaken.</string>
-		<string name="running_recovery_commands">Herstel commando\'s uitvoeren</string>
-		<string name="recovery_commands_complete">Herstel commando\'s voltooien</string>
-		<string name="running_ors">OpenRecoveryScript is bezig</string>
-		<string name="ors_complete">OpenRecoveryScript is voltooid</string>
-		<string name="no_updater_binary">Kan \'{1}\' niet vinden in het zip-bestand.</string>
-		<string name="check_for_digest" version="2">Controle voor een Digest bestand...</string>
-		<string name="fail_sysmap">Toewijzen van bestand \'{1}\' is mislukt</string>
-		<string name="verify_zip_sig">Zip handtekening controleren...</string>
-		<string name="verify_zip_fail">Zip handtekeningverificatie is mislukt!</string>
-		<string name="verify_zip_done">De handtekening van de zip met succes geverifieerd.</string>
-		<string name="zip_corrupt">Zip-bestand is beschadigd!</string>
-		<string name="no_digest" version="2">Digest controle overslaan: geen Digest bestand gevonden</string>
-		<string name="digest_fail" version="2">Digest komt niet overeen</string>
-		<string name="digest_match" version="2">Digest komt overeen</string>
-		<string name="pid_signal">{1} proces eindigde met signaal: {2}</string>
-		<string name="pid_error">{1} proces beëindigd met fout: {2}</string>
-		<string name="install_dumlock">HTC Dumlock installeren op het systeem...</string>
-		<string name="dumlock_restore">Originele boot herstellen...</string>
-		<string name="dumlock_reflash">Recovery herflashen op boot...</string>
-		<string name="run_script">Script {1} word uitgevoerd...</string>
-		<string name="rename_stock">Originele recovery bestand hernoemt in /system om te voorkomen dat de ROM TWRP vervangt.</string>
-		<string name="split_backup">Back-up bestand in meerdere archieven opbreken...</string>
-		<string name="backup_error">Fout bij het maken van backup.</string>
-		<string name="restore_error">Fout tijdens herstelproces.</string>
-		<string name="split_thread">Thread-ID {1} splitsen in archief {2}</string>
+		<string name="backup_clean">Back-up mislukt. Back-upmap wordt geleegd.</string>
+		<string name="running_recovery_commands">Recoverycommando's worden uitgevoerd</string>
+		<string name="recovery_commands_complete">Recoverycommando's voltooid</string>
+		<string name="running_ors">OpenRecoveryScript wordt uitgevoerd</string>
+		<string name="ors_complete">OpenRecoveryScript voltooid</string>
+		<string name="no_updater_binary">Kan '{1}' niet vinden in zipbestand.</string>
+		<string name="check_for_digest" version="2">Digestbestand wordt gecontroleerd...</string>
+		<string name="invalid_zip_format">Beschadigd zipbestand!</string>
+		<string name="fail_sysmap">Toewijzen van bestand '{1}' mislukt</string>
+		<string name="verify_zip_sig">Handtekening zipbestand wordt gecontroleerd...</string>
+		<string name="verify_zip_fail">Verificatie handtekening zipbestand mislukt!</string>
+		<string name="verify_zip_done">Handtekening zipbestand geverifieerd.</string>
+		<string name="zip_corrupt">Zipbestand beschadigd!</string>
+		<string name="no_digest" version="2">Controle digest wordt overgeslagen: Geen digestbestand gevonden</string>
+		<string name="digest_fail" version="2">Digest klopt niet</string>
+		<string name="digest_match" version="2">Digest klopt</string>
+		<string name="pid_signal">{1} proces geëindigd met signaal: {2}</string>
+		<string name="pid_error">{1} proces geëindigd met fout: {2}</string>
+		<string name="install_dumlock">HTC Dumlock wordt geïninstalleerd...</string>
+		<string name="dumlock_restore">Oorspronkelijke boot wordt hersteld...</string>
+		<string name="dumlock_reflash">Recovery wordt opnieuw naar boot geflasht...</string>
+		<string name="run_script">Script {1} wordt uitgevoerd...</string>
+		<string name="rename_stock">Oorspronkelijke recoverybestand hernoemd in /system om te voorkomen dat de ROM TWRP vervangt.</string>
+		<string name="split_backup">Back-upbestand wordt in meerdere archiefbestanden opgesplitst...</string>
+		<string name="backup_error">Fout bij het maken van de back-up.</string>
+		<string name="restore_error">Fout tijdens het herstellen.</string>
+		<string name="split_thread">Thread-ID {1} wordt gesplitst in archief {2}</string>
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">%llu van %llu bestanden, %i%%</string>
-		<string name="size_progress">%lluMB van %lluMB, %i%%</string>
-		<string name="decrypt_cmd">Probeert de data-partitie te decoderen via de command line.</string>
+		<string name="size_progress">%llu MB van %llu MB, %i%%</string>
+		<string name="decrypt_cmd">Er wordt geprobeerd de Data-partitie te ontsleutelen via de commandoregel.</string>
 		<string name="base_pkg_err">Fout bij het laden van de basispakketten.</string>
-		<string name="simulating">Acties simuleren...</string>
+		<string name="simulating">Acties worden gesimuleerd...</string>
 		<string name="backup_cancel">Back-up geannuleerd</string>
-		<string name="config_twrp">TWRP configureren...</string>
-		<string name="config_twrp_err">Kan TWRP niet configureren met deze kernel.</string>
-		<string name="copy_log">Herstel log gekopieerd naar {1}.</string>
-		<string name="max_queue">Maximale zip wachtrij bereikt!</string>
-		<string name="min_queue">Minimale zip wachtrij bereikt!</string>
-		<string name="screenshot_saved">Screenshot is opgeslagen in {1}</string>
-		<string name="screenshot_err">Screenshot nemen mislukt!</string>
-		<string name="zip_wipe_cache">Een of meer zips verzochten een cache verwijdering -- Cache nu verwijderen.</string>
-		<string name="and_sec_wipe_err">Kan android secure niet wissen</string>
-		<string name="dalvik_wipe_err">Dalvik legen mislukt</string>
+		<string name="config_twrp">TWRP wordt geconfigureerd...</string>
+		<string name="config_twrp_err">Met deze kernel kan TWRP niet worden geconfigureerd.</string>
+		<string name="copy_log">Recoverylogbestand gekopieerd naar {1}.</string>
+		<string name="max_queue">Maximale lengte zipwachtrij bereikt!</string>
+		<string name="min_queue">Minimale lengte zipwachtrij bereikt!</string>
+		<string name="screenshot_saved">Schermafdruk opgeslagen in {1}</string>
+		<string name="screenshot_err">Maken schermafdruk mislukt!</string>
+		<string name="zip_wipe_cache">Een of meer zipbestanden vroegen om het wissen van de cache -- Cache wordt nu verwijderd.</string>
+		<string name="and_sec_wipe_err">Kan Android Secure niet wissen</string>
+		<string name="dalvik_wipe_err">Wissen van Dalvik mislukt</string>
 		<string name="auto_gen">(Automatisch genereren)</string>
 		<string name="curr_date">(Huidige datum)</string>
-		<string name="backup_name_len">Back-up naam is te lang.</string>
-		<string name="backup_name_invalid">Back-up naam \'{1}\' bevat een ongeldig teken: \'{1}\'</string>
-		<string name="no_real_sdcard">Dit apparaat beschikt niet over een echte SD kaart! Afbreken!</string>
-		<string name="cancel_sideload">ADB sideload annuleren...</string>
-		<string name="change_fs_err">Fout tijdens het veranderen van het bestandssysteem.</string>
-		<string name="theme_ver_err">Aangepaste thema versie komt niet overeen met TWRP versie. Stock thema gebruiken.</string>
+		<string name="backup_name_len">Back-upnaam is te lang.</string>
+		<string name="backup_name_invalid">Back-upnaam '{1}' bevat een ongeldig teken: '{1}'</string>
+		<string name="no_real_sdcard">Dit apparaat beschikt niet over een echte SD-kaart! Afgebroken!</string>
+		<string name="cancel_sideload">ADB-sideload wordt geannuleerd...</string>
+		<string name="change_fs_err">Fout tijdens het wijzigen van het bestandssysteem.</string>
+		<string name="theme_ver_err">Versie maatwerkthema past niet bij deze versie van TWRP. Standaardthema wordt gebruikt.</string>
 		<string name="up_a_level">(Niveau omhoog)</string>
-		<string name="install_reboot">Herstarten in 5 seconden</string>
+		<string name="install_reboot" version="2">Herstarten over %tw_sleep% seconden</string>
+		<string name="adbbackup_error">Fout bij ADB-back-up. Afgebroken..."</string>
+		<string name="adbbackup_control_error">Kan niet schrijven naar adb-beheerskanaal</string>
+		<string name="twrp_adbbu_option">--twrp optie vereist voor inschakelen twrp adb-backup</string>
+		<string name="partition_not_found">pad: {1} niet gevonden in partitielijst</string>
+		<string name="copy_kernel_log">Kernellogbestand gekopieerd naar {1}</string>
+		<string name="include_kernel_log">Kernellog bijvoegen</string>
+		<string name="sha2_chk">SHA2 gebruiken voor hashen</string>
+		<string name="unable_set_boot_slot">Fout tijdens aanpassen opstartslot bootloader in {1}</string>
+		<string name="backup_part_name">Partitie: %tw_partition%</string>
 	</resources>
 </language>

From 9632f301c1d87567b12b1bb21ae6e0d5b5c86360 Mon Sep 17 00:00:00 2001
From: Mauronofrio Matarrese <poronofrio@gmail.com>
Date: Sun, 4 Aug 2019 17:02:41 +0100
Subject: [PATCH 031/207] Removing fake error: E: recv error on uevent

This shouldn't be an error, so i hide the line about the error.

Change-Id: I3ef667435dfa843440cc594409c8d20add676576
---
 partitionmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 41d8af209c..596531f5f9 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2960,7 +2960,7 @@ void TWPartitionManager::read_uevent() {
 
 	int len = recv(uevent_pfd.fd, buf, sizeof(buf), MSG_DONTWAIT);
 	if (len == -1) {
-		LOGERR("recv error on uevent\n");
+		LOGINFO("recv error on uevent\n");
 		return;
 	}
 	/*int i = 0; // Print all uevent output for test /debug

From 49cfb7e5370b9c117843418968629bdde2daab2d Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Tue, 28 Jan 2020 17:37:00 -0500
Subject: [PATCH 032/207] crypto: add some missing newlines

Change-Id: I6bc6b512fe6e841703229d45333421532ecebb83
---
 crypto/ext4crypt/Keymaster.cpp  |  4 ++--
 crypto/ext4crypt/Keymaster3.cpp |  4 ++--
 crypto/fde/cryptfs.cpp          | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/crypto/ext4crypt/Keymaster.cpp b/crypto/ext4crypt/Keymaster.cpp
index 3c21aa26d6..1e981b9440 100644
--- a/crypto/ext4crypt/Keymaster.cpp
+++ b/crypto/ext4crypt/Keymaster.cpp
@@ -229,7 +229,7 @@ KeymasterOperation Keymaster::begin(keymaster_purpose_t purpose, const std::stri
     keymaster_key_param_set_t outParams_set;
     auto error = mDevice->begin(purpose, &keyBlob, &inParams, &outParams_set, &mOpHandle);
     if (error != KM_ERROR_OK) {
-        LOG(ERROR) << "begin failed, code " << error;
+        LOG(ERROR) << "begin failed, code " << error << "\n";
         return KeymasterOperation(nullptr, mOpHandle);
     }
     outParams->Clear();
@@ -244,7 +244,7 @@ KeymasterOperation Keymaster::begin(keymaster_purpose_t purpose, const std::stri
     keymaster_operation_handle_t mOpHandle;
     auto error = mDevice->begin(purpose, &keyBlob, &inParams, nullptr, &mOpHandle);
     if (error != KM_ERROR_OK) {
-        LOG(ERROR) << "begin failed, code " << error;
+        LOG(ERROR) << "begin failed, code " << error << "\n";
         return KeymasterOperation(nullptr, mOpHandle);
     }
     return KeymasterOperation(mDevice, mOpHandle);
diff --git a/crypto/ext4crypt/Keymaster3.cpp b/crypto/ext4crypt/Keymaster3.cpp
index 7862044e8a..d53096e651 100644
--- a/crypto/ext4crypt/Keymaster3.cpp
+++ b/crypto/ext4crypt/Keymaster3.cpp
@@ -181,11 +181,11 @@ KeymasterOperation Keymaster::begin(KeyPurpose purpose, const std::string& key,
 
     auto error = mDevice->begin(purpose, keyBlob, inParams.hidl_data(), hidlCb);
     if (!error.isOk()) {
-        LOG(ERROR) << "begin failed: " << error.description();
+        LOG(ERROR) << "begin failed: " << error.description() << "\n";
         return KeymasterOperation(ErrorCode::UNKNOWN_ERROR);
     }
     if (km_error != ErrorCode::OK) {
-        LOG(ERROR) << "begin failed, code " << int32_t(km_error);
+        LOG(ERROR) << "begin failed, code " << int32_t(km_error) << "\n";
         return KeymasterOperation(km_error);
     }
     return KeymasterOperation(mDevice, mOpHandle);
diff --git a/crypto/fde/cryptfs.cpp b/crypto/fde/cryptfs.cpp
index 83522968be..792708e876 100644
--- a/crypto/fde/cryptfs.cpp
+++ b/crypto/fde/cryptfs.cpp
@@ -256,7 +256,7 @@ static int get_keymaster_hw_fde_passwd(const char* passwd, unsigned char* newpw,
 
     if (should_use_keymaster()) {
         if (scrypt_keymaster(passwd, salt, newpw, (void*)ftr)) {
-            SLOGE("scrypt failed");
+            SLOGE("scrypt failed\n");
         } else {
             rc = 0;
         }
@@ -293,7 +293,7 @@ static int verify_and_update_hw_fde_passwd(const char *passwd,
         ++crypt_ftr->failed_decrypt_count;
 
         if (ascii_passwd_updated) {
-            SLOGI("Ascii password was updated");
+            SLOGI("Ascii password was updated\n");
         } else {
             /* Code in else part would execute only once:
              * When device is upgraded from L->M release.
@@ -412,7 +412,7 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
             // so) because we really should be using a proper deterministic
             // RSA padding function, such as PKCS1.
             memcpy(to_sign + 1, object, min((size_t)RSA_KEY_SIZE_BYTES - 1, object_size));
-            SLOGI("Signing safely-padded object");
+            SLOGI("Signing safely-padded object\n");
             break;
         default:
             SLOGE("Unknown KDF type %d", ftr->kdf_type);
@@ -930,8 +930,8 @@ static int load_crypto_mapping_table(struct crypt_mnt_ftr *crypt_ftr,
            crypt_ftr->crypto_type_name, master_key_ascii,
            real_blk_name, extra_params);
 
-  SLOGI("target_type = %s", tgt->target_type);
-  SLOGI("real_blk_name = %s, extra_params = %s", real_blk_name, extra_params);
+  SLOGI("target_type = %s\n", tgt->target_type);
+  SLOGI("real_blk_name = %s, extra_params = %s\n", real_blk_name, extra_params);
 #else
   convert_key_to_hex_ascii(master_key, crypt_ftr->keysize, master_key_ascii);
   strlcpy(tgt->target_type, "crypt", DM_MAX_TYPE_NAME);
@@ -1342,7 +1342,7 @@ static int test_mount_hw_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr,
 #ifndef CONFIG_HW_DISK_ENCRYPT_PERF
         if (create_crypto_blk_dev(crypt_ftr, (unsigned char*)&key_index,
                             real_blkdev, crypto_blkdev, label, 0)) {
-          SLOGE("Error creating decrypted block device");
+          SLOGE("Error creating decrypted block device\n");
           rc = -1;
           goto errout;
         }
@@ -1350,7 +1350,7 @@ static int test_mount_hw_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr,
       } else {
         if (create_crypto_blk_dev(crypt_ftr, decrypted_master_key,
                             real_blkdev, crypto_blkdev, label, 0)) {
-          SLOGE("Error creating decrypted block device");
+          SLOGE("Error creating decrypted block device\n");
           rc = -1;
           goto errout;
         }
@@ -1439,7 +1439,7 @@ static int test_mount_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr,
   if (rc == 0 && memcmp(scrypted_intermediate_key,
                         crypt_ftr->scrypted_intermediate_key,
                         sizeof(scrypted_intermediate_key)) == 0) {
-    SLOGI("Password matches");
+    SLOGI("Password matches\n");
     rc = 0;
   } else {
     /* Try mounting the file system anyway, just in case the problem's with
@@ -1454,7 +1454,7 @@ static int test_mount_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr,
       rc = -1;
     } else {
       /* Success! */
-      SLOGI("Password did not match but decrypted drive mounted - continue");
+      SLOGI("Password did not match but decrypted drive mounted - continue\n");
       umount(tmp_mount_point);
       rc = 0;
     }

From 0864aa54ce12274061ed6fc48602cab2bb8d57b9 Mon Sep 17 00:00:00 2001
From: Darth9 <reyprimerjefe@gmail.com>
Date: Tue, 14 Jan 2020 20:58:16 +0000
Subject: [PATCH 033/207] Prevent errors caused by /data/per_boot/

Change-Id: I543723f3da4f57fb4d580661216acc1abaac883e
---
 partition.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/partition.cpp b/partition.cpp
index aa82c09ec2..c2ad4bce92 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -1128,6 +1128,7 @@ void TWPartition::Setup_Data_Media() {
 		DataManager::SetValue("tw_has_internal", 1);
 		DataManager::SetValue("tw_has_data_media", 1);
 		backup_exclusions.add_absolute_dir("/data/data/com.google.android.music/files");
+		backup_exclusions.add_absolute_dir("/data/per_boot"); // DJ9,14Jan2020 - exclude this dir to prevent "error 255" on AOSP ROMs that create and lock it
 		wipe_exclusions.add_absolute_dir(Mount_Point + "/misc/vold"); // adopted storage keys
 		ExcludeAll(Mount_Point + "/.layout_version");
 		ExcludeAll(Mount_Point + "/system/storage.xml");

From 990168bec01ec9685ad9581b023dbf39f3068d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Casta=C3=B1=C3=B3n?=
 <herna@paranoidandroid.co>
Date: Wed, 27 Feb 2019 12:28:49 +0100
Subject: [PATCH 034/207] bootable: read all asserts in case there are more
 than one.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In A/B, the device check isn´t done by the updater script, but using
metadata for it.

Let´s search if the device codename/assert is included in the string.

Change-Id: Ie856ac699aaa83de2b364bc85a510a037d36edf9
Signed-off-by: Hernán Castañón <herna@paranoidandroid.co>
---
 installcommand.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/installcommand.cpp b/installcommand.cpp
index 99f4c5358c..fa079ea2d9 100644
--- a/installcommand.cpp
+++ b/installcommand.cpp
@@ -124,9 +124,23 @@ static int check_newer_ab_build(ZipWrap* zip)
 
     property_get("ro.product.device", value, "");
     const std::string& pkg_device = metadata["pre-device"];
-    if (pkg_device != value || pkg_device.empty()) {
+
+    std::vector<std::string> assertResults = android::base::Split(pkg_device, ",");
+
+    bool deviceExists = false;
+
+    for(const std::string& deviceAssert : assertResults)
+    {
+        std::string assertName = android::base::Trim(deviceAssert);
+        if (assertName == value && !assertName.empty()) {
+            deviceExists = true;
+            break;
+        }
+    }
+
+    if (!deviceExists) {
         printf("Package is for product %s but expected %s\n",
-             pkg_device.c_str(), value);
+            pkg_device.c_str(), value);
         return INSTALL_ERROR;
     }
 

From 6d5d08a1c08e00d67916f6d37a50d998ee95d64c Mon Sep 17 00:00:00 2001
From: Mauronofrio Matarrese <poronofrio@gmail.com>
Date: Tue, 3 Dec 2019 14:25:25 +0100
Subject: [PATCH 035/207] Move decryption error from logerror to loginfo

Change-Id: Iffa01968dfb92d2cc91b0b6a33c87d7f270430db
---
 partition.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partition.cpp b/partition.cpp
index c2ad4bce92..beb4a81dbf 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -667,7 +667,7 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 			LOGINFO("Trying wrapped key.\n");
 			property_set("fbe.data.wrappedkey", "true");
 				if (!Decrypt_FBE_DE()) {
-					LOGERR("Unable to decrypt FBE device\n");
+					LOGINFO("Unable to decrypt device\n");
 				}
 		}
 	}

From d54e1da83e0295c2b021bdeb7502cb0ecf45cdb0 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Wed, 4 Mar 2020 16:49:51 -0500
Subject: [PATCH 036/207] partitionmanager: add /etc to Local_Path

- Prevents errors when using copy_file for
  paths starting with /etc

Change-Id: I7d52acdbc8e67a21e3d32f4793257dbdad5d82de
---
 partitionmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 596531f5f9..b265469801 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -515,7 +515,7 @@ int TWPartitionManager::Mount_By_Path(string Path, bool Display_Error) {
 	bool found = false;
 	string Local_Path = TWFunc::Get_Root_Path(Path);
 
-	if (Local_Path == "/tmp" || Local_Path == "/")
+	if (Local_Path == "/tmp" || Local_Path == "/" || Local_Path == "/etc")
 		return true;
 
 	// Iterate through all partitions

From f8d0e2156e76cb2afd77d4e60ccbb02806497c02 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 4 Jul 2019 14:26:39 -0400
Subject: [PATCH 037/207] openrecoveryscript: do not skip decryption even if
 using block.map

- Allows addon.d scripts to run that require access
  to decrypted /data (e.g. Magisk). Seems to also affect
  GApps addon.d script, resulting in non-booting system
- If decryption prompt is canceled, installation will
  still proceed (i.e. on devices where TWRP doesn't
  support encryption)
- Should resolve
  https://github.com/TeamWin/Team-Win-Recovery-Project/issues/1478
  and possibly
  https://github.com/TeamWin/Team-Win-Recovery-Project/issues/1459

Change-Id: Idcd397aa145577c409d5174ae3f9c48474e5734b
---
 twrp.cpp | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/twrp.cpp b/twrp.cpp
index 95e376b5a5..dac009325c 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -127,7 +127,6 @@ int main(int argc, char **argv) {
 	gui_loadResources();
 
 	bool Shutdown = false;
-	bool SkipDecryption = false;
 	string Send_Intent = "";
 	{
 		TWPartition* misc = PartitionManager.Find_Partition_By_Path("/misc");
@@ -162,9 +161,6 @@ int main(int argc, char **argv) {
 					string ORSCommand = "install ";
 					ORSCommand.append(ptr);
 
-					// If we have a map of blocks we don't need to mount data.
-					SkipDecryption = *ptr == '@';
-
 					if (!OpenRecoveryScript::Insert_ORS_Command(ORSCommand))
 						break;
 				} else
@@ -232,17 +228,13 @@ int main(int argc, char **argv) {
 
 	// Offer to decrypt if the device is encrypted
 	if (DataManager::GetIntValue(TW_IS_ENCRYPTED) != 0) {
-		if (SkipDecryption) {
-			LOGINFO("Skipping decryption\n");
+		LOGINFO("Is encrypted, do decrypt page first\n");
+		if (gui_startPage("decrypt", 1, 1) != 0) {
+			LOGERR("Failed to start decrypt GUI page.\n");
 		} else {
-			LOGINFO("Is encrypted, do decrypt page first\n");
-			if (gui_startPage("decrypt", 1, 1) != 0) {
-				LOGERR("Failed to start decrypt GUI page.\n");
-			} else {
-				// Check for and load custom theme if present
-				TWFunc::check_selinux_support();
-				gui_loadCustomResources();
-			}
+			// Check for and load custom theme if present
+			TWFunc::check_selinux_support();
+			gui_loadCustomResources();
 		}
 	} else if (datamedia) {
 		TWFunc::check_selinux_support();
@@ -266,7 +258,8 @@ int main(int argc, char **argv) {
 	// Run any outstanding OpenRecoveryScript
 	std::string cacheDir = TWFunc::get_cache_dir();
 	std::string orsFile = cacheDir + "/recovery/openrecoveryscript";
-	if ((DataManager::GetIntValue(TW_IS_ENCRYPTED) == 0 || SkipDecryption) && (TWFunc::Path_Exists(SCRIPT_FILE_TMP) || TWFunc::Path_Exists(orsFile))) {
+
+	if (TWFunc::Path_Exists(SCRIPT_FILE_TMP) || (DataManager::GetIntValue(TW_IS_ENCRYPTED) == 0 && TWFunc::Path_Exists(orsFile))) {
 		OpenRecoveryScript::Run_OpenRecoveryScript();
 	}
 

From a5283b357006c1a443f1ba7dabe8dbf0be1af9df Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Wed, 19 Feb 2020 12:11:23 -0500
Subject: [PATCH 038/207] crypto: add more missing newlines

Change-Id: I158b2a8fee89c2543a0b809af8e278702466b106
---
 crypto/ext4crypt/Keymaster.cpp  | 20 ++++++------
 crypto/ext4crypt/Keymaster3.cpp | 46 +++++++++++++--------------
 crypto/fde/cryptfs.cpp          | 56 ++++++++++++++++-----------------
 3 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/crypto/ext4crypt/Keymaster.cpp b/crypto/ext4crypt/Keymaster.cpp
index 1e981b9440..ec80ab58ce 100644
--- a/crypto/ext4crypt/Keymaster.cpp
+++ b/crypto/ext4crypt/Keymaster.cpp
@@ -130,14 +130,14 @@ bool KeymasterOperation::updateCompletely(const std::string& input, std::string*
         auto error =
             mDevice->update(mOpHandle, nullptr, &inputBlob, &inputConsumed, nullptr, &outputBlob);
         if (error != KM_ERROR_OK) {
-            LOG(ERROR) << "update failed, code " << error;
+            LOG(ERROR) << "update failed, code " << error << "\n";
             mDevice = nullptr;
             return false;
         }
         output->append(reinterpret_cast<const char*>(outputBlob.data), outputBlob.data_length);
         free(const_cast<uint8_t*>(outputBlob.data));
         if (inputConsumed > toRead) {
-            LOG(ERROR) << "update reported too much input consumed";
+            LOG(ERROR) << "update reported too much input consumed\n";
             mDevice = nullptr;
             return false;
         }
@@ -150,7 +150,7 @@ bool KeymasterOperation::finish() {
     auto error = mDevice->finish(mOpHandle, nullptr, nullptr, nullptr, nullptr);
     mDevice = nullptr;
     if (error != KM_ERROR_OK) {
-        LOG(ERROR) << "finish failed, code " << error;
+        LOG(ERROR) << "finish failed, code " << error << "\n";
         return false;
     }
     return true;
@@ -161,7 +161,7 @@ bool KeymasterOperation::finishWithOutput(std::string* output) {
     auto error = mDevice->finish(mOpHandle, nullptr, nullptr, nullptr, &outputBlob);
     mDevice = nullptr;
     if (error != KM_ERROR_OK) {
-        LOG(ERROR) << "finish failed, code " << error;
+        LOG(ERROR) << "finish failed, code " << error << "\n";
         return false;
     }
     output->assign(reinterpret_cast<const char*>(outputBlob.data), outputBlob.data_length);
@@ -174,14 +174,14 @@ Keymaster::Keymaster() {
     const hw_module_t* module;
     int ret = hw_get_module_by_class(KEYSTORE_HARDWARE_MODULE_ID, NULL, &module);
     if (ret != 0) {
-        LOG(ERROR) << "hw_get_module_by_class returned " << ret;
+        LOG(ERROR) << "hw_get_module_by_class returned " << ret << "\n";
         return;
     }
     if (module->module_api_version == KEYMASTER_MODULE_API_VERSION_1_0) {
         keymaster1_device_t* device;
         ret = keymaster1_open(module, &device);
         if (ret != 0) {
-            LOG(ERROR) << "keymaster1_open returned " << ret;
+            LOG(ERROR) << "keymaster1_open returned " << ret << "\n";
             return;
         }
         mDevice = std::make_shared<Keymaster1Device>(device);
@@ -189,12 +189,12 @@ Keymaster::Keymaster() {
         keymaster2_device_t* device;
         ret = keymaster2_open(module, &device);
         if (ret != 0) {
-            LOG(ERROR) << "keymaster2_open returned " << ret;
+            LOG(ERROR) << "keymaster2_open returned " << ret << "\n";
             return;
         }
         mDevice = std::make_shared<Keymaster2Device>(device);
     } else {
-        LOG(ERROR) << "module_api_version is " << module->module_api_version;
+        LOG(ERROR) << "module_api_version is " << module->module_api_version << "\n";
         return;
     }
 }
@@ -203,7 +203,7 @@ Keymaster::Keymaster() {
     keymaster_key_blob_t keyBlob;
     auto error = mDevice->generate_key(&inParams, &keyBlob);
     if (error != KM_ERROR_OK) {
-        LOG(ERROR) << "generate_key failed, code " << error;
+        LOG(ERROR) << "generate_key failed, code " << error << "\n";
         return false;
     }
     key->assign(reinterpret_cast<const char*>(keyBlob.key_material), keyBlob.key_material_size);
@@ -215,7 +215,7 @@ bool Keymaster::deleteKey(const std::string& key) {
     keymaster_key_blob_t keyBlob{reinterpret_cast<const uint8_t*>(key.data()), key.size()};
     auto error = mDevice->delete_key(&keyBlob);
     if (error != KM_ERROR_OK) {
-        LOG(ERROR) << "delete_key failed, code " << error;
+        LOG(ERROR) << "delete_key failed, code " << error << "\n";
         return false;
     }
     return true;
diff --git a/crypto/ext4crypt/Keymaster3.cpp b/crypto/ext4crypt/Keymaster3.cpp
index d53096e651..f8774f24f9 100644
--- a/crypto/ext4crypt/Keymaster3.cpp
+++ b/crypto/ext4crypt/Keymaster3.cpp
@@ -56,17 +56,17 @@ bool KeymasterOperation::updateCompletely(const std::string& input, std::string*
         auto inputBlob = blob2hidlVec(reinterpret_cast<const uint8_t*>(&*it), toRead);
         auto error = mDevice->update(mOpHandle, hidl_vec<KeyParameter>(), inputBlob, hidlCB);
         if (!error.isOk()) {
-            LOG(ERROR) << "update failed: " << error.description();
+            LOG(ERROR) << "update failed: " << error.description() << "\n";
             mDevice = nullptr;
             return false;
         }
         if (km_error != ErrorCode::OK) {
-            LOG(ERROR) << "update failed, code " << int32_t(km_error);
+            LOG(ERROR) << "update failed, code " << int32_t(km_error) << "\n";
             mDevice = nullptr;
             return false;
         }
         if (inputConsumed > toRead) {
-            LOG(ERROR) << "update reported too much input consumed";
+            LOG(ERROR) << "update reported too much input consumed\n";
             mDevice = nullptr;
             return false;
         }
@@ -88,11 +88,11 @@ bool KeymasterOperation::finish(std::string* output) {
             hidl_vec<uint8_t>(), hidlCb);
     mDevice = nullptr;
     if (!error.isOk()) {
-        LOG(ERROR) << "finish failed: " << error.description();
+        LOG(ERROR) << "finish failed: " << error.description() << "\n";
         return false;
     }
     if (km_error != ErrorCode::OK) {
-        LOG(ERROR) << "finish failed, code " << int32_t(km_error);
+        LOG(ERROR) << "finish failed, code " << int32_t(km_error) << "\n";
         return false;
     }
     return true;
@@ -114,27 +114,27 @@ Keymaster::Keymaster() {
 
     auto error = mDevice->generateKey(inParams.hidl_data(), hidlCb);
     if (!error.isOk()) {
-        LOG(ERROR) << "generate_key failed: " << error.description();
+        LOG(ERROR) << "generate_key failed: " << error.description() << "\n";
         return false;
     }
     if (km_error != ErrorCode::OK) {
-        LOG(ERROR) << "generate_key failed, code " << int32_t(km_error);
+        LOG(ERROR) << "generate_key failed, code " << int32_t(km_error) << "\n";
         return false;
     }
     return true;
 }*/
 
 bool Keymaster::deleteKey(const std::string& key) {
-	LOG(ERROR) << "NOT deleting key in TWRP";
+	LOG(ERROR) << "NOT deleting key in TWRP\n";
 	return false;
     /*auto keyBlob = blob2hidlVec(key);
     auto error = mDevice->deleteKey(keyBlob);
     if (!error.isOk()) {
-        LOG(ERROR) << "delete_key failed: " << error.description();
+        LOG(ERROR) << "delete_key failed: " << error.description() << "\n";
         return false;
     }
     if (ErrorCode(error) != ErrorCode::OK) {
-        LOG(ERROR) << "delete_key failed, code " << uint32_t(ErrorCode(error));
+        LOG(ERROR) << "delete_key failed, code " << uint32_t(ErrorCode(error)) << "\n";
         return false;
     }
     return true;*/
@@ -153,11 +153,11 @@ bool Keymaster::upgradeKey(const std::string& oldKey, const AuthorizationSet& in
     };
     auto error = mDevice->upgradeKey(oldKeyBlob, inParams.hidl_data(), hidlCb);
     if (!error.isOk()) {
-        LOG(ERROR) << "upgrade_key failed: " << error.description();
+        LOG(ERROR) << "upgrade_key failed: " << error.description() << "\n";
         return false;
     }
     if (km_error != ErrorCode::OK) {
-        LOG(ERROR) << "upgrade_key failed, code " << int32_t(km_error);
+        LOG(ERROR) << "upgrade_key failed, code " << int32_t(km_error) << "\n";
         return false;
     }
     return true;
@@ -207,7 +207,7 @@ using namespace ::android::vold;
 int keymaster_compatibility_cryptfs_scrypt() {
     Keymaster dev;
     if (!dev) {
-        LOG(ERROR) << "Failed to initiate keymaster session";
+        LOG(ERROR) << "Failed to initiate keymaster session\n";
         return -1;
     }
     return dev.isSecure();
@@ -224,11 +224,11 @@ int keymaster_compatibility_cryptfs_scrypt() {
     Keymaster dev;
     std::string key;
     if (!dev) {
-        LOG(ERROR) << "Failed to initiate keymaster session";
+        LOG(ERROR) << "Failed to initiate keymaster session\n";
         return -1;
     }
     if (!key_buffer || !key_out_size) {
-        LOG(ERROR) << __FILE__ << ":" << __LINE__ << ":Invalid argument";
+        LOG(ERROR) << __FILE__ << ":" << __LINE__ << ":Invalid argument\n";
         return -1;
     }
     if (key_out_size) {
@@ -276,11 +276,11 @@ int keymaster_sign_object_for_cryptfs_scrypt(const uint8_t* key_blob,
 {
     Keymaster dev;
     if (!dev) {
-        LOG(ERROR) << "Failed to initiate keymaster session";
+        LOG(ERROR) << "Failed to initiate keymaster session\n";
         return -1;
     }
     if (!key_blob || !object || !signature_buffer || !signature_buffer_size) {
-        LOG(ERROR) << __FILE__ << ":" << __LINE__ << ":Invalid argument";
+        LOG(ERROR) << __FILE__ << ":" << __LINE__ << ":Invalid argument\n";
         return -1;
     }
 
@@ -303,7 +303,7 @@ int keymaster_sign_object_for_cryptfs_scrypt(const uint8_t* key_blob,
             std::string newKey;
             bool ret = dev.upgradeKey(key, paramBuilder, &newKey);
             if(ret == false) {
-                LOG(ERROR) << "Error upgradeKey: ";
+                LOG(ERROR) << "Error upgradeKey: \n";
                 return -1;
             }
 
@@ -312,7 +312,7 @@ int keymaster_sign_object_for_cryptfs_scrypt(const uint8_t* key_blob,
             }
 
             if (key_buffer_size < newKey.size()) {
-                LOG(ERROR) << "key buffer size is too small";
+                LOG(ERROR) << "key buffer size is too small\n";
                 return -1;
             }
 
@@ -322,24 +322,24 @@ int keymaster_sign_object_for_cryptfs_scrypt(const uint8_t* key_blob,
     }
 
     if (op.errorCode() != ErrorCode::OK) {
-        LOG(ERROR) << "Error starting keymaster signature transaction: " << int32_t(op.errorCode());
+        LOG(ERROR) << "Error starting keymaster signature transaction: " << int32_t(op.errorCode()) << "\n";
         return -1;
     }
 
     if (!op.updateCompletely(input, &output)) {
         LOG(ERROR) << "Error sending data to keymaster signature transaction: "
-                   << uint32_t(op.errorCode());
+                   << uint32_t(op.errorCode()) << "\n";
         return -1;
     }
 
     if (!op.finish(&output)) {
-        LOG(ERROR) << "Error finalizing keymaster signature transaction: " << int32_t(op.errorCode());
+        LOG(ERROR) << "Error finalizing keymaster signature transaction: " << int32_t(op.errorCode()) << "\n";
         return -1;
     }
 
     *signature_buffer = reinterpret_cast<uint8_t*>(malloc(output.size()));
     if (*signature_buffer == nullptr) {
-        LOG(ERROR) << "Error allocation buffer for keymaster signature";
+        LOG(ERROR) << "Error allocation buffer for keymaster signature\n";
         return -1;
     }
     *signature_buffer_size = output.size();
diff --git a/crypto/fde/cryptfs.cpp b/crypto/fde/cryptfs.cpp
index 792708e876..4e7a95116f 100644
--- a/crypto/fde/cryptfs.cpp
+++ b/crypto/fde/cryptfs.cpp
@@ -305,14 +305,14 @@ static int verify_and_update_hw_fde_passwd(const char *passwd,
             if (crypt_ftr->crypt_type == CRYPT_TYPE_DEFAULT) {
                 new_passwd = (char*)malloc(strlen(DEFAULT_HEX_PASSWORD) + 1);
                 if (new_passwd == NULL) {
-                    SLOGE("System out of memory. Password verification  incomplete");
+                    SLOGE("System out of memory. Password verification  incomplete\n");
                     goto out;
                 }
                 strlcpy(new_passwd, DEFAULT_HEX_PASSWORD, strlen(DEFAULT_HEX_PASSWORD) + 1);
             } else {
                 new_passwd = (char*)malloc(strlen(passwd) * 2 + 1);
                 if (new_passwd == NULL) {
-                    SLOGE("System out of memory. Password verification  incomplete");
+                    SLOGE("System out of memory. Password verification  incomplete\n");
                     goto out;
                 }
                 convert_key_to_hex_ascii_for_upgrade((const unsigned char*)passwd,
@@ -322,7 +322,7 @@ static int verify_and_update_hw_fde_passwd(const char *passwd,
                                        (char*) crypt_ftr->crypto_type_name);
             if (key_index >=0) {
                 crypt_ftr->failed_decrypt_count = 0;
-                SLOGI("Hex password verified...will try to update with Ascii value");
+                SLOGI("Hex password verified...will try to update with Ascii value\n");
                 /* Before updating password, tie that with keymaster to tie with ROT */
 
                 if (get_keymaster_hw_fde_passwd(passwd, newpw,
@@ -336,9 +336,9 @@ static int verify_and_update_hw_fde_passwd(const char *passwd,
 
                 if (passwd_updated >= 0) {
                     crypt_ftr->flags |= CRYPT_ASCII_PASSWORD_UPDATED;
-                    SLOGI("Ascii password recorded and updated");
+                    SLOGI("Ascii password recorded and updated\n");
                 } else {
-                    SLOGI("Passwd verified, could not update...Will try next time");
+                    SLOGI("Passwd verified, could not update...Will try next time\n");
                 }
             } else {
                 ++crypt_ftr->failed_decrypt_count;
@@ -415,7 +415,7 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
             SLOGI("Signing safely-padded object\n");
             break;
         default:
-            SLOGE("Unknown KDF type %d", ftr->kdf_type);
+            SLOGE("Unknown KDF type %d\n", ftr->kdf_type);
             return -1;
     }
 
@@ -549,7 +549,7 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
             return -1;
         }
         /*if (put_crypt_ftr_and_key(ftr) != 0) {
-            SLOGE("Failed to write upgraded key to disk");
+            SLOGE("Failed to write upgraded key to disk\n");
         }*/
         SLOGD("Key upgraded successfully\n");
         return 0;
@@ -1205,13 +1205,13 @@ static int scrypt_keymaster(const char *passwd, const unsigned char *salt,
                        INTERMEDIATE_BUF_SIZE);
 
     if (rc) {
-        SLOGE("scrypt failed");
+        SLOGE("scrypt failed\n");
         return -1;
     }
 
     if (keymaster_sign_object(ftr, ikey, INTERMEDIATE_BUF_SIZE,
                               &signature, &signature_size)) {
-        SLOGE("Keymaster signing failed");
+        SLOGE("Keymaster signing failed\n");
         return -1;
     }
 
@@ -1220,7 +1220,7 @@ static int scrypt_keymaster(const char *passwd, const unsigned char *salt,
     free(signature);
 
     if (rc) {
-        SLOGE("scrypt failed");
+        SLOGE("scrypt failed\n");
         return -1;
     }
 
@@ -1242,7 +1242,7 @@ static int decrypt_master_key_aux(const char *passwd, unsigned char *salt,
   /* Turn the password into an intermediate key and IV that can decrypt the
      master key */
   if (kdf(passwd, salt, ikey, kdf_params)) {
-    SLOGE("kdf failed");
+    SLOGE("kdf failed\n");
     return -1;
   }
 
@@ -1308,7 +1308,7 @@ static int decrypt_master_key(const char *passwd, unsigned char *decrypted_maste
                                  decrypted_master_key, kdf, kdf_params,
                                  intermediate_key, intermediate_key_size);
     if (ret != 0) {
-        SLOGW("failure decrypting master key");
+        SLOGW("failure decrypting master key\n");
     }
 
     return ret;
@@ -1494,7 +1494,7 @@ int cryptfs_setup_ext_volume(const char* label, const char* real_blkdev,
         const unsigned char* key, int keysize, char* out_crypto_blkdev) {
     int fd = open(real_blkdev, O_RDONLY|O_CLOEXEC);
     if (fd == -1) {
-        SLOGE("Failed to open %s: %s", real_blkdev, strerror(errno));
+        SLOGE("Failed to open %s: %s\n", real_blkdev, strerror(errno));
         return -1;
     }
 
@@ -1503,7 +1503,7 @@ int cryptfs_setup_ext_volume(const char* label, const char* real_blkdev,
     close(fd);
 
     if (nr_sec == 0) {
-        SLOGE("Failed to get size of %s: %s", real_blkdev, strerror(errno));
+        SLOGE("Failed to get size of %s: %s\n", real_blkdev, strerror(errno));
         return -1;
     }
 
@@ -1535,12 +1535,12 @@ int check_unmounted_and_get_ftr(struct crypt_mnt_ftr* crypt_ftr)
     property_get("ro.crypto.state", encrypted_state, "");
     if ( master_key_saved || strcmp(encrypted_state, "encrypted") ) {
         SLOGE("encrypted fs already validated or not running with encryption,"
-              " aborting");
+              " aborting\n");
         return -1;
     }
 
     if (get_crypt_ftr_and_key(crypt_ftr)) {
-        SLOGE("Error getting crypt footer and key");
+        SLOGE("Error getting crypt footer and key\n");
         return -1;
     }
 
@@ -1555,7 +1555,7 @@ int cryptfs_check_passwd_hw(const char* passwd)
     unsigned char master_key[KEY_LEN_BYTES];
     /* get key */
     if (get_crypt_ftr_and_key(&crypt_ftr)) {
-        SLOGE("Error getting crypt footer and key");
+        SLOGE("Error getting crypt footer and key\n");
         return -1;
     }
 
@@ -1569,7 +1569,7 @@ int cryptfs_check_passwd_hw(const char* passwd)
          */
         rc = cryptfs_get_master_key(&crypt_ftr, passwd, master_key);
         if (rc) {
-            SLOGE("password doesn't match");
+            SLOGE("password doesn't match\n");
             return rc;
         }
 
@@ -1577,7 +1577,7 @@ int cryptfs_check_passwd_hw(const char* passwd)
             DATA_MNT_POINT, CRYPTO_BLOCK_DEVICE);
 
         if (rc) {
-            SLOGE("Default password did not match on reboot encryption");
+            SLOGE("Default password did not match on reboot encryption\n");
             return rc;
         }
     } else {
@@ -1593,7 +1593,7 @@ int cryptfs_check_passwd_hw(const char* passwd)
 int cryptfs_check_passwd(const char *passwd)
 {
     /*if (e4crypt_is_native()) {
-        SLOGE("cryptfs_check_passwd not valid for file encryption");
+        SLOGE("cryptfs_check_passwd not valid for file encryption\n");
         return -1;
     }*/
 
@@ -1602,7 +1602,7 @@ int cryptfs_check_passwd(const char *passwd)
 
     rc = check_unmounted_and_get_ftr(&crypt_ftr);
     if (rc) {
-        SLOGE("Could not get footer");
+        SLOGE("Could not get footer\n");
         return rc;
     }
 
@@ -1615,7 +1615,7 @@ int cryptfs_check_passwd(const char *passwd)
                                  DATA_MNT_POINT, CRYPTO_BLOCK_DEVICE);
 
     if (rc) {
-        SLOGE("Password did not match");
+        SLOGE("Password did not match\n");
         return rc;
     }
 
@@ -1628,7 +1628,7 @@ int cryptfs_check_passwd(const char *passwd)
         rc = test_mount_encrypted_fs(&crypt_ftr, DEFAULT_PASSWORD,
                                      DATA_MNT_POINT, CRYPTO_BLOCK_DEVICE);
         if (rc) {
-            SLOGE("Default password did not match on reboot encryption");
+            SLOGE("Default password did not match on reboot encryption\n");
             return rc;
         }
     }
@@ -1645,17 +1645,17 @@ int cryptfs_verify_passwd(const char *passwd)
 
     property_get("ro.crypto.state", encrypted_state, "");
     if (strcmp(encrypted_state, "encrypted") ) {
-        SLOGE("device not encrypted, aborting");
+        SLOGE("device not encrypted, aborting\n");
         return -2;
     }
 
     if (!master_key_saved) {
-        SLOGE("encrypted fs not yet mounted, aborting");
+        SLOGE("encrypted fs not yet mounted, aborting\n");
         return -1;
     }
 
     if (!saved_mount_point) {
-        SLOGE("encrypted fs failed to save mount point, aborting");
+        SLOGE("encrypted fs failed to save mount point, aborting\n");
         return -1;
     }
 
@@ -1735,7 +1735,7 @@ int cryptfs_get_master_key(struct crypt_mnt_ftr* ftr, const char* password,
                             &intermediate_key_size);
 
     if (rc) {
-        SLOGE("Can't calculate intermediate key");
+        SLOGE("Can't calculate intermediate key\n");
         return rc;
     }
 
@@ -1753,7 +1753,7 @@ int cryptfs_get_master_key(struct crypt_mnt_ftr* ftr, const char* password,
     free(intermediate_key);
 
     if (rc) {
-        SLOGE("Can't scrypt intermediate key");
+        SLOGE("Can't scrypt intermediate key\n");
         return rc;
     }
 

From 8a411c8d257bf37a31907fc44be7cedf447aad7f Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Tue, 7 Jan 2020 18:54:13 +0800
Subject: [PATCH 039/207] Fix ORS backup and restore for system-as-root

Change-Id: Ice7f2e22ded280f723c19e920a15f3e918c17264
---
 openrecoveryscript.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index 165211523c..1de087075b 100755
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -253,8 +253,8 @@ int OpenRecoveryScript::run_script_file(void) {
 					gui_msg(Msg("set_restore_opt=Setting restore options: '{1}':")(value2));
 					line_len = strlen(value2);
 					for (i=0; i<line_len; i++) {
-						if ((value2[i] == 'S' || value2[i] == 's') && Partition_List.find("/system;") != string::npos) {
-							Restore_List += "/system;";
+						if ((value2[i] == 'S' || value2[i] == 's') && Partition_List.find(PartitionManager.Get_Android_Root_Path() + ';') != string::npos) {
+							Restore_List += PartitionManager.Get_Android_Root_Path() + ';';
 							gui_msg("system=System");
 						} else if ((value2[i] == 'D' || value2[i] == 'd') && Partition_List.find("/data;") != string::npos) {
 							Restore_List += "/data;";
@@ -539,7 +539,7 @@ int OpenRecoveryScript::Backup_Command(string Options) {
 	line_len = Options.size();
 	for (i=0; i<line_len; i++) {
 		if (Options.substr(i, 1) == "S" || Options.substr(i, 1) == "s") {
-			Backup_List += "/system;";
+			Backup_List += PartitionManager.Get_Android_Root_Path() + ';';
 			gui_msg("system=System");
 		} else if (Options.substr(i, 1) == "D" || Options.substr(i, 1) == "d") {
 			Backup_List += "/data;";

From 915bbd225ed6df57ce1b99fbf207c2abbe9e493d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 6 Mar 2020 22:30:07 +0100
Subject: [PATCH 040/207] Fix building libuuid

libuuid uses flock() which requires <sys/file.h>.

Change-Id: I230a5d08ce90088d14db2f89a0843bf43029b3c7
---
 libblkid/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libblkid/Android.mk b/libblkid/Android.mk
index 42762e4e48..38a192f997 100644
--- a/libblkid/Android.mk
+++ b/libblkid/Android.mk
@@ -44,7 +44,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libuuid
 LOCAL_MODULE_TAGS := optional
 #LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-LOCAL_CFLAGS := -D_FILE_OFFSET_BITS=64 -DHAVE_LOFF_T -DHAVE_ERR_H -DHAVE_MEMPCPY -DHAVE_FSYNC
+LOCAL_CFLAGS := -D_FILE_OFFSET_BITS=64 -DHAVE_LOFF_T -DHAVE_ERR_H -DHAVE_MEMPCPY -DHAVE_FSYNC -DHAVE_SYS_FILE_H
 LOCAL_CFLAGS += -Wno-missing-field-initializers -Wno-sign-compare -Wno-unused-parameter -Wno-format -Wno-pointer-arith
 LOCAL_SRC_FILES =	libuuid/src/clear.c \
 			libuuid/src/copy.c \

From 191a6948d9f1f627cc53c38d72d4bce2e7897753 Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Sat, 15 Feb 2020 22:06:14 +0530
Subject: [PATCH 041/207] crypto: fde: decrypt master key first

 * Some devices like lavender, etc. getting failed to decrypt

Change-Id: I63ca05c4f87cdd17d48d4541a5a8121c736beb02
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 crypto/fde/cryptfs.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crypto/fde/cryptfs.cpp b/crypto/fde/cryptfs.cpp
index 4e7a95116f..5b8757c52d 100644
--- a/crypto/fde/cryptfs.cpp
+++ b/crypto/fde/cryptfs.cpp
@@ -1332,6 +1332,13 @@ static int test_mount_hw_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr,
 
   int key_index = 0;
   if(is_hw_disk_encryption((char*)crypt_ftr->crypto_type_name)) {
+    if (crypt_ftr->flags & CRYPT_FORCE_COMPLETE) {
+       if (decrypt_master_key(passwd, decrypted_master_key, crypt_ftr, 0, 0)) {
+           printf("Failed to decrypt master key\n");
+           rc = -1;
+           goto errout;
+       }
+    }
     key_index = verify_and_update_hw_fde_passwd(passwd, crypt_ftr);
     if (key_index < 0) {
       rc = -1;
@@ -1396,7 +1403,7 @@ static int test_mount_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr,
   //char real_blkdev[MAXPATHLEN];
   char tmp_mount_point[64];
   unsigned int orig_failed_decrypt_count;
-  int rc;
+  int rc = 0;
   int use_keymaster = 0;
   unsigned char* intermediate_key = 0;
   size_t intermediate_key_size = 0;
@@ -1551,7 +1558,7 @@ int check_unmounted_and_get_ftr(struct crypt_mnt_ftr* crypt_ftr)
 int cryptfs_check_passwd_hw(const char* passwd)
 {
     struct crypt_mnt_ftr crypt_ftr;
-    int rc;
+    int rc = 0;
     unsigned char master_key[KEY_LEN_BYTES];
     /* get key */
     if (get_crypt_ftr_and_key(&crypt_ftr)) {

From 07f991a3ed1457d4774078219e828e6d63756777 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Wed, 11 Mar 2020 19:24:18 -0400
Subject: [PATCH 042/207] system mount: unmount system after checking for TWRP
 app

Change-Id: I9ab74c9839b50e399432d19839191b7de2d1bf60
---
 twrp-functions.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index a3e5a07385..8203cfab34 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1313,6 +1313,7 @@ bool TWFunc::Is_TWRP_App_In_System() {
 		}
 	}
 	DataManager::SetValue("tw_app_installed_in_system", 0);
+	PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), false);
 	return false;
 }
 #endif // ndef BUILD_TWRPTAR_MAIN

From c630b3864f9ad0a7fe0b88b4180f42eefe3301db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20D=C3=BCnkelmann?= <nc-duenkekl3@netcologne.de>
Date: Mon, 30 Dec 2019 15:19:03 +0100
Subject: [PATCH 043/207] Fix 'system/etc/ld.config.txt' not found error

According to

https://android.googlesource.com/platform/system/core/+/refs/tags/android-9.0.0_r51/rootdir/Android.mk#260

the ld.config.txt gets generated with the vndk version as a suffix.
This behaviour exists since API level 28 (Android 9.0), if
BOARD_VNDK_VERSION is defined and BOARD_VNDK_RUNTIME_DISABLE is not
true.

The issue seems to be exist since commit
8d70eb617ea2260ba7338169a61f7aa4f5269f61 in twrp.

Change-Id: I19741c29cda65ce051b7c167a946d551ce149f7b
---
 Android.mk | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Android.mk b/Android.mk
index 1bb421ab8e..31a697d882 100755
--- a/Android.mk
+++ b/Android.mk
@@ -517,15 +517,10 @@ endif
 
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)
     TWRP_REQUIRED_MODULES += ld.config.txt
-    ifeq ($(BOARD_VNDK_RUNTIME_DISABLE),true)
-        LOCAL_POST_INSTALL_CMD += \
-	    sed 's/\(namespace.default.search.paths\)\s\{1,\}=/namespace.default.search.paths  = \/sbin\n\1 +=/' \
-                $(TARGET_OUT_ETC)/ld.config.vndk_lite.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt;
-    else
-        LOCAL_POST_INSTALL_CMD += \
-	    sed 's/\(namespace.default.search.paths\)\s\{1,\}=/namespace.default.search.paths  = \/sbin\n\1 +=/' \
-                $(TARGET_OUT_ETC)/ld.config.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt;
-    endif
+    TWRP_REQUIRED_MODULES += init.recovery.ldconfig.rc
+    LOCAL_POST_INSTALL_CMD += \
+        sed 's/\(namespace.default.search.paths\)\s\{1,\}=/namespace.default.search.paths  = \/sbin\n\1 +=/' \
+            $(TARGET_OUT_ETC)/ld.config*.txt > $(TARGET_RECOVERY_ROOT_OUT)/sbin/ld.config.txt;
 endif
 
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25; echo $$?),0)

From 901141c2eb5071c7a12e99992f39f3fac3d71d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20F=C4=B1r=C4=B1nc=C4=B1?= <fatihfirinci@gmail.com>
Date: Sat, 14 Mar 2020 17:19:17 -0400
Subject: [PATCH 044/207] language: turkish update

Change-Id: I9dab6ea9378f87879384e43dafb2e3ae4f733f68
---
 gui/theme/common/languages/tr.xml | 75 ++++++++++++++++++++++---------
 1 file changed, 53 insertions(+), 22 deletions(-)

diff --git a/gui/theme/common/languages/tr.xml b/gui/theme/common/languages/tr.xml
index 8e924cb576..d86d494e54 100644
--- a/gui/theme/common/languages/tr.xml
+++ b/gui/theme/common/languages/tr.xml
@@ -98,16 +98,19 @@
 		<string name="successful">Başarılı</string>
 		<string name="install_failed">Yükleme Başarısız</string>
 		<string name="install_successful">Yükleme Başarılı</string>
-		<string name="wipe_cache_dalvik_btn">Cache/dalvik temizle</string>
+		<string name="wipe_cache_dalvik_btn">Önbellek/Dalvik Temizle</string>
+		<string name="wipe_dalvik_btn">Dalvik Temizle</string>
 		<string name="reboot_system_btn">Sistemi Yeniden Başlat</string>
 		<string name="install_sel_target">Hedef Bölümü Seç</string>
-		<string name="flash_image_select">İmajı Flashlamak için Bölüm Seç:</string>
+		<string name="flash_image_select">İmajı Flashlamak için Bölüm Seçin:</string>
 		<string name="target_partition">Hedef Bölüm:</string>
 		<string name="flashing_image">İmaj Flashlanıyor...</string>
 		<string name="image_flashed">İmaj Flashlandı</string>
 		<string name="wipe_cache_dalvik_confirm">Önbellek ve Dalvik temizlensin mi?</string>
+		<string name="wipe_dalvik_confirm">Dalvik temizlensin mi?</string>
 		<string name="wiping_cache_dalvik">Önbellek ve Dalvik temizleniyor...</string>
 		<string name="wipe_cache_dalvik_complete">Önbellek ve Dalvik temizliği tamamlandı</string>
+		<string name="wipe_dalvik_complete">Dalvik Temizliği Tamamlandı</string>
 		<string name="swipe_wipe">Temizlemek için Kaydır</string>
 		<string name="swipe_wipe_s">   Temizle</string>
 		<string name="no_os1">İşletim Sistemi yüklü değil!</string>
@@ -119,9 +122,13 @@
 		<string name="reboot_install_app_hdr">TWRP Uygulaması yüklensin mi?</string>
 		<string name="reboot_install_app1">Resmi TWRP Uygulamasını yüklemek ister misiniz?</string>
 		<string name="reboot_install_app2">Uygulama, yeni TWRP sürümlerini kontrol edebilir.</string>
-		<string name="reboot_install_app_prompt_install">Yüklü değilse, TWRP uygulamasını yüklemek için sor</string>
+		<string name="reboot_install_app_prompt_install">Yüklü değilse TWRP uygulamasını yüklemeyi sor</string>
 		<string name="reboot_install_app_system">Sistem Uygulaması olarak yükle</string>
 		<string name="reboot_installing_app">Uygulama yükleniyor...</string>
+		<string name="uninstall_twrp_system_app">TWRP Uygulamasını Sistemden kaldır</string>
+		<string name="uninstall_twrp_system_app_confirm">TWRP Uygulaması Sistemden kaldırılsın mı?</string>
+		<string name="uninstalling_twrp_system_app">TWRP Uygulaması Sistemden kaldırılıyor...</string>
+		<string name="uninstall_twrp_system_app_complete">TWRP Uygulamasını Sistemden Kaldırma Tamamlandı</string>
 		<string name="swipe_to_install_app">TWRP Uygulamasını yüklemek için kaydır</string>
 		<string name="swipe_flash">Flashlamayı onaylamak için kaydır</string>
 		<string name="confirm_action">Eylemi Onayla</string>
@@ -130,7 +137,7 @@
 		<string name="wipe_hdr">Temizle</string>
 		<string name="factory_reset_hdr">Sıfırla</string>
 		<string name="factory_reset_btn">Sıfırla</string>
-		<string name="factory_reset1">Veriyi, Önbelleği, ve Dalvik'i temizler</string>
+		<string name="factory_reset1">Veriyi, Önbelleği ve Dalvik'i temizler</string>
 		<string name="factory_reset2">(dahili depolama hariç)</string>
 		<string name="factory_reset3">Çoğu zaman ihtiyacınız olan</string>
 		<string name="factory_reset4">tek temizlik budur.</string>
@@ -151,10 +158,10 @@
 		<string name="format_data_hdr">Veriyi Biçimlendir</string>
 		<string name="format_data_btn">Veriyi Biçimlendir</string>
 		<string name="format_data_ptr1">Veriyi biçimlendirmek tüm uygulamalarınızı,</string>
-		<string name="format_data_ptr2">yedeklerinizi, resimlerinizi, videolarınızı, medyanızı, temizleyecek ve</string>
+		<string name="format_data_ptr2">yedeklerinizi, resimlerinizi, videolarınızı, medyanızı temizleyecek ve</string>
 		<string name="format_data_ptr3">dahili depolama üzerindeki şifrelemeyi kaldıracak.</string>
 		<string name="format_data_adopted">Kabul Edilen Depolama Dahil</string>
-		<string name="format_data_lcp1">Veriyi biçimlendirmek tüm uygulamalarınızı, yedeklerinizi, resimlerinizi, videolarınızı, medyanızı, temizleyecek ve</string>
+		<string name="format_data_lcp1">Veriyi biçimlendirmek tüm uygulamalarınızı, yedeklerinizi, resimlerinizi, videolarınızı, medyanızı temizleyecek ve</string>
 		<string name="format_data_lcp2">dahili depolama üzerindeki şifrelemeyi kaldıracak.</string>
 		<string name="format_data_wtc1">Veriyi biçimlendirmek tüm uygulamalarınızı,</string>
 		<string name="format_data_wtc2">yedeklerinizi ve medyanızı temizleyecek. Bu işlem geri alınamaz.</string>
@@ -211,13 +218,13 @@
 		<string name="encryption_tab">ŞİFRELEME</string>
 		<string name="encryption">Şifreleme:</string>
 		<string name="name">Ad:</string>
-		<string name="sel_part_backup">Yedeklenecek Bölümleri Seç:</string>
+		<string name="sel_part_backup">Yedeklenecek Bölümleri Seçin:</string>
 		<string name="storage">Depolama:</string>
 		<string name="enc_disabled">devre dışı - etkinleştirmek için bir şifre ayarlayın</string>
 		<string name="enc_enabled">etkin</string>
 		<string name="enable_backup_comp_chk">Sıkıştırmayı etkinleştir</string>
 		<string name="skip_digest_backup_chk" version="2">Yedekleme sırasında Digest oluşturmayı geç</string>
-		<string name="disable_backup_space_chk" version="2">Yedeklemeden önce boş alan denetimini devre dışı bırak</string>
+		<string name="disable_backup_space_chk" version="2">Yedeklemeden önce boş alan kontrolünü devre dışı bırak</string>
 		<string name="current_boot_slot">Geçerli Yuva: %tw_active_slot%</string>
 		<string name="boot_slot_a">A Yuvası</string>
 		<string name="boot_slot_b">B Yuvası</string>
@@ -228,7 +235,7 @@
 		<string name="append_date_btn">Tarih Ekle</string>
 		<string name="backup_name_exists">Bu adda bir yedek zaten var!</string>
 		<string name="encrypt_backup">Yedeklemeniz şifrelensin mi?</string>
-		<string name="enter_pass">Şifre Gir:</string>
+		<string name="enter_pass">Şifreyi Girin:</string>
 		<string name="enter_pass2">Şifreyi Tekrar Girin:</string>
 		<string name="pass_not_match">Şifreler eşleşmiyor!</string>
 		<string name="partitions">Bölümler:</string>
@@ -253,7 +260,7 @@
 		<string name="restore_try_decrypt">Şifreli Yedek - Çözülmeye Çalışılıyor</string>
 		<string name="restore_try_decrypt_s">Çözülmeye Çalışılıyor</string>
 		<string name="restore_backup_date">Yedek tarihi: %tw_restore_file_date%</string>
-		<string name="restore_sel_part">Geri Yüklenecek Bölümleri Seç:</string>
+		<string name="restore_sel_part">Geri Yüklenecek Bölümleri Seçin:</string>
 		<string name="restore_enable_digest_chk" version="2">Yedek Dosyalarının Digest Doğrulamasını etkinleştir</string>
 		<string name="restore_complete">Geri Yükleme Tamamlandı</string>
 		<string name="swipe_restore">Geri Yüklemek için Kaydır</string>
@@ -267,7 +274,7 @@
 		<string name="swipe_rename">   Yeniden Adlandır</string>
 		<string name="confirm_hdr">Onayla</string>
 		<string name="mount_hdr">Bağla</string>
-		<string name="mount_sel_part">Bağlanacak Bölümleri Seç:</string>
+		<string name="mount_sel_part">Bağlanacak Bölümleri Seçin:</string>
 		<string name="mount_sys_ro_chk">Sistem bölümünü salt okunur bağla</string>
 		<string name="mount_sys_ro_s_chk">Sistemi RO Bağla</string>
 		<string name="decrypt_data_btn">Veri Şifresini Çöz</string>
@@ -319,10 +326,11 @@
 		<string name="settings_tz_btn">Zaman Dilimi</string>
 		<string name="settings_screen_btn">Ekran</string>
 		<string name="settings_screen_bright_btn">Ekran Parlaklığı</string>
+		<string name="vibration_disabled">Bu cihaz için titreşim devre dışı</string>
 		<string name="settings_vibration_btn">Titreşim</string>
 		<string name="settings_language_btn">Dil</string>
 		<string name="time_zone_hdr">Zaman Dilimi</string>
-		<string name="sel_tz_list">Zaman Dilimi Seç:</string>
+		<string name="sel_tz_list">Zaman Dilimi Seçin:</string>
 		<!-- Translator note: if it does not make sense to translate the locations or if it makes more sense,
 				feel free to change the location listed or drop the location entirely and just call it UTC -6 -->
 		<string name="utcm11">(UTC -11) Samoa, Midway Adası</string>
@@ -374,7 +382,7 @@
 		<string name="button_vibration">Düğme Titreşimi:</string>
 		<string name="kb_vibration">Klavye Titreşimi:</string>
 		<string name="act_vibration">Eylem Titreşimi:</string>
-		<string name="select_language">Dil Seç:</string>
+		<string name="select_language">Dil Seçin:</string>
 		<string name="sel_lang_btn">Dil Seç</string>
 		<string name="set_language_btn">Dili Ayarla</string>
 		<string name="advanced_hdr">Gelişmiş</string>
@@ -424,10 +432,10 @@
 		<string name="swipe_to_unlock">Kilidi Açmak için Kaydır</string>
 		<string name="swipe_unlock">   Kilidi Aç</string>
 		<string name="fm_hdr">Dosya Yöneticisi</string>
-		<string name="fm_sel_file">Bir Dosya veya Klasör Seçin</string>
+		<string name="fm_sel_file">Bir Dosya veya Klasör Seç</string>
 		<string name="fm_type_folder">Klasör</string>
 		<string name="fm_type_file">Dosya</string>
-		<string name="fm_choose_act">Eylem Seçin</string>
+		<string name="fm_choose_act">Eylem Seç</string>
 		<string name="fm_selected">%tw_fm_type% seçili:</string>
 		<string name="fm_copy_btn">Kopyala</string>
 		<string name="fm_copy_file_btn">Dosyayı Kopyala</string>
@@ -444,7 +452,7 @@
 		<string name="fm_rename_file_btn">Dosyayı Yeniden Adlandır</string>
 		<string name="fm_rename_folder_btn">Klasörü Yeniden Adlandır</string>
 		<string name="fm_renaming">Yeniden Adlandır</string>
-		<string name="fm_sel_dest">Hedef Klasörü Seçin</string>
+		<string name="fm_sel_dest">Hedef Klasörü Seç</string>
 		<string name="fm_sel_curr_folder">Geçerli Klasörü Seç</string>
 		<string name="fm_rename_hdr">Yeniden Adlandır</string>
 		<string name="fm_set_perms_hdr">İzinleri Ayarla</string>
@@ -481,6 +489,28 @@
 		<string name="install_cancel">Yükleme</string>
 		<string name="sel_storage_list">Depolama Seç</string>
 		<string name="ok_btn">Tamam</string>
+		<string name="install_twrp_ramdisk">Recovery Ramdisk Yükle</string>
+		<string name="install_kernel">Kernel Yükle</string>
+		<string name="repack_kernel_confirm_hdr">Kernel Yükle</string>
+		<string name="repack_ramdisk_confirm_hdr">Recovery Yükle</string>
+		<string name="repack_kernel_confirm">Kernel Yüklensin mi?</string>
+		<string name="repack_ramdisk_confirm">Recovery Yüklensin mi?</string>
+		<string name="repack_backup_first">Önce geçerli imajı yedekle</string>
+		<string name="repack">Yeniden paketle</string>
+		<string name="swipe_to_install">Yüklemek için Kaydır</string>
+		<string name="installing">Yükleniyor...</string>
+		<string name="install_complete">Yükleme Tamamlandı</string>
+		<string name="unpack_error">İmaj açılırken hata oluştu.</string>
+		<string name="repack_error">İmajı yeniden paketleme hatası.</string>
+		<string name="unpacking_image">{1} açılıyor...</string>
+		<string name="repacking_image">{1} yeniden paketleniyor...</string>
+		<string name="repack_image_hdr">İmaj Seç</string>
+		<string name="fix_recovery_loop">Recovery Bootloop'unu Onar</string>
+		<string name="fix_recovery_loop_confirm">Recovery Bootloop'u Onarılsın mı?</string>
+		<string name="fixing_recovery_loop">Recovery Bootloop'u Onarılıyor...</string>
+		<string name="fix_recovery_loop_complete">Recovery Bootloop'unu Onarma Tamamlandı</string>
+		<string name="fixing_recovery_loop_patch">Kernel yamalanıyor...</string>
+		<string name="fix_recovery_loop_patch_error">Kernel yamalama hatası.</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Kernel SELinux içeriklerini okuma desteğine sahip değil.</string>
@@ -510,7 +540,7 @@
 		<string name="backup_folder"> * Yedekleme Klasörü: {1}</string>
 		<string name="fail_backup_folder">Yedekleme klasörü oluşturulamadı.</string>
 		<string name="avg_backup_fs">Dosya sistemleri için ortalama yedekleme hızı: {1} MB/sn</string>
-		<string name="avg_backup_img">Görüntülü sürücüler için ortalama yedekleme hızı: {1} MB/sn</string>
+		<string name="avg_backup_img">İmajlı sürücüler için ortalama yedekleme hızı: {1} MB/sn</string>
 		<string name="total_backed_size">[{1} MB YEDEKLENDİ]</string>
 		<string name="backup_completed">[YEDEKLEME {1} SANİYEDE TAMAMLANDI]</string>
 		<string name="restore_started">[GERİ YÜKLEME BAŞLATILDI]</string>
@@ -518,7 +548,7 @@
 		<!-- {1} is the partition display name and {2} is the number of seconds -->
 		<string name="restore_part_done">[{1} bitti ({2} saniye)]</string>
 		<string name="verifying_digest" version="2">Digest Doğrulanıyor</string>
-		<string name="skip_digest" version="2">Kullanıcı ayarına göre Digest denetimi geçiliyor.</string>
+		<string name="skip_digest" version="2">Kullanıcı ayarına göre Digest kontrolü geçiliyor.</string>
 		<string name="calc_restore">Geri yükleme ayrıntıları hesaplanıyor...</string>
 		<string name="restore_read_only">{1} geri yüklenemiyor -- salt okunur bağlanmış.</string>
 		<string name="restore_unable_locate">Geri yüklemek için \'{1}\' bölümü bulunamıyor.</string>
@@ -533,9 +563,10 @@
 		<string name="unable_find_part_path">\'{1}\' yolu için bölüm bulunamıyor</string>
 		<string name="update_part_details">Bölüm ayrıntıları güncelleniyor...</string>
 		<string name="update_part_details_done">...bitti</string>
-		<string name="wiping_dalvik">Dalvik Önbelleği Dizinleri Temizleniyor...</string>
+		<string name="wiping_dalvik">Dalvik Dizinleri Temizleniyor...</string>
 		<string name="cleaned">Temizlendi: {1}...</string>
-		<string name="dalvik_done">-- Dalvik Önbelleği Dizinleri Temizleme Tamamlandı!</string>
+		<string name="cache_dalvik_done">-- Dalvik Önbelleği Dizinleri Temizleme Tamamlandı!</string>
+		<string name="dalvik_done">-- Dalvik Dizinleri Temizleme Tamamlandı!</string>
 		<string name="no_andsec">Android secure bölümü yok.</string>
 		<string name="unable_to_locate">{1} bulunamıyor.</string>
 		<string name="wiping_datamedia">Dahili depolama temizleniyor -- /data/media...</string>
@@ -603,7 +634,7 @@
 		<string name="backup_folder_set">Yedekleme klasörü '{1}' olarak ayarlandı</string>
 		<string name="locate_backup_err">'{1}' yedeği bulunamadı</string>
 		<string name="set_restore_opt">Geri yükleme seçeneklerini ayarlama: '{1}':</string>
-		<string name="digest_check_skip" version="2">Digest denetimini atlama açık</string>
+		<string name="digest_check_skip" version="2">Digest kontrolünü atlama açık</string>
 		<string name="ors_encrypt_restore_err">Şifrelenmiş bir yedeklemeyi geri yüklemek için OpenRecoveryScript kullanılamıyor.</string>
 		<string name="mounting">Bağlanıyor</string>
 		<string name="unmounting">Kaldırılıyor</string>
@@ -638,7 +669,7 @@
 		<string name="verify_zip_fail">Zip imzası doğrulama başarısız oldu!</string>
 		<string name="verify_zip_done">Zip imzası başarıyla doğrulandı.</string>
 		<string name="zip_corrupt">Zip dosyası bozuk!</string>
-		<string name="no_digest" version="2">Digest denetimi geçiliyor: Digest dosyası bulunamadı</string>
+		<string name="no_digest" version="2">Digest kontrolü geçiliyor: Digest dosyası bulunamadı</string>
 		<string name="digest_fail" version="2">Digest eşleşmiyor</string>
 		<string name="digest_match" version="2">Digest eşleşti</string>
 		<string name="pid_signal">{1} process ended with signal: {2}</string>

From ec350e9d0d9959e22647845011d7b2dc8075589d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 11 Mar 2020 19:19:12 +0100
Subject: [PATCH 045/207] init: ueventd already needs /acct

Change-Id: Ifae7078aedc1a520ee003160fb17c8893041cb09
---
 etc/init.rc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/etc/init.rc b/etc/init.rc
index e0889c44d5..fc32bb8953 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -17,6 +17,10 @@ on early-init
     # Set the security context of /postinstall if present.
     restorecon /postinstall
 
+    # ueventd wants to write to /acct
+    mount cgroup none /acct cpuacct
+    mkdir /acct/uid
+
     start ueventd
 
 service set_permissive /sbin/permissive.sh
@@ -31,9 +35,6 @@ on init
     export ANDROID_DATA /data
     export EXTERNAL_STORAGE /sdcard
 
-    mount cgroup none /acct cpuacct
-    mkdir /acct/uid
-
     mkdir /system
     mkdir /data
     mkdir /cache

From 77a31917f2817d3f147dc6e727f52d537e11fe4d Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Tue, 21 Apr 2020 18:56:44 +0530
Subject: [PATCH 046/207] partitionmanager: Unmount all directories mounted to
 same block

 * Like Xiaomi's some older devices uses cust as vendor and also mounts cust & vendor simultanously

 * This patch will unmount all directories mounted to same block

Change-Id: Ic242e267a470b4d82098d847f74b807a461605c4
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 partitionmanager.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index b265469801..3c2b1c65e6 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1285,6 +1285,7 @@ void TWPartitionManager::Set_Restore_Files(string Restore_Name) {
 
 int TWPartitionManager::Wipe_By_Path(string Path) {
 	std::vector<TWPartition*>::iterator iter;
+	std::vector < TWPartition * >::iterator iter1;
 	int ret = false;
 	bool found = false;
 	string Local_Path = TWFunc::Get_Root_Path(Path);
@@ -1292,6 +1293,14 @@ int TWPartitionManager::Wipe_By_Path(string Path) {
 	// Iterate through all partitions
 	for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
 		if ((*iter)->Mount_Point == Local_Path || (!(*iter)->Symlink_Mount_Point.empty() && (*iter)->Symlink_Mount_Point == Local_Path)) {
+			// iterate through all partitions since some legacy devices uses other partitions as vendor causes issues while wiping
+			(*iter)->Find_Actual_Block_Device();
+			for (iter1 = Partitions.begin (); iter1 != Partitions.end (); iter1++)
+			{
+				(*iter1)->Find_Actual_Block_Device();
+				if ((*iter)->Actual_Block_Device == (*iter1)->Actual_Block_Device && (*iter)->Mount_Point != (*iter1)->Mount_Point)
+					(*iter1)->UnMount(false);
+			}
 			if (Path == "/and-sec")
 				ret = (*iter)->Wipe_AndSec();
 			else

From 76ef9f3c0492e1601a2b4dd4de38eff672ca2274 Mon Sep 17 00:00:00 2001
From: mauronofrio <poronofrio@gmail.com>
Date: Mon, 23 Dec 2019 20:29:24 +0100
Subject: [PATCH 047/207] Create a flag to include resetprop in the TWRP

The flag is:
TW_INCLUDE_RESETPROP := true

Change-Id: I4d4d25a6d5bbd2330efd7f184d0f878a8cf0346e
---
 prebuilt/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index d330799942..872deaa6e0 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -577,9 +577,9 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
     endif
 endif
 
-ifeq ($(TW_INCLUDE_REPACKTOOLS), true)
+ifneq (,$(filter $(TW_INCLUDE_REPACKTOOLS) $(TW_INCLUDE_RESETPROP), true))
     ifeq ($(wildcard external/magisk-prebuilt/Android.mk),)
-        $(warning Magisk repacking tools not found!)
+        $(warning Magisk prebuilt tools not found!)
         $(warning Please place https://github.com/TeamWin/external_magisk-prebuilt)
         $(warning into external/magisk-prebuilt)
         $(error magiskboot prebuilts not present; exiting)

From 58f1a63767497a269fc616cc40582801b63c71c6 Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Thu, 16 Jan 2020 23:03:56 +0800
Subject: [PATCH 048/207] Properly detect system-as-root

ANDROID_ROOT environment variable is also used by other Android
components thus it should ALWAYS be /system in order not to break other
tools. On the other hand, AOSP does have a system property to indicate
system-as-root, just make use of it.

Change-Id: I7fc58a78db7abd05fac9000910169c370f5de62d
---
 partitionmanager.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 3c2b1c65e6..141576f589 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2840,10 +2840,9 @@ string TWPartitionManager::Get_Active_Slot_Display() {
 }
 
 string TWPartitionManager::Get_Android_Root_Path() {
-	std::string Android_Root = getenv("ANDROID_ROOT");
-	if (Android_Root == "")
-		Android_Root = "/system";
-	return Android_Root;
+	if (property_get_bool("ro.build.system_root_image", false))
+		return "/system_root";
+	return "/system";
 }
 
 void TWPartitionManager::Remove_Uevent_Devices(const string& Mount_Point) {

From 3b6827372e4313ebc1304597472f3235deda01d5 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Sat, 25 Jan 2020 21:09:28 +0100
Subject: [PATCH 049/207] Set system-partition mount point to proper location

This sets the system mount point to either /system_root or /system
depending on whether SAR is detected or not irregardless of what
is specified in fstab.

This removes the need to edit fstab for SAR-builds and simplifies
building unified (SAR/non-SAR) builds.

Change-Id: I154fd76f842702be9e5d09005463c8e5f1d289a4
---
 partition.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/partition.cpp b/partition.cpp
index beb4a81dbf..9012d497e2 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -436,7 +436,10 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 	} else if (Is_File_System(Fstab_File_System)) {
 		Find_Actual_Block_Device();
 		Setup_File_System(Display_Error);
-		if (Mount_Point == PartitionManager.Get_Android_Root_Path()) {
+		if (Mount_Point == "/" || Mount_Point == "/system" || Mount_Point == "/system_root") {
+			Mount_Point = PartitionManager.Get_Android_Root_Path();
+			Backup_Path = Mount_Point;
+			Storage_Path = Mount_Point;
 			Display_Name = "System";
 			Backup_Display_Name = Display_Name;
 			Storage_Name = Display_Name;

From 3b3b634365f907bb94c0bcd72aac7013ee2eb0e8 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Sat, 25 Jan 2020 22:51:54 +0100
Subject: [PATCH 050/207] ORS Make mount/unmount system mount system_root on
 SAR

Change-Id: Ibf8d4d61e6cbb132786f5f9aa23ec91b49bcab89
---
 openrecoveryscript.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index 1de087075b..6d762986dc 100755
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -301,6 +301,8 @@ int OpenRecoveryScript::run_script_file(void) {
 					strcat(mount, value);
 				} else
 					strcpy(mount, value);
+				if (!strcmp(mount, "/system"))
+					strcpy(mount, PartitionManager.Get_Android_Root_Path().c_str());
 				if (PartitionManager.Mount_By_Path(mount, true))
 					gui_msg(Msg("mounted=Mounted '{1}'")(mount));
 			} else if (strcmp(command, "unmount") == 0 || strcmp(command, "umount") == 0) {
@@ -311,6 +313,8 @@ int OpenRecoveryScript::run_script_file(void) {
 					strcat(mount, value);
 				} else
 					strcpy(mount, value);
+				if (!strcmp(mount, "/system"))
+					strcpy(mount, PartitionManager.Get_Android_Root_Path().c_str());
 				if (PartitionManager.UnMount_By_Path(mount, true))
 					gui_msg(Msg("unmounted=Unounted '{1}'")(mount));
 			} else if (strcmp(command, "set") == 0) {

From ff4f958182e710c64143d876b8ccc40259d2bea8 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Sun, 26 Jan 2020 15:38:11 +0100
Subject: [PATCH 051/207] Add option to automatically unmount system before
 installing ZIP

This adds the option to automatically unmount the system partition
before installing a ZIP-file.
This option is enabled by default, This is usefull on SAR-devices
where system is mounted as system_root and ZIPs (i.e. Magisk)
try to unmount system instead of system_root and fail to install.

Change-Id: Id94ae658964679e23aa7fa137e07edf74ee073df
---
 data.cpp                          |  1 +
 gui/theme/common/landscape.xml    |  3 +++
 gui/theme/common/languages/en.xml |  3 +++
 gui/theme/common/portrait.xml     |  3 +++
 gui/theme/common/watch.xml        |  3 +++
 twinstall.cpp                     | 12 +++++++++++-
 variables.h                       |  1 +
 7 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/data.cpp b/data.cpp
index 088dbda68a..b1e8404b30 100755
--- a/data.cpp
+++ b/data.cpp
@@ -783,6 +783,7 @@ void DataManager::SetDefaultValues()
 #else
 	mPersist.SetValue(TW_NO_SHA2, "1");
 #endif
+	mPersist.SetValue(TW_UNMOUNT_SYSTEM, "1");
 
 #ifdef TW_NO_SCREEN_TIMEOUT
 	mConst.SetValue("tw_screen_timeout_secs", "0");
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 8244c461ed..230b72f7b8 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2937,6 +2937,9 @@
 					<condition var1="tw_no_sha2" var2="0"/>
 					<data variable="tw_use_sha2"/>
 				</listitem>
+				<listitem name="{@unmount_sys_install=Unmount System before installing a ZIP}">
+					<data variable="tw_unmount_system"/>
+				</listitem>
 			</listbox>
 
 			<checkbox>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 4a0ac7fdce..3769da5057 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -719,5 +719,8 @@
 		<string name="include_kernel_log">Include Kernel Log</string>
 		<string name="sha2_chk">Use SHA2 for hashing</string>
 		<string name="unable_set_boot_slot">Error changing bootloader boot slot to {1}</string>
+		<string name="unmount_sys_install">Unmount System before installing a ZIP</string>
+		<string name="unmount_system">Unmounting System...</string>
+		<string name="unmount_system_err">Failed unmounting System</string>
 	</resources>
 </language>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index e014cc53ae..8370414640 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3150,6 +3150,9 @@
 					<condition var1="tw_no_sha2" var2="0"/>
 					<data variable="tw_use_sha2"/>
 				</listitem>
+				<listitem name="{@unmount_sys_install=Unmount System before installing a ZIP}">
+					<data variable="tw_unmount_system"/>
+				</listitem>
 			</listbox>
 
 			<button style="main_button_half_height">
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index f5d32228d3..05b7bd2490 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -3640,6 +3640,9 @@
 					<condition var1="tw_no_sha2" var2="0"/>
 					<data variable="tw_use_sha2"/>
 				</listitem>
+				<listitem name="{@unmount_sys_install=Unmount System before installing a ZIP}">
+					<data variable="tw_unmount_system"/>
+				</listitem>
 			</listbox>
 
 			<action>
diff --git a/twinstall.cpp b/twinstall.cpp
index d659b47b10..92af497d36 100755
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -339,7 +339,7 @@ static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zi
 }
 
 int TWinstall_zip(const char* path, int* wipe_cache) {
-	int ret_val, zip_verify = 1;
+	int ret_val, zip_verify = 1, unmount_system = 1;
 
 	if (strcmp(path, "error") == 0) {
 		LOGERR("Failed to get adb sideload file: '%s'\n", path);
@@ -359,6 +359,8 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 		}
 	}
 
+	DataManager::GetValue(TW_UNMOUNT_SYSTEM, unmount_system);
+
 #ifndef TW_OEM_BUILD
 	DataManager::GetValue(TW_SIGNED_ZIP_VERIFY_VAR, zip_verify);
 #endif
@@ -410,6 +412,14 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 		return INSTALL_CORRUPT;
 	}
 
+	if (unmount_system) {
+		gui_msg("unmount_system=Unmounting System...");
+		if(!PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), true)) {
+			gui_err("unmount_system_err=Failed unmounting System");
+			return -1;
+		}
+	}
+
 	time_t start, stop;
 	time(&start);
 	if (Zip.EntryExists(ASSUMED_UPDATE_BINARY_NAME)) {
diff --git a/variables.h b/variables.h
index 76da715dab..24cde92bd1 100644
--- a/variables.h
+++ b/variables.h
@@ -140,6 +140,7 @@
 #define TW_MILITARY_TIME            "tw_military_time"
 #define TW_USE_SHA2                 "tw_use_sha2"
 #define TW_NO_SHA2                  "tw_no_sha2"
+#define TW_UNMOUNT_SYSTEM           "tw_unmount_system"
 
 // Also used:
 //   tw_boot_is_mountable

From da974805672e53c334b71480c5a6bc08f3e16109 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Sun, 26 Jan 2020 21:09:28 +0100
Subject: [PATCH 052/207] Create/Remove system_root/system bind mount, when
 mounting System

This will automatically create and remove a bind mount
/system -> /system_root/system
everytime "System" is mounted via the GUI or ORS.
This should get rid of issues with ZIPs trying to mount
the system-partition to /system on SAR-devices, while keeping
the filesystem-layout in sync with AOSP from a user-perspective.

Change-Id: I7f531d113b07c31b39d8f87edac76a7fc79075e7
---
 partition.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/partition.cpp b/partition.cpp
index 9012d497e2..8d86f69453 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -1528,10 +1528,23 @@ bool TWPartition::Mount(bool Display_Error) {
 		string Command = "mount -o bind '" + Symlink_Path + "' '" + Symlink_Mount_Point + "'";
 		TWFunc::Exec_Cmd(Command);
 	}
+
+	if (Mount_Point == "/system_root") {
+		unlink("/system");
+		mkdir("/system", 0755);
+		mount("/system_root/system", "/system", "auto", MS_BIND, NULL);
+	}
+
 	return true;
 }
 
 bool TWPartition::UnMount(bool Display_Error) {
+	if (Mount_Point == "/system_root") {
+		if (umount("/system") == -1)
+			umount2("/system", MNT_DETACH);
+		rmdir("/system");
+		symlink("/system_root/system", "/system");
+	}
 	if (Is_Mounted()) {
 		int never_unmount_system;
 

From f6e42ce3905f80cc4087bcb7c79d2d6ca11e7eca Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Mon, 27 Jan 2020 00:17:04 +0100
Subject: [PATCH 053/207] Implement autodetection for SAR, based on the
 installed system

This will detect whether SAR is present in the currently installed
OS and set the property ro.twrp.sar accordingly.
After setting the property it will call the bootscript
/sbin/sarsetup.sh (if present) to give device maintainers the
option to do setup operations depending on SAR-status, such
as modifiyng the fstab.

If no system is detected and AB_OTA_UPDATER is defined or built with
Android 10 and upwards, it will fallback to using SAR, otherwise it
will use ro.build.system_root_image as basis for deciding whether SAR
is required or not.

The property ro.twrp.sar will also be used by
TWPartitionManager::Get_Android_Root_Path()

This allows maintaining a single TWRP-build for devices switching
to SAR for Android 10.

The default behavior (when no system is installed)
is determined by the build-flags AB_OTA_UPDATER and
BOARD_BUILD_SYSTEM_ROOT_IMAGE

Change-Id: I2a48c6c81a6ea6fad6e452c06bfbe4d9da0f1e5c
---
 partition.cpp        | 32 ++++++++++++++++++++++++--------
 partitionmanager.cpp | 15 +++++++++++----
 partitions.hpp       |  4 ++--
 twrp.cpp             | 44 +++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/partition.cpp b/partition.cpp
index 8d86f69453..646959c3ed 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -272,7 +272,7 @@ TWPartition::~TWPartition(void) {
 	// Do nothing
 }
 
-bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error, std::map<string, Flags_Map> *twrp_flags) {
+bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error, std::map<string, Flags_Map> *twrp_flags, bool Sar_Detect) {
 	char full_line[MAX_FSTAB_LINE_LENGTH];
 	char twflags[MAX_FSTAB_LINE_LENGTH] = "";
 	char* ptr;
@@ -309,11 +309,12 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 			Mount_Point = ptr;
 			if (fstab_version == 2) {
 				additional_entry = PartitionManager.Find_Partition_By_Path(Mount_Point);
-				if (additional_entry) {
+				if (!Sar_Detect && additional_entry) {
 					LOGINFO("Found an additional entry for '%s'\n", Mount_Point.c_str());
 				}
 			}
-			LOGINFO("Processing '%s'\n", Mount_Point.c_str());
+			if(!Sar_Detect)
+				LOGINFO("Processing '%s'\n", Mount_Point.c_str());
 			Backup_Path = Mount_Point;
 			Storage_Path = Mount_Point;
 			Display_Name = ptr + 1;
@@ -410,7 +411,12 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 	if (Primary_Block_Device.find("*") != string::npos)
 		Wildcard_Block_Device = true;
 
-	if (Mount_Point == "auto") {
+	if (Sar_Detect) {
+		if(Is_File_System(Fstab_File_System) && (Mount_Point == "/" || Mount_Point == "/system" || Mount_Point == "/system_root"))
+			Find_Actual_Block_Device();
+		else
+			return true;
+	} else if (Mount_Point == "auto") {
 		Mount_Point = "/auto";
 		char autoi[5];
 		sprintf(autoi, "%i", auto_index);
@@ -437,9 +443,6 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 		Find_Actual_Block_Device();
 		Setup_File_System(Display_Error);
 		if (Mount_Point == "/" || Mount_Point == "/system" || Mount_Point == "/system_root") {
-			Mount_Point = PartitionManager.Get_Android_Root_Path();
-			Backup_Path = Mount_Point;
-			Storage_Path = Mount_Point;
 			Display_Name = "System";
 			Backup_Display_Name = Display_Name;
 			Storage_Name = Display_Name;
@@ -601,6 +604,19 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 		}
 	}
 
+	if (Is_File_System(Fstab_File_System) && (Mount_Point == "/" || Mount_Point == "/system" || Mount_Point == "/system_root")) {
+		if (Sar_Detect) {
+			Mount_Point = "/s";
+			Mount_Read_Only = true;
+			Can_Be_Mounted = true;
+		} else {
+			Mount_Point = PartitionManager.Get_Android_Root_Path();
+			Backup_Path = Mount_Point;
+			Storage_Path = Mount_Point;
+			Make_Dir(Mount_Point, Display_Error);
+		}
+	}
+
 	return true;
 }
 
@@ -2911,7 +2927,7 @@ bool TWPartition::Find_Wildcard_Block_Devices(const string& Device) {
 		TWPartition *part = new TWPartition;
 		char buffer[MAX_FSTAB_LINE_LENGTH];
 		sprintf(buffer, "%s %s-%i auto defaults defaults", item.c_str(), Mount_Point.c_str(), ++mount_point_index);
-		part->Process_Fstab_Line(buffer, false, NULL);
+		part->Process_Fstab_Line(buffer, false, NULL, false);
 		char display[MAX_FSTAB_LINE_LENGTH];
 		sprintf(display, "%s %i", Storage_Name.c_str(), mount_point_index);
 		part->Storage_Name = display;
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 141576f589..f63b3f3ef7 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -111,7 +111,7 @@ TWPartitionManager::TWPartitionManager(void) {
 #endif
 }
 
-int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error) {
+int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error, bool Sar_Detect) {
 	FILE *fstabFile;
 	char fstab_line[MAX_FSTAB_LINE_LENGTH];
 	TWPartition* settings_partition = NULL;
@@ -198,7 +198,7 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error)
 			fstab_line[line_size] = '\n';
 
 		TWPartition* partition = new TWPartition();
-		if (partition->Process_Fstab_Line(fstab_line, Display_Error, &twrp_flags))
+		if (partition->Process_Fstab_Line(fstab_line, Display_Error, &twrp_flags, Sar_Detect))
 			Partitions.push_back(partition);
 		else
 			delete partition;
@@ -213,7 +213,7 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error)
 		for (std::map<string, Flags_Map>::iterator mapit=twrp_flags.begin(); mapit!=twrp_flags.end(); mapit++) {
 			if (Find_Partition_By_Path(mapit->first) == NULL) {
 				TWPartition* partition = new TWPartition();
-				if (partition->Process_Fstab_Line(mapit->second.fstab_line, Display_Error, NULL))
+				if (partition->Process_Fstab_Line(mapit->second.fstab_line, Display_Error, NULL, Sar_Detect))
 					Partitions.push_back(partition);
 				else
 					delete partition;
@@ -227,6 +227,13 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error)
 
 	std::vector<TWPartition*>::iterator iter;
 	for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
+		if (Sar_Detect) {
+			if ((*iter)->Mount_Point == "/s")
+				return true;
+			else
+				continue;
+		}
+
 		(*iter)->Partition_Post_Processing(Display_Error);
 
 		if ((*iter)->Is_Storage) {
@@ -2840,7 +2847,7 @@ string TWPartitionManager::Get_Active_Slot_Display() {
 }
 
 string TWPartitionManager::Get_Android_Root_Path() {
-	if (property_get_bool("ro.build.system_root_image", false))
+	if (property_get_bool("ro.twrp.sar", false))
 		return "/system_root";
 	return "/system";
 }
diff --git a/partitions.hpp b/partitions.hpp
index 4071b942c0..92970d92f1 100644
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -178,7 +178,7 @@ class TWPartition
 	void Setup_Data_Media();                                                  // Sets up a partition as a /data/media emulated storage partition
 
 private:
-	bool Process_Fstab_Line(const char *fstab_line, bool Display_Error, std::map<string, Flags_Map> *twrp_flags); // Processes a fstab line
+	bool Process_Fstab_Line(const char *fstab_line, bool Display_Error, std::map<string, Flags_Map> *twrp_flags, bool Sar_Detect); // Processes a fstab line
 	void Setup_Data_Partition(bool Display_Error);                            // Setup data partition after fstab processed
 	void Setup_Cache_Partition(bool Display_Error);                           // Setup cache partition after fstab processed
 	bool Find_Wildcard_Block_Devices(const string& Device);                   // Searches for and finds wildcard block devices
@@ -305,7 +305,7 @@ class TWPartitionManager
 	~TWPartitionManager() {}
 
 public:
-	int Process_Fstab(string Fstab_Filename, bool Display_Error);             // Parses the fstab and populates the partitions
+	int Process_Fstab(string Fstab_Filename, bool Display_Error, bool Sar_Detect);             // Parses the fstab and populates the partitions
 	int Write_Fstab();                                                        // Creates /etc/fstab file that's used by the command line for mount commands
 	void Output_Partition_Logging();                                          // Outputs partition information to the log
 	void Output_Partition(TWPartition* Part);                                 // Outputs partition details to the log
diff --git a/twrp.cpp b/twrp.cpp
index dac009325c..bb062f700a 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -117,8 +117,50 @@ int main(int argc, char **argv) {
 	if (!TWFunc::Path_Exists(fstab_filename)) {
 		fstab_filename = "/etc/recovery.fstab";
 	}
+
+	// Begin SAR detection
+	{
+		TWPartitionManager SarPartitionManager;
+		printf("=> Processing %s for SAR-detection\n", fstab_filename.c_str());
+		if (!SarPartitionManager.Process_Fstab(fstab_filename, 1, 1)) {
+			LOGERR("Failing out of recovery due to problem with fstab.\n");
+			return -1;
+		}
+
+		mkdir("/s", 0755);
+
+#if defined(AB_OTA_UPDATER) || defined(__ANDROID_API_Q__)
+		bool fallback_sar = true;
+#else
+		bool fallback_sar = property_get_bool("ro.build.system_root_image", false);
+#endif
+
+		if(SarPartitionManager.Mount_By_Path("/s", false)) {
+			if (TWFunc::Path_Exists("/s/build.prop")) {
+				LOGINFO("SAR-DETECT: Non-SAR System detected\n");
+				property_set("ro.twrp.sar", "0");
+				rmdir("/system_root");
+			} else if (TWFunc::Path_Exists("/s/system/build.prop")) {
+				LOGINFO("SAR-DETECT: SAR System detected\n");
+				property_set("ro.twrp.sar", "1");
+			} else {
+				LOGINFO("SAR-DETECT: No build.prop found, falling back to %s\n", fallback_sar ? "SAR" : "Non-SAR");
+				property_set("ro.twrp.sar", fallback_sar ? "1" : "0");
+			}
+			SarPartitionManager.UnMount_By_Path("/s", false);
+		} else {
+			LOGINFO("SAR-DETECT: Could not mount system partition, falling back to %s\n", fallback_sar ? "SAR":"Non-SAR");
+			property_set("ro.twrp.sar", fallback_sar ? "1" : "0");
+		}
+
+		rmdir("/s");
+
+		TWFunc::check_and_run_script("/sbin/sarsetup.sh", "boot");
+	}
+	// End SAR detection
+
 	printf("=> Processing %s\n", fstab_filename.c_str());
-	if (!PartitionManager.Process_Fstab(fstab_filename, 1)) {
+	if (!PartitionManager.Process_Fstab(fstab_filename, 1, 0)) {
 		LOGERR("Failing out of recovery due to problem with fstab.\n");
 		return -1;
 	}

From 461e39fe89753edba18cc9c3b1571a1ec13c6790 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Fri, 7 Feb 2020 01:48:13 +0100
Subject: [PATCH 054/207] Add TWFunc::Property_Override(name, value) to
 override properties using libresetprop

Change-Id: Ic49e187698c714f8a629d20ceddc40e823555477
---
 Android.mk          | 10 ++++++++++
 prebuilt/Android.mk |  2 +-
 twrp-functions.cpp  | 13 +++++++++++++
 twrp-functions.hpp  |  1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 31a697d882..4dc79081e5 100755
--- a/Android.mk
+++ b/Android.mk
@@ -398,6 +398,16 @@ endif
 ifneq ($(TW_CLOCK_OFFSET),)
 	LOCAL_CFLAGS += -DTW_CLOCK_OFFSET=$(TW_CLOCK_OFFSET)
 endif
+ifneq ($(TW_OVERRIDE_SYSTEM_PROPS),)
+    TW_INCLUDE_LIBRESETPROP := true
+    LOCAL_CFLAGS += -DTW_OVERRIDE_SYSTEM_PROPS=$(TW_OVERRIDE_SYSTEM_PROPS)
+endif
+ifneq ($(TW_INCLUDE_LIBRESETPROP),)
+    LOCAL_SHARED_LIBRARIES += libresetprop
+    LOCAL_C_INCLUDES += external/magisk-prebuilt/include
+    LOCAL_CFLAGS += -DTW_INCLUDE_LIBRESETPROP
+endif
+
 TWRP_REQUIRED_MODULES += \
     dump_image \
     erase_image \
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 872deaa6e0..788068d853 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -577,7 +577,7 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
     endif
 endif
 
-ifneq (,$(filter $(TW_INCLUDE_REPACKTOOLS) $(TW_INCLUDE_RESETPROP), true))
+ifneq (,$(filter $(TW_INCLUDE_REPACKTOOLS) $(TW_INCLUDE_RESETPROP) $(TW_INCLUDE_LIBRESETPROP), true))
     ifeq ($(wildcard external/magisk-prebuilt/Android.mk),)
         $(warning Magisk prebuilt tools not found!)
         $(warning Please place https://github.com/TeamWin/external_magisk-prebuilt)
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index a3e5a07385..40d0549c49 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -59,6 +59,10 @@ extern "C" {
 	#include "libcrecovery/common.h"
 }
 
+#ifdef TW_INCLUDE_LIBRESETPROP
+    #include <resetprop.h>
+#endif
+
 struct selabel_handle *selinux_handle;
 
 /* Execute a command */
@@ -1315,4 +1319,13 @@ bool TWFunc::Is_TWRP_App_In_System() {
 	DataManager::SetValue("tw_app_installed_in_system", 0);
 	return false;
 }
+
+int TWFunc::Property_Override(string Prop_Name, string Prop_Value) {
+#ifdef TW_INCLUDE_LIBRESETPROP
+    return setprop(Prop_Name.c_str(), Prop_Value.c_str(), false);
+#else
+    return -2;
+#endif
+}
+
 #endif // ndef BUILD_TWRPTAR_MAIN
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 8cea321b54..3e4e8079a8 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -107,6 +107,7 @@ class TWFunc
 	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
+	static int Property_Override(string Prop_Name, string Prop_Value); // Override properties (including ro. properties)
 
 private:
 	static void Copy_Log(string Source, string Destination);

From 01a17998da063cdbba6305d00a3e282eb2d8d9fe Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Sat, 8 Feb 2020 00:10:05 +0100
Subject: [PATCH 055/207] Add flag for overwriting properties with system
 values

This adds the flag TW_OVERRIDE_SYSTEM_PROPS which can contain
a ";" separated list of properties that should be overriden.

A different source property can be defined by separating
target and source using "="

Example:

TW_OVERRIDE_SYSTEM_PROPS := "ro.build.product;ro.build.fingerprint=ro.system.build.fingerprint"

This will override ro.build.product with the value of ro.build.product from system/build.prop.
And also override ro.build.fingerprint with the value of ro.system.build.fingerprint.

with their corresponding values from the system partition.

Change-Id: Ibcd3e6ed51fa7f7195ad524e606a2b9542687e55
---
 twrp.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/twrp.cpp b/twrp.cpp
index bb062f700a..f81bdf9152 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -147,6 +147,32 @@ int main(int argc, char **argv) {
 				LOGINFO("SAR-DETECT: No build.prop found, falling back to %s\n", fallback_sar ? "SAR" : "Non-SAR");
 				property_set("ro.twrp.sar", fallback_sar ? "1" : "0");
 			}
+
+// We are doing this here during SAR-detection, since we are mounting the system-partition anyway
+// This way we don't need to remount it later, just for overriding properties
+#if defined(TW_INCLUDE_LIBRESETPROP) && defined(TW_OVERRIDE_SYSTEM_PROPS)
+			stringstream override_props(EXPAND(TW_OVERRIDE_SYSTEM_PROPS));
+			string current_prop;
+			while (getline(override_props, current_prop, ';')) {
+				string other_prop;
+				if (current_prop.find("=") != string::npos) {
+					other_prop = current_prop.substr(current_prop.find("=") + 1);
+					current_prop = current_prop.substr(0, current_prop.find("="));
+				} else {
+					other_prop = current_prop;
+				}
+				string sys_val = TWFunc::System_Property_Get(other_prop, SarPartitionManager, "/s");
+				if (!sys_val.empty()) {
+					LOGINFO("Overriding %s with value: \"%s\" from system property %s\n", current_prop.c_str(), sys_val.c_str(), other_prop.c_str());
+					int error = TWFunc::Property_Override(current_prop, sys_val);
+					if (error) {
+						LOGERR("Failed overriding property %s, error_code: %d\n", current_prop.c_str(), error);
+					}
+				} else {
+					LOGINFO("Not overriding %s with empty value from system property %s\n", current_prop.c_str(), other_prop.c_str());
+				}
+			}
+#endif
 			SarPartitionManager.UnMount_By_Path("/s", false);
 		} else {
 			LOGINFO("SAR-DETECT: Could not mount system partition, falling back to %s\n", fallback_sar ? "SAR":"Non-SAR");

From 97c4541415f5210ef9cd51ad2c43d65b0f56c664 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Sat, 15 Feb 2020 19:11:45 +0100
Subject: [PATCH 056/207] libresetprop: not available for Android < 7

Change-Id: I5cf384b472e43ee8d380ac08aeed1a8567844d7e
---
 Android.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4dc79081e5..ca204d39e8 100755
--- a/Android.mk
+++ b/Android.mk
@@ -403,9 +403,13 @@ ifneq ($(TW_OVERRIDE_SYSTEM_PROPS),)
     LOCAL_CFLAGS += -DTW_OVERRIDE_SYSTEM_PROPS=$(TW_OVERRIDE_SYSTEM_PROPS)
 endif
 ifneq ($(TW_INCLUDE_LIBRESETPROP),)
-    LOCAL_SHARED_LIBRARIES += libresetprop
-    LOCAL_C_INCLUDES += external/magisk-prebuilt/include
-    LOCAL_CFLAGS += -DTW_INCLUDE_LIBRESETPROP
+    ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0)
+        $(warning libresetprop is not available for android < 7)
+    else
+        LOCAL_SHARED_LIBRARIES += libresetprop
+        LOCAL_C_INCLUDES += external/magisk-prebuilt/include
+        LOCAL_CFLAGS += -DTW_INCLUDE_LIBRESETPROP
+    endif
 endif
 
 TWRP_REQUIRED_MODULES += \

From 0d9a62e40926a4e89c7c1e0b0ea72ce5e0350e46 Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Thu, 20 Feb 2020 00:10:26 +0530
Subject: [PATCH 057/207] Remove Extra spaces occured while using multiline
 string variable

 * On multiline string variable it adds spaces

Change-Id: I0f9140f3840b0238009af2271ac67b25754f76c9
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 Android.mk | 2 +-
 twrp.cpp   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index ca204d39e8..89eb7c6326 100755
--- a/Android.mk
+++ b/Android.mk
@@ -151,7 +151,7 @@ else
     LOCAL_SHARED_LIBRARIES += libcrypto
 endif
 
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 23; echo $$?),0)
     LOCAL_SHARED_LIBRARIES += libbase
 endif
 
diff --git a/twrp.cpp b/twrp.cpp
index f81bdf9152..7689c25323 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -43,6 +43,11 @@ extern "C" {
 #include "twrp-functions.hpp"
 #include "data.hpp"
 #include "partitions.hpp"
+#ifdef __ANDROID_API_N__
+#include <android-base/strings.h>
+#else
+#include <base/strings.h>
+#endif
 #include "openrecoveryscript.hpp"
 #include "variables.h"
 #include "twrpAdbBuFifo.hpp"
@@ -161,6 +166,8 @@ int main(int argc, char **argv) {
 				} else {
 					other_prop = current_prop;
 				}
+				other_prop = android::base::Trim(other_prop);
+				current_prop = android::base::Trim(current_prop);
 				string sys_val = TWFunc::System_Property_Get(other_prop, SarPartitionManager, "/s");
 				if (!sys_val.empty()) {
 					LOGINFO("Overriding %s with value: \"%s\" from system property %s\n", current_prop.c_str(), sys_val.c_str(), other_prop.c_str());

From 65633a46d09ad5d5512d757694521a627de48fbd Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Wed, 5 Feb 2020 15:24:09 +0100
Subject: [PATCH 058/207] Add optional PartitionManager and Mount_Point to
 Get_System_Properties for use during SAR-detect

Change-Id: Ie1ffba53459b7bb77ca47d9cb928b2626c704a05
---
 twrp-functions.cpp | 18 +++++++++++-------
 twrp-functions.hpp |  5 +++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 40d0549c49..97387b765a 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -895,19 +895,23 @@ string TWFunc::Get_Current_Date() {
 }
 
 string TWFunc::System_Property_Get(string Prop_Name) {
-	bool mount_state = PartitionManager.Is_Mounted_By_Path(PartitionManager.Get_Android_Root_Path());
+	return System_Property_Get(Prop_Name, PartitionManager, PartitionManager.Get_Android_Root_Path());
+}
+
+string TWFunc::System_Property_Get(string Prop_Name, TWPartitionManager &PartitionManager, string Mount_Point) {
+	bool mount_state = PartitionManager.Is_Mounted_By_Path(Mount_Point);
 	std::vector<string> buildprop;
 	string propvalue;
-	if (!PartitionManager.Mount_By_Path(PartitionManager.Get_Android_Root_Path(), true))
+	if (!PartitionManager.Mount_By_Path(Mount_Point, true))
 		return propvalue;
-	string prop_file = "/system/build.prop";
+	string prop_file = Mount_Point + "/build.prop";
 	if (!TWFunc::Path_Exists(prop_file))
-		prop_file = PartitionManager.Get_Android_Root_Path() + "/system/build.prop"; // for devices with system as a root file system (e.g. Pixel)
+		prop_file = Mount_Point + "/system/build.prop"; // for devices with system as a root file system (e.g. Pixel)
 	if (TWFunc::read_file(prop_file, buildprop) != 0) {
 		LOGINFO("Unable to open build.prop for getting '%s'.\n", Prop_Name.c_str());
 		DataManager::SetValue(TW_BACKUP_NAME, Get_Current_Date());
 		if (!mount_state)
-			PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), false);
+			PartitionManager.UnMount_By_Path(Mount_Point, false);
 		return propvalue;
 	}
 	int line_count = buildprop.size();
@@ -920,12 +924,12 @@ string TWFunc::System_Property_Get(string Prop_Name) {
 		if (propname == Prop_Name) {
 			propvalue = buildprop.at(index).substr(end_pos + 1, buildprop.at(index).size());
 			if (!mount_state)
-				PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), false);
+				PartitionManager.UnMount_By_Path(Mount_Point, false);
 			return propvalue;
 		}
 	}
 	if (!mount_state)
-		PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), false);
+		PartitionManager.UnMount_By_Path(Mount_Point, false);
 	return propvalue;
 }
 
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 3e4e8079a8..9d53ab6e50 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -24,6 +24,10 @@
 
 #include "twrpDigest/twrpDigest.hpp"
 
+#ifndef BUILD_TWRPTAR_MAIN
+#include "partitions.hpp"
+#endif
+
 using namespace std;
 
 #define NON_AB_CACHE_DIR "/cache/"
@@ -90,6 +94,7 @@ class TWFunc
 	static int write_to_file(const string& fn, const string& line);             //write to file
 	static bool Try_Decrypting_Backup(string Restore_Path, string Password); // true for success, false for failed to decrypt
 	static string System_Property_Get(string Prop_Name);                // Returns value of Prop_Name from reading /system/build.prop
+	static string System_Property_Get(string Prop_Name, TWPartitionManager &PartitionManager, string Mount_Point);                // Returns value of Prop_Name from reading /system/build.prop
 	static string Get_Current_Date(void);                               // Returns the current date in ccyy-m-dd--hh-nn-ss format
 	static void Auto_Generate_Backup_Name();                            // Populates TW_BACKUP_NAME with a backup name based on current date and ro.build.display.id from /system/build.prop
 	static void Fixup_Time_On_Boot(const string& time_paths = ""); // Fixes time on devices which need it (time_paths is a space separated list of paths to check for ats_* files)

From b76a73a1a996e408476f388f57ea497dccc8fa48 Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Thu, 30 Apr 2020 20:33:20 +0800
Subject: [PATCH 059/207] Fix backup and restore after autodetection for SAR

This reverts commit 8a411c8d257bf37a31907fc44be7cedf447aad7f.

 * Always use "/system" to interact with the frontend and replace it
   with the detected path before taking actions.
 * Don't replace the pretty display name and backup name set during
   processing fstab after wipe. This improves UX and ensures that the
   system backup is always named system.ext4.win despite the actual
   mount point is /system_root so TWRP is able to recover either SAR or
   non-SAR backups.

Change-Id: Ie2594d2678d0c75ce25c0d1087d47b035b3f10e9
---
 openrecoveryscript.cpp | 10 +++++-----
 partition.cpp          | 10 ++++------
 partitionmanager.cpp   | 12 ++++++++++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index 6d762986dc..903bc6c8c6 100755
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -148,8 +148,8 @@ int OpenRecoveryScript::run_script_file(void) {
 				// Wipe
 				if (strcmp(value, "cache") == 0 || strcmp(value, "/cache") == 0) {
 					PartitionManager.Wipe_By_Path("/cache");
-				} else if (strcmp(value, PartitionManager.Get_Android_Root_Path().c_str()) == 0 || strcmp(value, PartitionManager.Get_Android_Root_Path().c_str()) == 0) {
-					PartitionManager.Wipe_By_Path(PartitionManager.Get_Android_Root_Path());
+				} else if (strcmp(value, "system") == 0 || strcmp(value, "/system") == 0 || strcmp(value, PartitionManager.Get_Android_Root_Path().c_str()) == 0) {
+					PartitionManager.Wipe_By_Path("/system");
 				} else if (strcmp(value, "dalvik") == 0 || strcmp(value, "dalvick") == 0 || strcmp(value, "dalvikcache") == 0 || strcmp(value, "dalvickcache") == 0) {
 					PartitionManager.Wipe_Dalvik_Cache();
 				} else if (strcmp(value, "data") == 0 || strcmp(value, "/data") == 0 || strcmp(value, "factory") == 0 || strcmp(value, "factoryreset") == 0) {
@@ -253,8 +253,8 @@ int OpenRecoveryScript::run_script_file(void) {
 					gui_msg(Msg("set_restore_opt=Setting restore options: '{1}':")(value2));
 					line_len = strlen(value2);
 					for (i=0; i<line_len; i++) {
-						if ((value2[i] == 'S' || value2[i] == 's') && Partition_List.find(PartitionManager.Get_Android_Root_Path() + ';') != string::npos) {
-							Restore_List += PartitionManager.Get_Android_Root_Path() + ';';
+						if ((value2[i] == 'S' || value2[i] == 's') && Partition_List.find("/system;") != string::npos) {
+							Restore_List += "/system;";
 							gui_msg("system=System");
 						} else if ((value2[i] == 'D' || value2[i] == 'd') && Partition_List.find("/data;") != string::npos) {
 							Restore_List += "/data;";
@@ -543,7 +543,7 @@ int OpenRecoveryScript::Backup_Command(string Options) {
 	line_len = Options.size();
 	for (i=0; i<line_len; i++) {
 		if (Options.substr(i, 1) == "S" || Options.substr(i, 1) == "s") {
-			Backup_List += PartitionManager.Get_Android_Root_Path() + ';';
+			Backup_List += "/system;";
 			gui_msg("system=System");
 		} else if (Options.substr(i, 1) == "D" || Options.substr(i, 1) == "d") {
 			Backup_List += "/data;";
diff --git a/partition.cpp b/partition.cpp
index 646959c3ed..9ed0ebcbdc 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -417,12 +417,10 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 		else
 			return true;
 	} else if (Mount_Point == "auto") {
-		Mount_Point = "/auto";
-		char autoi[5];
-		sprintf(autoi, "%i", auto_index);
-		Mount_Point += autoi;
+		Mount_Point = "/auto" + to_string(auto_index);
 		Backup_Path = Mount_Point;
 		Storage_Path = Mount_Point;
+		Backup_Name = Mount_Point.substr(1);
 		auto_index++;
 		Setup_File_System(Display_Error);
 		Display_Name = "Storage";
@@ -442,8 +440,10 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 	} else if (Is_File_System(Fstab_File_System)) {
 		Find_Actual_Block_Device();
 		Setup_File_System(Display_Error);
+		Backup_Name = Display_Name = Mount_Point.substr(1, Mount_Point.size() - 1);
 		if (Mount_Point == "/" || Mount_Point == "/system" || Mount_Point == "/system_root") {
 			Display_Name = "System";
+			Backup_Name = "system";
 			Backup_Display_Name = Display_Name;
 			Storage_Name = Display_Name;
 			Wipe_Available_in_GUI = true;
@@ -1092,8 +1092,6 @@ void TWPartition::Setup_File_System(bool Display_Error) {
 
 	// Make the mount point folder if it doesn't exist
 	Make_Dir(Mount_Point, Display_Error);
-	Display_Name = Mount_Point.substr(1, Mount_Point.size() - 1);
-	Backup_Name = Display_Name;
 	Backup_Method = BM_FILES;
 }
 
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index f63b3f3ef7..873b29262f 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -599,6 +599,8 @@ TWPartition* TWPartitionManager::Find_Partition_By_Path(const string& Path) {
 	std::vector<TWPartition*>::iterator iter;
 	string Local_Path = TWFunc::Get_Root_Path(Path);
 
+	if (Local_Path == "/system")
+		Local_Path = Get_Android_Root_Path();
 	for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
 		if ((*iter)->Mount_Point == Local_Path || (!(*iter)->Symlink_Mount_Point.empty() && (*iter)->Symlink_Mount_Point == Local_Path))
 			return (*iter);
@@ -1273,8 +1275,12 @@ void TWPartitionManager::Set_Restore_Files(string Restore_Name) {
 				Part->Backup_FileName.resize(Part->Backup_FileName.size() - strlen(extn) + 3);
 			}
 
-			if (!Part->Is_SubPartition)
-				Restore_List += Part->Backup_Path + ";";
+			if (!Part->Is_SubPartition) {
+				if (Part->Backup_Path == Get_Android_Root_Path())
+					Restore_List += "/system;";
+				else
+					Restore_List += Part->Backup_Path + ";";
+			}
 		}
 		closedir(d);
 	}
@@ -1297,6 +1303,8 @@ int TWPartitionManager::Wipe_By_Path(string Path) {
 	bool found = false;
 	string Local_Path = TWFunc::Get_Root_Path(Path);
 
+	if (Local_Path == "/system")
+		Local_Path = Get_Android_Root_Path();
 	// Iterate through all partitions
 	for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
 		if ((*iter)->Mount_Point == Local_Path || (!(*iter)->Symlink_Mount_Point.empty() && (*iter)->Symlink_Mount_Point == Local_Path)) {

From 3284a66e23fbc6e1a82df668b497ef931d9c0081 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Tue, 4 Feb 2020 15:34:06 -0500
Subject: [PATCH 060/207] vold_decrypt: automatically set Android version &
 patch level

- Requires TW_INCLUDE_LIBRESETPROP
  (set automatically if TW_OEM_BUILD is not set)
- Set based on installed system (if present)
- Will set values back to TWRP defaults
  after decryption completes
- Only included/run on Oreo+ systems

Change-Id: I41fcc1af8cd4b15329574f7403f7491320199f48
---
 Android.mk                           |   3 +
 crypto/vold_decrypt/Android.mk       |   6 ++
 crypto/vold_decrypt/vold_decrypt.cpp | 129 ++++++++++++++++++++++++++-
 3 files changed, 137 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 crypto/vold_decrypt/vold_decrypt.cpp

diff --git a/Android.mk b/Android.mk
index 89eb7c6326..26a5227f81 100755
--- a/Android.mk
+++ b/Android.mk
@@ -333,6 +333,9 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
     endif
     ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),)
     ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),false)
+		ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)
+			TW_INCLUDE_LIBRESETPROP := true
+		endif
         LOCAL_CFLAGS += -DTW_CRYPTO_USE_SYSTEM_VOLD
         LOCAL_STATIC_LIBRARIES += libvolddecrypt
     endif
diff --git a/crypto/vold_decrypt/Android.mk b/crypto/vold_decrypt/Android.mk
index 860e61f203..dc302ad51d 100644
--- a/crypto/vold_decrypt/Android.mk
+++ b/crypto/vold_decrypt/Android.mk
@@ -107,6 +107,12 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
             endif
         endif
 
+        ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)
+            ifeq ($(TW_INCLUDE_LIBRESETPROP), true)
+                LOCAL_CFLAGS += -DTW_INCLUDE_LIBRESETPROP
+            endif
+        endif
+
         LOCAL_SRC_FILES = vold_decrypt.cpp
         LOCAL_SHARED_LIBRARIES := libcutils
         include $(BUILD_STATIC_LIBRARY)
diff --git a/crypto/vold_decrypt/vold_decrypt.cpp b/crypto/vold_decrypt/vold_decrypt.cpp
old mode 100644
new mode 100755
index ac872ea280..078cd5fa8e
--- a/crypto/vold_decrypt/vold_decrypt.cpp
+++ b/crypto/vold_decrypt/vold_decrypt.cpp
@@ -780,6 +780,128 @@ void Set_Needed_Properties(void) {
 	property_set("vendor.sys.listeners.registered", "false");
 }
 
+void Update_Patch_Level(void) {
+	// On Oreo and above, keymaster requires Android version & patch level to match installed system
+	string sdkverstr = TWFunc::System_Property_Get("ro.build.version.sdk");
+	if (!sdkverstr.empty()) {
+		sdkver = atoi(sdkverstr.c_str());
+	}
+	if (sdkver <= 25) {
+		property_set("vold_decrypt.legacy_system", "true");
+	} else {
+		LOGINFO("Current system is Oreo or above. Setting OS version and security patch level from installed system...\n");
+		property_set("vold_decrypt.legacy_system", "false");
+	}
+
+	char prop_value[PROPERTY_VALUE_MAX];
+	char legacy_system_value[PROPERTY_VALUE_MAX] = "false";
+	property_get("vold_decrypt.legacy_system", prop_value, "");
+
+	// Only set OS ver and patch level if device uses Oreo+ system
+	if (strcmp(prop_value, legacy_system_value) == 0) {
+		property_get("ro.build.version.release", prop_value, "");
+		std::string osver_orig = prop_value;
+		property_set("vold_decrypt.osver_orig", osver_orig.c_str());
+		LOGINFO("Current OS version: %s\n", osver_orig.c_str());
+
+		int error = 0;
+		std::string osver = TWFunc::System_Property_Get("ro.build.version.release");
+		if (!(osver == osver_orig)) {
+			if (!(error = TWFunc::Property_Override("ro.build.version.release", osver))) {
+				LOGINFO("Property override successful! New OS version: %s\n", osver.c_str());
+			} else {
+				LOGERROR("Property override failed, code %d\n", error);
+				return;
+			}
+			// TODO: Confirm whether we actually need to update the props in prop.default
+			std::string sed_osver = "sed -i 's/ro.build.version.release=.*/ro.build.version.release=" + osver + "/g' /prop.default";
+			TWFunc::Exec_Cmd(sed_osver);
+			property_set("vold_decrypt.osver_set", "true");
+		} else {
+			LOGINFO("Current OS version & System OS version already match. Proceeding to next step.\n");
+			property_set("vold_decrypt.osver_set", "false");
+		}
+
+		property_get("ro.build.version.security_patch", prop_value, "");
+		std::string patchlevel_orig = prop_value;
+		property_set("vold_decrypt.patchlevel_orig", patchlevel_orig.c_str());
+		LOGINFO("Current security patch level: %s\n", patchlevel_orig.c_str());
+
+		std::string patchlevel = TWFunc::System_Property_Get("ro.build.version.security_patch");
+		if (!(patchlevel == patchlevel_orig)) {
+			if (!(error = TWFunc::Property_Override("ro.build.version.security_patch", patchlevel))) {
+				LOGINFO("Property override successful! New security patch level: %s\n", patchlevel.c_str());
+			} else {
+				LOGERROR("Property override failed, code %d\n", error);
+				return;
+			}
+			// TODO: Confirm whether we actually need to update the props in prop.default
+			std::string sed_patchlevel = "sed -i 's/ro.build.version.security_patch=.*/ro.build.version.security_patch=" + patchlevel + "/g' /prop.default";
+			TWFunc::Exec_Cmd(sed_patchlevel);
+			property_set("vold_decrypt.patchlevel_set", "true");
+		} else {
+			LOGINFO("Current security patch level & System security patch level already match. Proceeding to next step.\n");
+			property_set("vold_decrypt.patchlevel_set", "false");
+		}
+		return;
+	} else {
+		LOGINFO("Current system is Nougat or older. Skipping OS version and security patch level setting...\n");
+		return;
+	}
+}
+
+void Revert_Patch_Level(void) {
+	char osver_set[PROPERTY_VALUE_MAX];
+	char patchlevel_set[PROPERTY_VALUE_MAX];
+	char osver_patchlevel_set[PROPERTY_VALUE_MAX] = "false";
+
+	property_get("vold_decrypt.osver_set", osver_set, "");
+	property_get("vold_decrypt.patchlevel_set", patchlevel_set, "");
+
+	int osver_result = strcmp(osver_set, osver_patchlevel_set);
+	int patchlevel_result = strcmp(patchlevel_set, osver_patchlevel_set);
+	if (!(osver_result == 0 && patchlevel_result == 0)) {
+		char prop_value[PROPERTY_VALUE_MAX];
+		LOGINFO("Reverting OS version and security patch level to original TWRP values...\n");
+		property_get("vold_decrypt.osver_orig", prop_value, "");
+		std::string osver_orig = prop_value;
+		property_get("ro.build.version.release", prop_value, "");
+		std::string osver = prop_value;
+
+		int error = 0;
+		if (!(osver == osver_orig)) {
+			if (!(error = TWFunc::Property_Override("ro.build.version.release", osver_orig))) {
+				LOGINFO("Property override successful! Original OS version: %s\n", osver_orig.c_str());
+			} else {
+				LOGERROR("Property override failed, code %d\n", error);
+				return;
+			}
+			// TODO: Confirm whether we actually need to update the props in prop.default
+			std::string sed_osver_orig = "sed -i 's/ro.build.version.release=.*/ro.build.version.release=" + osver_orig + "/g' /prop.default";
+			TWFunc::Exec_Cmd(sed_osver_orig);
+		}
+
+		property_get("vold_decrypt.patchlevel_orig", prop_value, "");
+		std::string patchlevel_orig = prop_value;
+		property_get("ro.build.version.security_patch", prop_value, "");
+		std::string patchlevel = prop_value;
+
+		if (!(patchlevel == patchlevel_orig)) {
+			if (!(error = TWFunc::Property_Override("ro.build.version.security_patch", patchlevel_orig))) {
+				LOGINFO("Property override successful! Original security patch level: %s\n", patchlevel_orig.c_str());
+			} else {
+				LOGERROR("Property override failed, code %d\n", error);
+				return;
+			}
+			// TODO: Confirm whether we actually need to update the props in prop.default
+			std::string sed_patchlevel_orig = "sed -i 's/ro.build.version.security_patch=.*/ro.build.version.security_patch=" + patchlevel_orig + "/g' /prop.default";
+			TWFunc::Exec_Cmd(sed_patchlevel_orig);
+		}
+	} else {
+		return;
+	}
+}
+
 static unsigned int get_blkdev_size(int fd) {
 	unsigned long nr_sec;
 
@@ -1161,6 +1283,9 @@ int Vold_Decrypt_Core(const string& Password) {
 	Symlink_Firmware_Files(is_vendor_symlinked, is_firmware_symlinked);
 
 	Set_Needed_Properties();
+#ifdef TW_INCLUDE_LIBRESETPROP
+	Update_Patch_Level();
+#endif
 
 	// Start services needed for vold decrypt
 	LOGINFO("Starting services...\n");
@@ -1225,7 +1350,9 @@ int Vold_Decrypt_Core(const string& Password) {
 		LOGINFO("Failed to start vold\n");
 		res = VD_ERR_VOLD_FAILED_TO_START;
 	}
-
+#ifdef TW_INCLUDE_LIBRESETPROP
+	Revert_Patch_Level();
+#endif
 	// Stop services needed for vold decrypt so /system can be unmounted
 	LOGINFO("Stopping services...\n");
 	Stop_Service("sys_vold");

From 7bf8df5086c561cbc9da9b32afa678ebe966f5c1 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Mon, 3 Feb 2020 15:54:32 +0100
Subject: [PATCH 061/207] Mount system and vendor for A/B installs for
 backuptool to work

Also bind mount a copy of /sbin/sh over /system/bin/sh

Change-Id: I58026af425b07b50a4377ab843192578e0d45587
---
 twinstall.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/twinstall.cpp b/twinstall.cpp
index 92af497d36..16911c8662 100755
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -28,6 +28,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/mount.h>
 #include <unistd.h>
 
 #include <string.h>
@@ -440,7 +441,21 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 	} else {
 		if (Zip.EntryExists(AB_OTA)) {
 			LOGINFO("AB zip\n");
+			// We need this so backuptool can do its magic
+			bool system_mount_state = PartitionManager.Is_Mounted_By_Path(PartitionManager.Get_Android_Root_Path());
+			bool vendor_mount_state = PartitionManager.Is_Mounted_By_Path("/vendor");
+			PartitionManager.Mount_By_Path(PartitionManager.Get_Android_Root_Path(), true);
+			PartitionManager.Mount_By_Path("/vendor", true);
+			TWFunc::Exec_Cmd("cp -f /sbin/sh /tmp/sh");
+			mount("/tmp/sh", "/system/bin/sh", "auto", MS_BIND, NULL);
 			ret_val = Run_Update_Binary(path, &Zip, wipe_cache, AB_OTA_ZIP_TYPE);
+			umount("/system/bin/sh");
+			unlink("/tmp/sh");
+			if (!vendor_mount_state)
+				PartitionManager.UnMount_By_Path("/vendor", true);
+			if (!system_mount_state)
+				PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), true);
+
 		} else {
 			if (Zip.EntryExists("ui.xml")) {
 				LOGINFO("TWRP theme zip\n");

From 40ed06e850de2dc7cc06c2e647688212563f1ec2 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Fri, 24 May 2019 11:38:54 +0800
Subject: [PATCH 062/207] partition: set fbe.data.wrappedkey automatically via
 flag

In change I79c2855d577156670b45c10c7c7b1fcd9fece8d9 we introduced a
property to enable wrappedkey mode. This change supports an extra
`wrappedkey` flag in fstab to automatically set the property to true.

Change-Id: I4f060d4ed6b2a5680649b8746dfa7fd903fe2d35
---
 partition.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/partition.cpp b/partition.cpp
index 9ed0ebcbdc..ba44bd7f04 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -158,6 +158,7 @@ enum TW_FSTAB_FLAGS {
 	TWFLAG_FORMATTABLE,
 	TWFLAG_RESIZE,
 	TWFLAG_KEYDIRECTORY,
+	TWFLAG_WRAPPEDKEY,
 };
 
 /* Flags without a trailing '=' are considered dual format flags and can be
@@ -202,6 +203,7 @@ const struct flag_list tw_flags[] = {
 	{ "formattable",            TWFLAG_FORMATTABLE },
 	{ "resize",                 TWFLAG_RESIZE },
 	{ "keydirectory=",          TWFLAG_KEYDIRECTORY },
+	{ "wrappedkey",             TWFLAG_WRAPPEDKEY },
 	{ 0,                        0 },
 };
 
@@ -883,6 +885,13 @@ void TWPartition::Apply_TW_Flag(const unsigned flag, const char* str, const bool
 				LOGINFO("FBE contents '%s', filenames '%s'\n", FBE_contents.c_str(), FBE_filenames.c_str());
 			}
 			break;
+		case TWFLAG_WRAPPEDKEY:
+			// Set fbe.data.wrappedkey to true
+			{
+				property_set("fbe.data.wrappedkey", "true");
+				LOGINFO("FBE wrapped key enabled\n");
+			}
+			break;
 		case TWFLAG_FLASHIMG:
 			Can_Flash_Img = val;
 			break;

From 1db943295de9728e364bf0e75bfe9f1a98d413a1 Mon Sep 17 00:00:00 2001
From: mauronofrio <poronofrio@gmail.com>
Date: Sat, 23 Nov 2019 23:13:04 +0100
Subject: [PATCH 063/207] Encryption: don't try wrapped key if not needed

This commit is used to directly use the wrapped key
decryption when the "wrappedkey" flag is set in the
fstab.

Change-Id: I74310c3bbec378ee684a8f6d0395a9776dd22abf
---
 partition.cpp        | 11 +++++++++--
 partitionmanager.cpp | 13 ++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/partition.cpp b/partition.cpp
index ba44bd7f04..faffcd37fd 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -685,11 +685,18 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 	} else {
 
 		if (!Decrypt_FBE_DE()) {
-			LOGINFO("Trying wrapped key.\n");
-			property_set("fbe.data.wrappedkey", "true");
+			char wrappedvalue[PROPERTY_VALUE_MAX];
+			property_get("fbe.data.wrappedkey", wrappedvalue, "");
+			std::string wrappedkeyvalue(wrappedvalue);
+			if (wrappedkeyvalue == "true") {
+				LOGERR("Unable to decrypt FBE device\n");
+			} else {
+				LOGINFO("Trying wrapped key.\n");
+				property_set("fbe.data.wrappedkey", "true");
 				if (!Decrypt_FBE_DE()) {
 					LOGINFO("Unable to decrypt device\n");
 				}
+			}
 		}
 	}
 	if (datamedia && (!Is_Encrypted || (Is_Encrypted && Is_Decrypted))) {
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 873b29262f..64f39e4905 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -304,10 +304,17 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error,
 					usleep(500);
 				if (Decrypt_Data->Mount(false)) {
 					if (!Decrypt_Data->Decrypt_FBE_DE()) {
-						LOGINFO("Trying wrapped key.\n");
-						property_set("fbe.data.wrappedkey", "true");
-						if (!Decrypt_Data->Decrypt_FBE_DE()) {
+						char wrappedvalue[PROPERTY_VALUE_MAX];
+						property_get("fbe.data.wrappedkey", wrappedvalue, "");
+						std::string wrappedkeyvalue(wrappedvalue);
+						if (wrappedkeyvalue == "true") {
 							LOGERR("Unable to decrypt FBE device\n");
+						} else {
+							LOGINFO("Trying wrapped key.\n");
+							property_set("fbe.data.wrappedkey", "true");
+							if (!Decrypt_Data->Decrypt_FBE_DE()) {
+								LOGERR("Unable to decrypt FBE device\n");
+							}
 						}
 					}
 

From a2bd7b7758a4585814f642d55301043276d8a002 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Thu, 7 May 2020 21:45:34 -0400
Subject: [PATCH 064/207] factory reset: restore ext4 policy on /data/cache

If ext4 policy is not restored, system won't boot properly
after a factory reset.

When /data is formatted by the user, we need to make sure we
do not create the /data/cache directory so that Android can
create it with the new policy for /data.

This also removes extraneous umount calls, and places them
in the specific wipe function for each filesystem.

Change-Id: I71ff39d8660fbf4aa6fe8a8309e291166359da72
---
 .gitignore                        |   1 +
 Android.mk                        |   8 ++-
 crypto/ext4crypt/e4policyget.cpp  |   3 +-
 data.cpp                          |   8 +--
 gui/Android.mk                    |   9 +++
 gui/theme/common/languages/en.xml |   1 +
 partition.cpp                     | 112 ++++++++++++++++++++++++------
 partitionmanager.cpp              |   3 -
 partitions.hpp                    |   4 +-
 twrp-functions.cpp                |  50 ++++++++++++-
 twrp-functions.hpp                |   6 ++
 twrp.cpp                          |   3 +-
 12 files changed, 167 insertions(+), 41 deletions(-)
 mode change 100644 => 100755 crypto/ext4crypt/e4policyget.cpp
 mode change 100644 => 100755 gui/Android.mk
 mode change 100644 => 100755 partition.cpp
 mode change 100644 => 100755 partitions.hpp

diff --git a/.gitignore b/.gitignore
index e03babb1f6..480f5478d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .*.swp
 *~
 tags
+.vscode
diff --git a/Android.mk b/Android.mk
index 26a5227f81..81a2f5ddf2 100755
--- a/Android.mk
+++ b/Android.mk
@@ -177,7 +177,11 @@ endif
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
     ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 28; echo $$?),0)
         LOCAL_CFLAGS += -DUSE_EXT4
-        LOCAL_C_INCLUDES += system/extras/ext4_utils
+    endif
+    ifeq ($(shell test $(PLATFORM_SDK_VERSION) -le 28; echo $$?),0)
+        LOCAL_C_INCLUDES += system/extras/ext4_utils \
+            system/extras/ext4_utils/include \
+            bootable/recovery/crypto/ext4crypt
         LOCAL_SHARED_LIBRARIES += libext4_utils
         ifneq ($(wildcard external/lz4/Android.mk),)
             #LOCAL_STATIC_LIBRARIES += liblz4
@@ -206,8 +210,6 @@ else
     LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_TWRP_LIB)
 endif
 
-LOCAL_C_INCLUDES += system/extras/ext4_utils
-
 tw_git_revision := $(shell git -C $(LOCAL_PATH) rev-parse --short=8 HEAD 2>/dev/null)
 ifeq ($(shell git -C $(LOCAL_PATH) diff --quiet; echo $$?),1)
     tw_git_revision := $(tw_git_revision)-dirty
diff --git a/crypto/ext4crypt/e4policyget.cpp b/crypto/ext4crypt/e4policyget.cpp
old mode 100644
new mode 100755
index 05de86fe70..9211347024
--- a/crypto/ext4crypt/e4policyget.cpp
+++ b/crypto/ext4crypt/e4policyget.cpp
@@ -23,13 +23,12 @@
 #define EXT4_KEY_DESCRIPTOR_SIZE_HEX 17
 
 int main(int argc, char *argv[]) {
-	bool ret = false;
 	if (argc != 2) {
 		printf("Must specify a path\n");
 		return -1;
 	} else  {
 		ext4_encryption_policy eep;
-		if (e4crypt_policy_get_struct(argv[1], &eep, sizeof(eep))) {
+		if (e4crypt_policy_get_struct(argv[1], &eep)) {
 			char policy_hex[EXT4_KEY_DESCRIPTOR_SIZE_HEX];
 			policy_to_hex(eep.master_key_descriptor, policy_hex);
 			printf("%s\n", policy_hex);
diff --git a/data.cpp b/data.cpp
index b1e8404b30..83fb601117 100755
--- a/data.cpp
+++ b/data.cpp
@@ -1064,13 +1064,7 @@ void DataManager::Output_Version(void)
 			return;
 		}
 	}
-	if (!TWFunc::Path_Exists(recoveryCacheDir)) {
-		LOGINFO("Recreating %s folder.\n", recoveryCacheDir.c_str());
-		if (!TWFunc::Create_Dir_Recursive(recoveryCacheDir.c_str(), S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP, 0, 0)) {
-			LOGERR("DataManager::Output_Version -- Unable to make %s: %s\n", recoveryCacheDir.c_str(), strerror(errno));
-			return;
-		}
-	}
+
 	std::string verPath = recoveryCacheDir + ".version";
 	if (TWFunc::Path_Exists(verPath)) {
 		unlink(verPath.c_str());
diff --git a/gui/Android.mk b/gui/Android.mk
old mode 100644
new mode 100755
index 22b5347702..60ba325b17
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -46,6 +46,15 @@ else
     LOCAL_SHARED_LIBRARIES += libminzip
     LOCAL_CFLAGS += -DUSE_MINZIP
 endif
+ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
+    ifeq ($(shell test $(PLATFORM_SDK_VERSION) -le 28; echo $$?),0)
+        LOCAL_C_INCLUDES += system/extras/ext4_utils \
+            system/extras/ext4_utils/include \
+            bootable/recovery/crypto/ext4crypt
+        LOCAL_SHARED_LIBRARIES += libext4_utils
+    endif
+endif
+
 LOCAL_MODULE := libguitwrp
 
 #TWRP_EVENT_LOGGING := true
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 3769da5057..e26ccb7314 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -722,5 +722,6 @@
 		<string name="unmount_sys_install">Unmount System before installing a ZIP</string>
 		<string name="unmount_system">Unmounting System...</string>
 		<string name="unmount_system_err">Failed unmounting System</string>
+		<string name="fbe_wipe_msg">WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.</string>
 	</resources>
 </language>
diff --git a/partition.cpp b/partition.cpp
old mode 100644
new mode 100755
index faffcd37fd..b47c2947f7
--- a/partition.cpp
+++ b/partition.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright 2013 to 2017 TeamWin
+	Copyright 2013 to 2020 TeamWin
 	This file is part of TWRP/TeamWin Recovery Project.
 
 	TWRP is free software: you can redistribute it and/or modify
@@ -19,17 +19,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/mount.h>
+#include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/vfs.h>
-#include <sys/mount.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <iostream>
 #include <libgen.h>
+#include <pwd.h>
 #include <zlib.h>
-#include <iostream>
 #include <sstream>
-#include <sys/param.h>
-#include <fcntl.h>
 
 #include "cutils/properties.h"
 #include "libblkid/include/blkid.h"
@@ -1632,6 +1635,11 @@ bool TWPartition::Wipe(string New_File_System) {
 	bool wiped = false, update_crypt = false, recreate_media = true;
 	int check;
 	string Layout_Filename = Mount_Point + "/.layout_version";
+	ext4_encryption_policy policy;
+
+	if (Mount_Point == "/data" && TWFunc::get_cache_dir() == AB_CACHE_DIR && Is_Decrypted) {
+		TWFunc::Get_Encryption_Policy(policy, AB_CACHE_DIR);
+	}
 
 	if (!Can_Be_Wiped) {
 		gui_msg(Msg(msg::kError, "cannot_wipe=Partition {1} cannot be wiped.")(Display_Name));
@@ -1648,6 +1656,11 @@ bool TWPartition::Wipe(string New_File_System) {
 
 	if (Has_Data_Media && Current_File_System == New_File_System) {
 		wiped = Wipe_Data_Without_Wiping_Media();
+		if (Mount_Point == "/data" && TWFunc::get_cache_dir() == AB_CACHE_DIR) {
+			bool created = Recreate_AB_Cache_Dir(policy);
+			if (created)
+				gui_msg(Msg(msg::kWarning, "fbe_wipe_msg=WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.")(TWFunc::get_cache_dir()));
+		}
 		recreate_media = false;
 	} else {
 		DataManager::GetValue(TW_RM_RF_VAR, check);
@@ -1677,9 +1690,6 @@ bool TWPartition::Wipe(string New_File_System) {
 	}
 
 	if (wiped) {
-		if (Mount_Point == "/cache")
-			DataManager::Output_Version();
-
 		if (TWFunc::Path_Exists("/.layout_version") && Mount(false))
 			TWFunc::copy_file("/.layout_version", Layout_Filename, 0600);
 
@@ -1991,10 +2001,10 @@ bool TWPartition::Wipe_Encryption() {
 		gui_msg(Msg(msg::kError, "unable_to_wipe=Unable to wipe {1}.")(Display_Name));
 		return false;
 	}
-	if (!UnMount(true))
-		goto exit;
 
 #ifdef TW_INCLUDE_CRYPTO
+	if (!UnMount(true))
+		return false;
 	if (Is_Decrypted && !Decrypted_Block_Device.empty()) {
 		if (delete_crypto_blk_dev((char*)("userdata")) != 0) {
 			LOGERR("Error deleting crypto block device, continuing anyway.\n");
@@ -2014,7 +2024,10 @@ bool TWPartition::Wipe_Encryption() {
 		}
 		DataManager::SetValue(TW_IS_ENCRYPTED, 0);
 #ifndef TW_OEM_BUILD
-		gui_msg("format_data_msg=You may need to reboot recovery to be able to use /data again.");
+		if (Is_FBE)
+			gui_msg(Msg(msg::kWarning, "fbe_wipe_msg=WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.")(TWFunc::get_cache_dir()));
+		else
+			gui_msg("format_data_msg=You may need to reboot recovery to be able to use /data again.");
 #endif
 		ret = true;
 		if (!Key_Directory.empty())
@@ -2080,6 +2093,9 @@ void TWPartition::Check_FS_Type() {
 }
 
 bool TWPartition::Wipe_EXTFS(string File_System) {
+	if (!UnMount(true))
+		return false;
+
 #if PLATFORM_SDK_VERSION < 28
 	if (!TWFunc::Path_Exists("/sbin/mke2fs"))
 #else
@@ -2219,11 +2235,10 @@ bool TWPartition::Wipe_EXT4() {
 
 bool TWPartition::Wipe_FAT() {
 	string command;
+	if (!UnMount(true))
+		return false;
 
 	if (TWFunc::Path_Exists("/sbin/mkfs.fat")) {
-		if (!UnMount(true))
-			return false;
-
 		gui_msg(Msg("formatting_using=Formatting {1} using {2}...")(Display_Name)("mkfs.fat"));
 		Find_Actual_Block_Device();
 		command = "mkfs.fat " + Actual_Block_Device;
@@ -2246,11 +2261,10 @@ bool TWPartition::Wipe_FAT() {
 
 bool TWPartition::Wipe_EXFAT() {
 	string command;
+	if (!UnMount(true))
+		return false;
 
 	if (TWFunc::Path_Exists("/sbin/mkexfatfs")) {
-		if (!UnMount(true))
-			return false;
-
 		gui_msg(Msg("formatting_using=Formatting {1} using {2}...")(Display_Name)("mkexfatfs"));
 		Find_Actual_Block_Device();
 		command = "mkexfatfs " + Actual_Block_Device;
@@ -2317,6 +2331,8 @@ bool TWPartition::Wipe_RMRF() {
 
 bool TWPartition::Wipe_F2FS() {
 	string command;
+	if (!UnMount(true))
+		return false;
 
 	if (TWFunc::Path_Exists("/sbin/mkfs.f2fs")) {
 		bool NeedPreserveFooter = true;
@@ -2327,8 +2343,6 @@ bool TWPartition::Wipe_F2FS() {
 			gui_msg(Msg(msg::kError, "unable_to_wipe=Unable to wipe {1}.")(Display_Name));
 			return false;
 		}
-		if (!UnMount(true))
-			return false;
 
 		/**
 		 * On decrypted devices, IOCTL_Get_Block_Size calculates size on device mapper,
@@ -2402,6 +2416,9 @@ bool TWPartition::Wipe_NTFS() {
 	string command;
 	string Ntfsmake_Binary;
 
+	if (!UnMount(true))
+		return false;
+
 	if (TWFunc::Path_Exists("/sbin/mkntfs"))
 		Ntfsmake_Binary = "mkntfs";
 	else if (TWFunc::Path_Exists("/sbin/mkfs.ntfs"))
@@ -2409,9 +2426,6 @@ bool TWPartition::Wipe_NTFS() {
 	else
 		return false;
 
-	if (!UnMount(true))
-		return false;
-
 	gui_msg(Msg("formatting_using=Formatting {1} using {2}...")(Display_Name)(Ntfsmake_Binary));
 	Find_Actual_Block_Device();
 	command = "/sbin/" + Ntfsmake_Binary + " " + Actual_Block_Device;
@@ -2435,7 +2449,6 @@ bool TWPartition::Wipe_Data_Without_Wiping_Media() {
 
 	if (!Mount(true))
 		return false;
-
 	gui_msg("wiping_data=Wiping data without wiping /data/media ...");
 	ret = Wipe_Data_Without_Wiping_Media_Func(Mount_Point + "/");
 	if (ret)
@@ -2444,6 +2457,59 @@ bool TWPartition::Wipe_Data_Without_Wiping_Media() {
 #endif // ifdef TW_OEM_BUILD
 }
 
+bool TWPartition::Recreate_AB_Cache_Dir(const ext4_encryption_policy &policy) {
+	struct passwd pd;
+	struct passwd *pwdptr = &pd;
+	struct passwd *tempPd;
+	char pwdBuf[512];
+	int uid = 0, gid = 0;
+
+	if ((getpwnam_r("system", pwdptr, pwdBuf, sizeof(pwdBuf), &tempPd)) != 0) {
+		LOGERR("unable to get system user id\n");
+		return false;
+	} else {
+		struct group grp;
+		struct group *grpptr = &grp;
+		struct group *tempGrp;
+		char grpBuf[512];
+
+		if ((getgrnam_r("cache", grpptr, grpBuf, sizeof(grpBuf), &tempGrp)) != 0) {
+			LOGERR("unable to get cache group id\n");
+			return false;
+		} else {
+			uid = pd.pw_uid;
+			gid = grp.gr_gid;
+
+			if (!TWFunc::Create_Dir_Recursive(AB_CACHE_DIR, S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP, uid, gid)) {
+				LOGERR("Unable to recreate %s\n", AB_CACHE_DIR);
+				return false;
+			}
+			if (setfilecon(AB_CACHE_DIR, "u:object_r:cache_file:s0") != 0) {	
+				LOGERR("Unable to set contexts for %s\n", AB_CACHE_DIR);
+				return false;
+			}
+			char policy_hex[EXT4_KEY_DESCRIPTOR_SIZE_HEX];
+			policy_to_hex(policy.master_key_descriptor, policy_hex);
+			LOGINFO("setting policy for %s: %s\n", policy_hex, AB_CACHE_DIR);
+			if (sizeof(policy.master_key_descriptor) > 0) {
+				if (!TWFunc::Set_Encryption_Policy(AB_CACHE_DIR, policy)) {
+					LOGERR("Unable to set encryption policy for %s\n", AB_CACHE_DIR);
+					LOGINFO("Removing %s\n", AB_CACHE_DIR);
+					int ret = TWFunc::removeDir(AB_CACHE_DIR, true);
+					if (ret == -1) {
+						LOGERR("Unable to remove %s\n", AB_CACHE_DIR);
+					}
+					return false;
+				}
+			} else {
+				LOGERR("Not setting empty policy to %s\n", AB_CACHE_DIR);
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
 bool TWPartition::Wipe_Data_Without_Wiping_Media_Func(const string& parent __unused) {
 	string dir;
 
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 64f39e4905..f9adb02a0e 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1487,9 +1487,6 @@ int TWPartitionManager::Format_Data(void) {
 	TWPartition* dat = Find_Partition_By_Path("/data");
 
 	if (dat != NULL) {
-		if (!dat->UnMount(true))
-			return false;
-
 		return dat->Wipe_Encryption();
 	} else {
 		gui_msg(Msg(msg::kError, "unable_to_locate=Unable to locate {1}.")("/data"));
diff --git a/partitions.hpp b/partitions.hpp
old mode 100644
new mode 100755
index 92970d92f1..5a52fa3081
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -26,6 +26,7 @@
 #include "exclude.hpp"
 #include "tw_atomic.hpp"
 #include "progresstracking.hpp"
+#include "ext4crypt_tar.h"
 
 #define MAX_FSTAB_LINE_LENGTH 2048
 
@@ -207,6 +208,7 @@ class TWPartition
 	bool Wipe_NTFS();                                                         // Uses mkntfs to wipe
 	bool Wipe_Data_Without_Wiping_Media();                                    // Uses rm -rf to wipe but does not wipe /data/media
 	bool Wipe_Data_Without_Wiping_Media_Func(const string& parent);           // Uses rm -rf to wipe but does not wipe /data/media
+	bool Recreate_AB_Cache_Dir(const ext4_encryption_policy &policy);				  // Recreate AB_CACHE_DIR after wipe
 	void Wipe_Crypto_Key();                                                   // Wipe crypto key from either footer or block device
 	bool Backup_Tar(PartitionSettings *part_settings, pid_t *tar_fork_pid);   // Backs up using tar for file systems
 	bool Backup_Image(PartitionSettings *part_settings);                      // Backs up using raw read/write for emmc memory types
@@ -281,7 +283,7 @@ class TWPartition
 	bool SlotSelect;                                                          // Partition has A/B slots
 	TWExclude backup_exclusions;                                              // Exclusions for file based backups
 	TWExclude wipe_exclusions;                                                // Exclusions for file based wipes (data/media devices only)
-	string Key_Directory;                                                      // Metadata key directory needed for mounting FBE encrypted data partitions using metadata encryption
+	string Key_Directory;                                                     // Metadata key directory needed for mounting FBE encrypted data partitions using metadata encryption
 
 	struct partition_fs_flags_struct {                                        // This struct is used to store mount flags and options for different file systems for the same partition
 		string File_System;
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 593ad9d004..2f563d9999 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -640,7 +640,9 @@ void TWFunc::Update_Intent_File(string Intent) {
 int TWFunc::tw_reboot(RebootCommand command)
 {
 	DataManager::Flush();
-	Update_Log_File();
+	if (!Is_Data_Wiped("/data"))
+		Update_Log_File();
+
 	// Always force a sync before we reboot
 	sync();
 
@@ -1333,4 +1335,50 @@ int TWFunc::Property_Override(string Prop_Name, string Prop_Value) {
 #endif
 }
 
+bool TWFunc::Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path) {
+	if (!TWFunc::Path_Exists(path)) {
+		LOGERR("Unable to find %s to get policy\n", path.c_str());
+		return false;
+	}
+	if (!e4crypt_policy_get_struct(path.c_str(), &policy)) {
+		LOGERR("No policy set for path %s\n", path.c_str());
+		return false;
+	}
+	return true;
+}
+
+bool TWFunc::Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy) {
+	if (!TWFunc::Path_Exists(path)) {
+		LOGERR("unable to find %s to set policy\n", path.c_str());
+		return false;
+	}
+	char binary_policy[EXT4_KEY_DESCRIPTOR_SIZE];
+	char policy_hex[EXT4_KEY_DESCRIPTOR_SIZE_HEX];
+	policy_to_hex(binary_policy, policy_hex);
+	if (!e4crypt_policy_set_struct(path.c_str(), &policy)) {
+		LOGERR("unable to set policy for path: %s\n", path.c_str());
+		return false;
+	}
+	return true;
+}
+
+bool TWFunc::Is_Data_Wiped(std::string path) {
+	DIR* d = opendir(path.c_str());
+	size_t file_count = 0;
+	if (d != NULL) {
+		struct dirent* de;
+		while ((de = readdir(d)) != NULL) {
+			LOGINFO("file: %s\n", de->d_name);
+			if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
+				continue;
+			if (strncmp(de->d_name, "lost+found", 10) == 0 || strncmp(de->d_name, "media", 5) == 0)
+				continue;
+			file_count++;
+
+		}
+		closedir(d);
+	}
+	LOGINFO("file_count: %zu\n", file_count);
+	return file_count == 0;
+}
 #endif // ndef BUILD_TWRPTAR_MAIN
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 9d53ab6e50..9c8378853f 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -21,8 +21,10 @@
 
 #include <string>
 #include <vector>
+#include <ext4_utils/ext4_crypt.h>
 
 #include "twrpDigest/twrpDigest.hpp"
+#include "ext4crypt_tar.h"
 
 #ifndef BUILD_TWRPTAR_MAIN
 #include "partitions.hpp"
@@ -52,6 +54,7 @@ enum Archive_Type {
 	COMPRESSED_ENCRYPTED
 };
 
+
 // Partition class
 class TWFunc
 {
@@ -113,6 +116,9 @@ class TWFunc
 	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
 	static int Property_Override(string Prop_Name, string Prop_Value); // Override properties (including ro. properties)
+	static bool Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path); // return encryption policy for path
+	static bool Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy); // set encryption policy for path
+	static bool Is_Data_Wiped(std::string path); // check if directory has been wiped
 
 private:
 	static void Copy_Log(string Source, string Destination);
diff --git a/twrp.cpp b/twrp.cpp
index 7689c25323..036a2375e1 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -401,7 +401,8 @@ int main(int argc, char **argv) {
 	// Reboot
 	TWFunc::Update_Intent_File(Send_Intent);
 	delete adb_bu_fifo;
-	TWFunc::Update_Log_File();
+	if (!TWFunc::Is_Data_Wiped("/data"))
+		TWFunc::Update_Log_File();
 	gui_msg(Msg("rebooting=Rebooting..."));
 	string Reboot_Arg;
 	DataManager::GetValue("tw_reboot_arg", Reboot_Arg);

From 1913bf32042c380af3c33c5157341db5963ba281 Mon Sep 17 00:00:00 2001
From: mauronofrio <poronofrio@gmail.com>
Date: Thu, 14 Nov 2019 20:20:05 +0100
Subject: [PATCH 065/207] Make the twrp verify the pre-device among several
 props

This is really usefull for that devices that have multiple names, for
example for zenfone 6 that is called WW_I01WD and also ASUS_I01WD, with
this commit all roms also with a different pre-device will be successfully
flashed. I decided to use ro.product.model and ro.product.name because
these pros are also used in some roms updater-script to check the device
model before start the rom flashing.

Change-Id: I3b4cd3a13e3fff5c5a6c35bf1a0ed146d2b4c3ec
---
 installcommand.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/installcommand.cpp b/installcommand.cpp
index fa079ea2d9..022aef6763 100644
--- a/installcommand.cpp
+++ b/installcommand.cpp
@@ -121,8 +121,12 @@ static int check_newer_ab_build(ZipWrap* zip)
         }
     }
     char value[PROPERTY_VALUE_MAX];
+    char propmodel[PROPERTY_VALUE_MAX];
+    char propname[PROPERTY_VALUE_MAX];
 
     property_get("ro.product.device", value, "");
+    property_get("ro.product.model", propmodel, "");
+    property_get("ro.product.name", propname, "");
     const std::string& pkg_device = metadata["pre-device"];
 
     std::vector<std::string> assertResults = android::base::Split(pkg_device, ",");
@@ -132,7 +136,7 @@ static int check_newer_ab_build(ZipWrap* zip)
     for(const std::string& deviceAssert : assertResults)
     {
         std::string assertName = android::base::Trim(deviceAssert);
-        if (assertName == value && !assertName.empty()) {
+        if ((assertName == value || assertName == propmodel || assertName == propname ) && !assertName.empty()) {
             deviceExists = true;
             break;
         }

From 76390d7e516f99c5d24645eea3181dea805404d5 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Sat, 16 May 2020 16:45:20 +0200
Subject: [PATCH 066/207] Add option to display IP Address.

This is usefull for devices that have ethernet.
Since these devices typically don't have a battery,
we display IP address instead of battery-percentage.

Change-Id: I1c5872b70f09d0a79110600d97de1597d33d7a0e
---
 Android.mk                      |  4 ++++
 data.cpp                        | 29 +++++++++++++++++++++++++++++
 gui/theme/landscape_hdpi/ui.xml | 10 ++++++++++
 3 files changed, 43 insertions(+)

diff --git a/Android.mk b/Android.mk
index 2a4c81163b..ecd0e897e1 100755
--- a/Android.mk
+++ b/Android.mk
@@ -85,6 +85,10 @@ ifeq ($(TW_AMONET), true)
   endif
 endif
 
+ifeq ($(TW_IP_ADDRESS), true)
+    LOCAL_CFLAGS += -DTW_IP_ADDRESS
+endif
+
 ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
   LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
 endif
diff --git a/data.cpp b/data.cpp
index 4ccb968293..e541ce3d3d 100755
--- a/data.cpp
+++ b/data.cpp
@@ -25,6 +25,11 @@
 #include <cutils/properties.h>
 #include <unistd.h>
 
+#ifdef TW_IP_ADDRESS
+#include <arpa/inet.h>
+#include <net/if.h>
+#endif
+
 #include "variables.h"
 #include "data.hpp"
 #include "partitions.hpp"
@@ -1052,6 +1057,30 @@ int DataManager::GetMagicValue(const string& varName, string& value)
 		value = tmp;
 		return 0;
 	}
+#ifdef TW_IP_ADDRESS
+	else if (varName == "tw_ip_address")
+	{
+		char tmp[16];
+		static char lastIp[16] = {0};
+		static time_t nextIpCheck = 0;
+		struct timeval curTime;
+		gettimeofday(&curTime, NULL);
+		if (curTime.tv_sec > nextIpCheck)
+		{
+			struct ifreq ifr = { 0 };
+			strcpy(ifr.ifr_name, "eth0");
+			int fd = socket(AF_INET, SOCK_DGRAM, 0);
+			ioctl(fd, SIOCGIFADDR, &ifr);
+			snprintf(lastIp, 15, "%s", inet_ntoa(((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr));
+			close(fd);
+			nextIpCheck = curTime.tv_sec + 60;
+		}
+
+		sprintf(tmp, "%s", lastIp);
+		value = tmp;
+		return 0;
+    }
+#endif
 	return -1;
 }
 
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index 6e746a0dd6..afaf016602 100755
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -294,6 +294,16 @@
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
 			</text>
 
+			<text color="%text_color%">
+				<conditions>
+					<condition var1="tw_no_battery_percent" var2="1"/>
+					<condition var1="tw_ip_address"/>
+				</conditions>
+				<font resource="font_m"/>
+				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
+				<text>IP Address: %tw_ip_address%</text>
+			</text>
+
 			<fill color="#000000">
 				<condition var1="tw_busy" var2="0"/>
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>

From df5e48b3480b81af2effc04df82854ec24d6e2ea Mon Sep 17 00:00:00 2001
From: rbox <androidrbox@gmail.com>
Date: Sat, 6 Feb 2016 12:58:48 -0700
Subject: [PATCH 067/207] Add socket transport to minadb.

Allow sideload to work over the network.

Change-Id: If5e1be0971431905c5b78aa90813ef135af48999
---
 Android.mk                  |   4 +
 minadbd21/Android.mk        |   8 +
 minadbd21/adb.c             |  12 +
 minadbd21/adb.h             |   3 +
 minadbd21/transport.c       |  53 +++++
 minadbd21/transport_local.c | 444 ++++++++++++++++++++++++++++++++++++
 6 files changed, 524 insertions(+)
 create mode 100644 minadbd21/transport_local.c

diff --git a/Android.mk b/Android.mk
index ecd0e897e1..181f2ab399 100755
--- a/Android.mk
+++ b/Android.mk
@@ -89,6 +89,10 @@ ifeq ($(TW_IP_ADDRESS), true)
     LOCAL_CFLAGS += -DTW_IP_ADDRESS
 endif
 
+ifeq ($(TW_IP_SIDELOAD), true)
+    LOCAL_CFLAGS += -DTW_IP_SIDELOAD
+endif
+
 ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
   LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
 endif
diff --git a/minadbd21/Android.mk b/minadbd21/Android.mk
index 201c795344..4bfc9b225e 100644
--- a/minadbd21/Android.mk
+++ b/minadbd21/Android.mk
@@ -28,4 +28,12 @@ LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := libminadbd
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../
 LOCAL_SHARED_LIBRARIES := libfusesideload libcutils libc
+
+
+ifeq ($(TW_IP_SIDELOAD), true)
+    LOCAL_SRC_FILES += transport_local.c
+    LOCAL_CFLAGS += -DTW_IP_SIDELOAD
+endif
+
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/minadbd21/adb.c b/minadbd21/adb.c
index c35e8300b7..1604a03982 100644
--- a/minadbd21/adb.c
+++ b/minadbd21/adb.c
@@ -395,6 +395,18 @@ int adb_main(const char* path)
         usb_init();
     }
 
+#ifdef TW_IP_SIDELOAD
+    // Well not really, listen for network connections too.
+    char value[PROPERTY_VALUE_MAX];
+    int port;
+    property_get("service.adb.tcp.port", value, "");
+    if (sscanf(value, "%d", &port) == 1 && port > 0) {
+        printf("using port=%d\n", port);
+        // listen on TCP port specified by service.adb.tcp.port property
+        local_init(port);
+    }
+#endif
+
 /* Remove this so that perms work properly
     if (setgid(AID_SHELL) != 0) {
         fprintf(stderr, "failed to setgid to shell\n");
diff --git a/minadbd21/adb.h b/minadbd21/adb.h
index 08ee989d6f..0dcb141e1b 100644
--- a/minadbd21/adb.h
+++ b/minadbd21/adb.h
@@ -244,6 +244,9 @@ void   kick_transport( atransport*  t );
 #if ADB_HOST
 int get_available_local_transport_index();
 #endif
+#ifdef TW_IP_SIDELOAD
+int  init_socket_transport(atransport *t, int s, int port, int local);
+#endif
 void init_usb_transport(atransport *t, usb_handle *usb, int state);
 
 /* for MacOS X cleanup */
diff --git a/minadbd21/transport.c b/minadbd21/transport.c
index 92679f518a..9ea0beb84d 100644
--- a/minadbd21/transport.c
+++ b/minadbd21/transport.c
@@ -32,6 +32,13 @@ static atransport transport_list = {
     .prev = &transport_list,
 };
 
+#ifdef TW_IP_SIDELOAD
+static atransport pending_list = {
+    .next = &pending_list,
+    .prev = &pending_list,
+};
+#endif
+
 ADB_MUTEX_DEFINE( transport_lock );
 
 #if ADB_TRACE
@@ -678,6 +685,52 @@ atransport *acquire_one_transport(int state, transport_type ttype, const char* s
     return result;
 }
 
+#ifdef TW_IP_SIDELOAD
+int register_socket_transport(int s, const char *serial, int port, int local)
+{
+    atransport *t = calloc(1, sizeof(atransport));
+    atransport *n;
+    char buff[32];
+
+    if (!serial) {
+        snprintf(buff, sizeof buff, "T-%p", t);
+        serial = buff;
+    }
+    D("transport: %s init'ing for socket %d, on port %d\n", serial, s, port);
+    if (init_socket_transport(t, s, port, local) < 0) {
+        free(t);
+        return -1;
+    }
+
+    adb_mutex_lock(&transport_lock);
+    for (n = pending_list.next; n != &pending_list; n = n->next) {
+        if (n->serial && !strcmp(serial, n->serial)) {
+            adb_mutex_unlock(&transport_lock);
+            free(t);
+            return -1;
+        }
+    }
+
+    for (n = transport_list.next; n != &transport_list; n = n->next) {
+        if (n->serial && !strcmp(serial, n->serial)) {
+            adb_mutex_unlock(&transport_lock);
+            free(t);
+            return -1;
+        }
+    }
+
+    t->next = &pending_list;
+    t->prev = pending_list.prev;
+    t->next->prev = t;
+    t->prev->next = t;
+    t->serial = strdup(serial);
+    adb_mutex_unlock(&transport_lock);
+
+    register_transport(t);
+    return 0;
+}
+#endif
+
 void register_usb_transport(usb_handle *usb, const char *serial, unsigned writeable)
 {
     atransport *t = calloc(1, sizeof(atransport));
diff --git a/minadbd21/transport_local.c b/minadbd21/transport_local.c
new file mode 100644
index 0000000000..948cc15812
--- /dev/null
+++ b/minadbd21/transport_local.c
@@ -0,0 +1,444 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "sysdeps.h"
+#include <sys/types.h>
+#if !ADB_HOST
+#include <cutils/properties.h>
+#endif
+
+#define  TRACE_TAG  TRACE_TRANSPORT
+#include "adb.h"
+
+#ifdef HAVE_BIG_ENDIAN
+#define H4(x)	(((x) & 0xFF000000) >> 24) | (((x) & 0x00FF0000) >> 8) | (((x) & 0x0000FF00) << 8) | (((x) & 0x000000FF) << 24)
+static inline void fix_endians(apacket *p)
+{
+    p->msg.command     = H4(p->msg.command);
+    p->msg.arg0        = H4(p->msg.arg0);
+    p->msg.arg1        = H4(p->msg.arg1);
+    p->msg.data_length = H4(p->msg.data_length);
+    p->msg.data_check  = H4(p->msg.data_check);
+    p->msg.magic       = H4(p->msg.magic);
+}
+#else
+#define fix_endians(p) do {} while (0)
+#endif
+
+#if ADB_HOST
+/* we keep a list of opened transports. The atransport struct knows to which
+ * local transport it is connected. The list is used to detect when we're
+ * trying to connect twice to a given local transport.
+ */
+#define  ADB_LOCAL_TRANSPORT_MAX  64
+
+ADB_MUTEX_DEFINE( local_transports_lock );
+
+static atransport*  local_transports[ ADB_LOCAL_TRANSPORT_MAX ];
+#endif /* ADB_HOST */
+
+static int remote_read(apacket *p, atransport *t)
+{
+    if(readx(t->sfd, &p->msg, sizeof(amessage))){
+        D("remote local: read terminated (message)\n");
+        return -1;
+    }
+
+    fix_endians(p);
+
+#if 0 && defined HAVE_BIG_ENDIAN
+    D("read remote packet: %04x arg0=%0x arg1=%0x data_length=%0x data_check=%0x magic=%0x\n",
+      p->msg.command, p->msg.arg0, p->msg.arg1, p->msg.data_length, p->msg.data_check, p->msg.magic);
+#endif
+    if(check_header(p)) {
+        D("bad header: terminated (data)\n");
+        return -1;
+    }
+
+    if(readx(t->sfd, p->data, p->msg.data_length)){
+        D("remote local: terminated (data)\n");
+        return -1;
+    }
+
+    if(check_data(p)) {
+        D("bad data: terminated (data)\n");
+        return -1;
+    }
+
+    return 0;
+}
+
+static int remote_write(apacket *p, atransport *t)
+{
+    int   length = p->msg.data_length;
+
+    fix_endians(p);
+
+#if 0 && defined HAVE_BIG_ENDIAN
+    D("write remote packet: %04x arg0=%0x arg1=%0x data_length=%0x data_check=%0x magic=%0x\n",
+      p->msg.command, p->msg.arg0, p->msg.arg1, p->msg.data_length, p->msg.data_check, p->msg.magic);
+#endif
+    if(writex(t->sfd, &p->msg, sizeof(amessage) + length)) {
+        D("remote local: write terminated\n");
+        return -1;
+    }
+
+    return 0;
+}
+
+
+int local_connect(int port) {
+    return local_connect_arbitrary_ports(port-1, port);
+}
+
+int local_connect_arbitrary_ports(int console_port, int adb_port)
+{
+    char buf[64];
+    int  fd = -1;
+
+#if ADB_HOST
+    const char *host = getenv("ADBHOST");
+    if (host) {
+        fd = socket_network_client(host, adb_port, SOCK_STREAM);
+    }
+#endif
+    if (fd < 0) {
+        fd = socket_loopback_client(adb_port, SOCK_STREAM);
+    }
+
+    if (fd >= 0) {
+        D("client: connected on remote on fd %d\n", fd);
+        close_on_exec(fd);
+        disable_tcp_nagle(fd);
+        snprintf(buf, sizeof buf, "%s%d", LOCAL_CLIENT_PREFIX, console_port);
+        register_socket_transport(fd, buf, adb_port, 1);
+        return 0;
+    }
+    return -1;
+}
+
+
+static void *client_socket_thread(void *x)
+{
+#if ADB_HOST
+    int  port  = DEFAULT_ADB_LOCAL_TRANSPORT_PORT;
+    int  count = ADB_LOCAL_TRANSPORT_MAX;
+
+    D("transport: client_socket_thread() starting\n");
+
+    /* try to connect to any number of running emulator instances     */
+    /* this is only done when ADB starts up. later, each new emulator */
+    /* will send a message to ADB to indicate that is is starting up  */
+    for ( ; count > 0; count--, port += 2 ) {
+        (void) local_connect(port);
+    }
+#endif
+    return 0;
+}
+
+static void *server_socket_thread(void * arg)
+{
+    int serverfd, fd;
+    struct sockaddr addr;
+    socklen_t alen;
+    int port = (int) (uintptr_t) arg;
+
+    D("transport: server_socket_thread() starting\n");
+    serverfd = -1;
+    for(;;) {
+        if(serverfd == -1) {
+            serverfd = socket_inaddr_any_server(port, SOCK_STREAM);
+            if(serverfd < 0) {
+                D("server: cannot bind socket yet\n");
+                adb_sleep_ms(1000);
+                continue;
+            }
+            close_on_exec(serverfd);
+        }
+
+        alen = sizeof(addr);
+        D("server: trying to get new connection from %d\n", port);
+        fd = adb_socket_accept(serverfd, &addr, &alen);
+        if(fd >= 0) {
+            D("server: new connection on fd %d\n", fd);
+            close_on_exec(fd);
+            disable_tcp_nagle(fd);
+            register_socket_transport(fd, "host", port, 1);
+        }
+    }
+    D("transport: server_socket_thread() exiting\n");
+    return 0;
+}
+
+/* This is relevant only for ADB daemon running inside the emulator. */
+#if !ADB_HOST
+/*
+ * Redefine open and write for qemu_pipe.h that contains inlined references
+ * to those routines. We will redifine them back after qemu_pipe.h inclusion.
+ */
+#undef open
+#undef write
+#define open    adb_open
+#define write   adb_write
+#include <hardware/qemu_pipe.h>
+#undef open
+#undef write
+#define open    ___xxx_open
+#define write   ___xxx_write
+
+/* A worker thread that monitors host connections, and registers a transport for
+ * every new host connection. This thread replaces server_socket_thread on
+ * condition that adbd daemon runs inside the emulator, and emulator uses QEMUD
+ * pipe to communicate with adbd daemon inside the guest. This is done in order
+ * to provide more robust communication channel between ADB host and guest. The
+ * main issue with server_socket_thread approach is that it runs on top of TCP,
+ * and thus is sensitive to network disruptions. For instance, the
+ * ConnectionManager may decide to reset all network connections, in which case
+ * the connection between ADB host and guest will be lost. To make ADB traffic
+ * independent from the network, we use here 'adb' QEMUD service to transfer data
+ * between the host, and the guest. See external/qemu/android/adb-*.* that
+ * implements the emulator's side of the protocol. Another advantage of using
+ * QEMUD approach is that ADB will be up much sooner, since it doesn't depend
+ * anymore on network being set up.
+ * The guest side of the protocol contains the following phases:
+ * - Connect with adb QEMUD service. In this phase a handle to 'adb' QEMUD service
+ *   is opened, and it becomes clear whether or not emulator supports that
+ *   protocol.
+ * - Wait for the ADB host to create connection with the guest. This is done by
+ *   sending an 'accept' request to the adb QEMUD service, and waiting on
+ *   response.
+ * - When new ADB host connection is accepted, the connection with adb QEMUD
+ *   service is registered as the transport, and a 'start' request is sent to the
+ *   adb QEMUD service, indicating that the guest is ready to receive messages.
+ *   Note that the guest will ignore messages sent down from the emulator before
+ *   the transport registration is completed. That's why we need to send the
+ *   'start' request after the transport is registered.
+ */
+static void *qemu_socket_thread(void * arg)
+{
+/* 'accept' request to the adb QEMUD service. */
+static const char _accept_req[] = "accept";
+/* 'start' request to the adb QEMUD service. */
+static const char _start_req[]  = "start";
+/* 'ok' reply from the adb QEMUD service. */
+static const char _ok_resp[]    = "ok";
+
+    const int port = (int) (uintptr_t) arg;
+    int res, fd;
+    char tmp[256];
+    char con_name[32];
+
+    D("transport: qemu_socket_thread() starting\n");
+
+    /* adb QEMUD service connection request. */
+    snprintf(con_name, sizeof(con_name), "qemud:adb:%d", port);
+
+    /* Connect to the adb QEMUD service. */
+    fd = qemu_pipe_open(con_name);
+    if (fd < 0) {
+        /* This could be an older version of the emulator, that doesn't
+         * implement adb QEMUD service. Fall back to the old TCP way. */
+        adb_thread_t thr;
+        D("adb service is not available. Falling back to TCP socket.\n");
+        adb_thread_create(&thr, server_socket_thread, arg);
+        return 0;
+    }
+
+    for(;;) {
+        /*
+         * Wait till the host creates a new connection.
+         */
+
+        /* Send the 'accept' request. */
+        res = adb_write(fd, _accept_req, strlen(_accept_req));
+        if ((size_t)res == strlen(_accept_req)) {
+            /* Wait for the response. In the response we expect 'ok' on success,
+             * or 'ko' on failure. */
+            res = adb_read(fd, tmp, sizeof(tmp));
+            if (res != 2 || memcmp(tmp, _ok_resp, 2)) {
+                D("Accepting ADB host connection has failed.\n");
+                adb_close(fd);
+            } else {
+                /* Host is connected. Register the transport, and start the
+                 * exchange. */
+                register_socket_transport(fd, "host", port, 1);
+                adb_write(fd, _start_req, strlen(_start_req));
+            }
+
+            /* Prepare for accepting of the next ADB host connection. */
+            fd = qemu_pipe_open(con_name);
+            if (fd < 0) {
+                D("adb service become unavailable.\n");
+                return 0;
+            }
+        } else {
+            D("Unable to send the '%s' request to ADB service.\n", _accept_req);
+            return 0;
+        }
+    }
+    D("transport: qemu_socket_thread() exiting\n");
+    return 0;
+}
+#endif  // !ADB_HOST
+
+void local_init(int port)
+{
+    adb_thread_t thr;
+    void* (*func)(void *);
+
+    if(HOST) {
+        func = client_socket_thread;
+    } else {
+#if ADB_HOST
+        func = server_socket_thread;
+#else
+        /* For the adbd daemon in the system image we need to distinguish
+         * between the device, and the emulator. */
+        char is_qemu[PROPERTY_VALUE_MAX];
+        property_get("ro.kernel.qemu", is_qemu, "");
+        if (!strcmp(is_qemu, "1")) {
+            /* Running inside the emulator: use QEMUD pipe as the transport. */
+            func = qemu_socket_thread;
+        } else {
+            /* Running inside the device: use TCP socket as the transport. */
+            func = server_socket_thread;
+        }
+#endif // !ADB_HOST
+    }
+
+    D("transport: local %s init\n", HOST ? "client" : "server");
+
+    if(adb_thread_create(&thr, func, (void *) (uintptr_t) port)) {
+        fatal_errno("cannot create local socket %s thread",
+                    HOST ? "client" : "server");
+    }
+}
+
+static void remote_kick(atransport *t)
+{
+    int fd = t->sfd;
+    t->sfd = -1;
+    adb_shutdown(fd);
+    adb_close(fd);
+
+#if ADB_HOST
+    if(HOST) {
+        int  nn;
+        adb_mutex_lock( &local_transports_lock );
+        for (nn = 0; nn < ADB_LOCAL_TRANSPORT_MAX; nn++) {
+            if (local_transports[nn] == t) {
+                local_transports[nn] = NULL;
+                break;
+            }
+        }
+        adb_mutex_unlock( &local_transports_lock );
+    }
+#endif
+}
+
+static void remote_close(atransport *t)
+{
+    adb_close(t->fd);
+}
+
+
+#if ADB_HOST
+/* Only call this function if you already hold local_transports_lock. */
+atransport* find_emulator_transport_by_adb_port_locked(int adb_port)
+{
+    int i;
+    for (i = 0; i < ADB_LOCAL_TRANSPORT_MAX; i++) {
+        if (local_transports[i] && local_transports[i]->adb_port == adb_port) {
+            return local_transports[i];
+        }
+    }
+    return NULL;
+}
+
+atransport* find_emulator_transport_by_adb_port(int adb_port)
+{
+    adb_mutex_lock( &local_transports_lock );
+    atransport* result = find_emulator_transport_by_adb_port_locked(adb_port);
+    adb_mutex_unlock( &local_transports_lock );
+    return result;
+}
+
+/* Only call this function if you already hold local_transports_lock. */
+int get_available_local_transport_index_locked()
+{
+    int i;
+    for (i = 0; i < ADB_LOCAL_TRANSPORT_MAX; i++) {
+        if (local_transports[i] == NULL) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+int get_available_local_transport_index()
+{
+    adb_mutex_lock( &local_transports_lock );
+    int result = get_available_local_transport_index_locked();
+    adb_mutex_unlock( &local_transports_lock );
+    return result;
+}
+#endif
+
+int init_socket_transport(atransport *t, int s, int adb_port, int local)
+{
+    int  fail = 0;
+
+    t->kick = remote_kick;
+    t->close = remote_close;
+    t->read_from_remote = remote_read;
+    t->write_to_remote = remote_write;
+    t->sfd = s;
+    t->sync_token = 1;
+    t->connection_state = CS_OFFLINE;
+    t->type = kTransportLocal;
+    t->adb_port = 0;
+
+#if ADB_HOST
+    if (HOST && local) {
+        adb_mutex_lock( &local_transports_lock );
+        {
+            t->adb_port = adb_port;
+            atransport* existing_transport =
+                    find_emulator_transport_by_adb_port_locked(adb_port);
+            int index = get_available_local_transport_index_locked();
+            if (existing_transport != NULL) {
+                D("local transport for port %d already registered (%p)?\n",
+                adb_port, existing_transport);
+                fail = -1;
+            } else if (index < 0) {
+                // Too many emulators.
+                D("cannot register more emulators. Maximum is %d\n",
+                        ADB_LOCAL_TRANSPORT_MAX);
+                fail = -1;
+            } else {
+                local_transports[index] = t;
+            }
+       }
+       adb_mutex_unlock( &local_transports_lock );
+    }
+#endif
+    return fail;
+}

From 7884eac0fcda4a13373766a4df3dd19f53d18f95 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice@bellet.info>
Date: Sun, 15 Dec 2019 17:49:18 +0100
Subject: [PATCH 068/207] twrptar: fix backup freeze with pigz and openaes

The filedescriptors must be opened with the close-on-exec flag, so
child processes don't keep opened parent fd around, that prevents
the processing pipe to be properly closed.

Change-Id: I285d57d04d13452383f1b81910a8eda02f17a156
---
 twrpTar.cpp | 141 +++++++++++++++++-----------------------------------
 1 file changed, 45 insertions(+), 96 deletions(-)

diff --git a/twrpTar.cpp b/twrpTar.cpp
index d15eea6b9f..b2d0ea67eb 100644
--- a/twrpTar.cpp
+++ b/twrpTar.cpp
@@ -315,6 +315,7 @@ int twrpTar::createTarFork(pid_t *tar_fork_pid) {
 			}
 			/*if (pthread_attr_setstacksize(&tattr, 524288)) {
 				LOGERR("Error setting pthread_attr_setstacksize\n");
+				close(progress_pipe[1]);
 				_exit(-1);
 			}*/
 
@@ -874,10 +875,10 @@ void* twrpTar::extractMulti(void *cookie) {
 int twrpTar::addFilesToExistingTar(vector <string> files, string fn) {
 	char* charTarFile = (char*) fn.c_str();
 
-	if (tar_open(&t, charTarFile, NULL, O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) == -1)
+	if (tar_open(&t, charTarFile, NULL, O_CLOEXEC | O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) == -1)
 		return -1;
 	removeEOT(charTarFile);
-	if (tar_open(&t, charTarFile, NULL, O_WRONLY | O_APPEND | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) == -1)
+	if (tar_open(&t, charTarFile, NULL, O_CLOEXEC | O_WRONLY | O_APPEND | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) == -1)
 		return -1;
 	for (unsigned int i = 0; i < files.size(); ++i) {
 		char* file = (char*) files.at(i).c_str();
@@ -901,17 +902,17 @@ int twrpTar::createTar() {
 		LOGINFO("Using encryption and compression...\n");
 		int i, pipes[4];
 
-		if (pipe(pipes) < 0) {
+		if (pipe2(pipes, O_CLOEXEC) < 0) {
 			LOGINFO("Error creating first pipe\n");
 			gui_err("backup_error=Error creating backup.");
 			return -1;
 		}
-		if (pipe(pipes + 2) < 0) {
+		if (pipe2(pipes + 2, O_CLOEXEC) < 0) {
 			LOGINFO("Error creating second pipe\n");
 			gui_err("backup_error=Error creating backup.");
 			return -1;
 		}
-		output_fd = open(tarfn.c_str(), O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+		output_fd = open(tarfn.c_str(), O_CLOEXEC | O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 		if (output_fd < 0) {
 			gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(tarfn)(strerror(errno)));
 			for (i = 0; i < 4; i++)
@@ -929,20 +930,11 @@ int twrpTar::createTar() {
 			return -1;
 		} else if (pigz_pid == 0) {
 			// pigz Child
-			close(pipes[1]);
-			close(pipes[2]);
-			int stdinfd = fileno(stdin);
-			int stdoutfd = fileno(stdout);
-			close(stdinfd);
-			dup2(pipes[0], stdinfd);
-			close(stdoutfd);
-			dup2(pipes[3], stdoutfd);
+			dup2(pipes[0], STDIN_FILENO);
+			dup2(pipes[3], STDOUT_FILENO);
 			if (execlp("pigz", "pigz", "-", NULL) < 0) {
 				LOGINFO("execlp pigz ERROR!\n");
 				gui_err("backup_error=Error creating backup.");
-				close(output_fd);
-				close(pipes[0]);
-				close(pipes[3]);
 				_exit(-1);
 			}
 		} else {
@@ -958,20 +950,11 @@ int twrpTar::createTar() {
 				return -1;
 			} else if (oaes_pid == 0) {
 				// openaes Child
-				close(pipes[0]);
-				close(pipes[1]);
-				close(pipes[3]);
-				int stdinfd = fileno(stdin);
-				int stdoutfd = fileno(stdout);
-				close(stdinfd);
-				dup2(pipes[2], stdinfd);
-				close(stdoutfd);
-				dup2(output_fd, stdoutfd);
+				dup2(pipes[2], STDIN_FILENO);
+				dup2(output_fd, STDOUT_FILENO);
 				if (execlp("openaes", "openaes", "enc", "--key", password.c_str(), NULL) < 0) {
 					LOGINFO("execlp openaes ERROR!\n");
 					gui_err("backup_error=Error creating backup.");
-					close(pipes[2]);
-					close(output_fd);
 					_exit(-1);
 				}
 			} else {
@@ -982,7 +965,7 @@ int twrpTar::createTar() {
 				fd = pipes[1];
 				init_libtar_no_buffer(progress_pipe_fd);
 				tar_type.writefunc = write_tar_no_buffer;
-				if (tar_fdopen(&t, fd, charRootDir, &tar_type, O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+				if (tar_fdopen(&t, fd, charRootDir, &tar_type, O_CLOEXEC | O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 					close(fd);
 					LOGINFO("tar_fdopen failed\n");
 					gui_err("backup_error=Error creating backup.");
@@ -1001,15 +984,14 @@ int twrpTar::createTar() {
 			output_fd = open(TW_ADB_BACKUP, O_WRONLY);
 		}
 		else {
-			output_fd = open(tarfn.c_str(), O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+			output_fd = open(tarfn.c_str(), O_CLOEXEC | O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 		}
 		if (output_fd < 0) {
 			gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(tarfn)(strerror(errno)));
-			close(pigzfd[0]);
 			return -1;
 		}
 
-		if (pipe(pigzfd) < 0) {
+		if (pipe2(pigzfd, O_CLOEXEC) < 0) {
 			LOGINFO("Error creating pipe\n");
 			gui_err("backup_error=Error creating backup.");
 			close(output_fd);
@@ -1026,14 +1008,11 @@ int twrpTar::createTar() {
 			return -1;
 		} else if (pigz_pid == 0) {
 			// Child
-			close(pigzfd[1]);   // close unused output pipe
-			dup2(pigzfd[0], fileno(stdin)); // remap stdin
-			dup2(output_fd, fileno(stdout)); // remap stdout to output file
+			dup2(pigzfd[0], STDIN_FILENO); // remap stdin
+			dup2(output_fd, STDOUT_FILENO); // remap stdout to output file
 			if (execlp("pigz", "pigz", "-", NULL) < 0) {
 				LOGINFO("execlp pigz ERROR!\n");
 				gui_err("backup_error=Error creating backup.");
-				close(output_fd);
-				close(pigzfd[0]);
 				_exit(-1);
 			}
 		} else {
@@ -1042,7 +1021,7 @@ int twrpTar::createTar() {
 			fd = pigzfd[1];   // copy parent output
 			init_libtar_no_buffer(progress_pipe_fd);
 			tar_type.writefunc = write_tar_no_buffer;
-			if (tar_fdopen(&t, fd, charRootDir, &tar_type, O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+			if (tar_fdopen(&t, fd, charRootDir, &tar_type, O_CLOEXEC | O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 				close(fd);
 				LOGINFO("tar_fdopen failed\n");
 				gui_err("backup_error=Error creating backup.");
@@ -1054,12 +1033,12 @@ int twrpTar::createTar() {
 		current_archive_type = ENCRYPTED;
 		LOGINFO("Using encryption...\n");
 		int oaesfd[2];
-		output_fd = open(tarfn.c_str(), O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+		output_fd = open(tarfn.c_str(), O_CLOEXEC | O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 		if (output_fd < 0) {
 			gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(tarfn)(strerror(errno)));
 			return -1;
 		}
-		if (pipe(oaesfd) < 0) {
+		if (pipe2(oaesfd, O_CLOEXEC) < 0) {
 			LOGINFO("Error creating pipe\n");
 			gui_err("backup_error=Error creating backup.");
 			close(output_fd);
@@ -1076,14 +1055,11 @@ int twrpTar::createTar() {
 			return -1;
 		} else if (oaes_pid == 0) {
 			// Child
-			close(oaesfd[1]);   // close unused
-			dup2(oaesfd[0], fileno(stdin)); // remap stdin
-			dup2(output_fd, fileno(stdout)); // remap stdout to output file
+			dup2(oaesfd[0], STDIN_FILENO); // remap stdin
+			dup2(output_fd, STDOUT_FILENO); // remap stdout to output file
 			if (execlp("openaes", "openaes", "enc", "--key", password.c_str(), NULL) < 0) {
 				LOGINFO("execlp openaes ERROR!\n");
 				gui_err("backup_error=Error creating backup.");
-				close(output_fd);
-				close(oaesfd[0]);
 				_exit(-1);
 			}
 		} else {
@@ -1092,7 +1068,7 @@ int twrpTar::createTar() {
 			fd = oaesfd[1];   // copy parent output
 			init_libtar_no_buffer(progress_pipe_fd);
 			tar_type.writefunc = write_tar_no_buffer;
-			if (tar_fdopen(&t, fd, charRootDir, &tar_type, O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+			if (tar_fdopen(&t, fd, charRootDir, &tar_type, O_CLOEXEC | O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 				close(fd);
 				LOGINFO("tar_fdopen failed\n");
 				gui_err("backup_error=Error creating backup.");
@@ -1108,7 +1084,7 @@ int twrpTar::createTar() {
 			LOGINFO("Opening TW_ADB_BACKUP uncompressed stream\n");
 			tar_type.writefunc = write_tar_no_buffer;
 			output_fd = open(TW_ADB_BACKUP, O_WRONLY);
-			if(tar_fdopen(&t, output_fd, charRootDir, &tar_type, O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+			if(tar_fdopen(&t, output_fd, charRootDir, &tar_type, O_CLOEXEC | O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 				close(output_fd);
 				LOGERR("tar_fdopen failed\n");
 				return -1;
@@ -1116,7 +1092,7 @@ int twrpTar::createTar() {
 		}
 		else {
 			tar_type.writefunc = write_tar;
-			if (tar_open(&t, charTarFile, &tar_type, O_WRONLY | O_CREAT | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) == -1) {
+			if (tar_open(&t, charTarFile, &tar_type, O_CLOEXEC | O_WRONLY | O_CREAT | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) == -1) {
 				LOGERR("tar_open error opening '%s'\n", tarfn.c_str());
 				gui_err("backup_error=Error creating backup.");
 				return -1;
@@ -1134,19 +1110,19 @@ int twrpTar::openTar() {
 	if (current_archive_type == COMPRESSED_ENCRYPTED) {
 		LOGINFO("Opening encrypted and compressed backup...\n");
 		int i, pipes[4];
-		input_fd = open(tarfn.c_str(), O_RDONLY | O_LARGEFILE);
+		input_fd = open(tarfn.c_str(), O_CLOEXEC | O_RDONLY | O_LARGEFILE);
 		if (input_fd < 0) {
 			gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(tarfn)(strerror(errno)));
 			return -1;
 		}
 
-		if (pipe(pipes) < 0) {
+		if (pipe2(pipes, O_CLOEXEC) < 0) {
 			LOGINFO("Error creating first pipe\n");
 			gui_err("restore_error=Error during restore process.");
 			close(input_fd);
 			return -1;
 		}
-		if (pipe(pipes + 2) < 0) {
+		if (pipe2(pipes + 2, O_CLOEXEC) < 0) {
 			LOGINFO("Error creating second pipe\n");
 			gui_err("restore_error=Error during restore process.");
 			close(pipes[0]);
@@ -1165,20 +1141,11 @@ int twrpTar::openTar() {
 			return -1;
 		} else if (oaes_pid == 0) {
 			// openaes Child
-			close(pipes[0]); // Close pipes that are not used by this child
-			close(pipes[2]);
-			close(pipes[3]);
-			int stdinfd = fileno(stdin);
-			int stdoutfd = fileno(stdout);
-			close(stdinfd);
-			dup2(input_fd, stdinfd);
-			close(stdoutfd);
-			dup2(pipes[1], stdoutfd);
+			dup2(input_fd, STDIN_FILENO);
+			dup2(pipes[1], STDOUT_FILENO);
 			if (execlp("openaes", "openaes", "dec", "--key", password.c_str(), NULL) < 0) {
 				LOGINFO("execlp openaes ERROR!\n");
 				gui_err("restore_error=Error during restore process.");
-				close(input_fd);
-				close(pipes[1]);
 				_exit(-1);
 			}
 		} else {
@@ -1194,20 +1161,11 @@ int twrpTar::openTar() {
 				return -1;
 			} else if (pigz_pid == 0) {
 				// pigz Child
-				close(pipes[1]); // Close pipes not used by this child
-				close(pipes[2]);
-				int stdinfd = fileno(stdin);
-				int stdoutfd = fileno(stdout);
-				close(stdinfd);
-				dup2(pipes[0], stdinfd);
-				close(stdoutfd);
-				dup2(pipes[3], stdoutfd);
+				dup2(pipes[0], STDIN_FILENO);
+				dup2(pipes[3], STDOUT_FILENO);
 				if (execlp("pigz", "pigz", "-d", "-c", NULL) < 0) {
 					LOGINFO("execlp pigz ERROR!\n");
 					gui_err("restore_error=Error during restore process.");
-					close(input_fd);
-					close(pipes[0]);
-					close(pipes[3]);
 					_exit(-1);
 				}
 			} else {
@@ -1216,7 +1174,7 @@ int twrpTar::openTar() {
 				close(pipes[1]);
 				close(pipes[3]);
 				fd = pipes[2];
-				if (tar_fdopen(&t, fd, charRootDir, NULL, O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+				if (tar_fdopen(&t, fd, charRootDir, NULL, O_CLOEXEC | O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 					close(fd);
 					LOGINFO("tar_fdopen failed\n");
 					gui_err("restore_error=Error during restore process.");
@@ -1227,13 +1185,13 @@ int twrpTar::openTar() {
 	} else if (current_archive_type == ENCRYPTED) {
 		LOGINFO("Opening encrypted backup...\n");
 		int oaesfd[2];
-		input_fd = open(tarfn.c_str(), O_RDONLY | O_LARGEFILE);
+		input_fd = open(tarfn.c_str(), O_CLOEXEC | O_RDONLY | O_LARGEFILE);
 		if (input_fd < 0) {
 			gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(tarfn)(strerror(errno)));
 			return -1;
 		}
 
-		if (pipe(oaesfd) < 0) {
+		if (pipe2(oaesfd, O_CLOEXEC) < 0) {
 			LOGINFO("Error creating pipe\n");
 			gui_err("restore_error=Error during restore process.");
 			close(input_fd);
@@ -1250,23 +1208,18 @@ int twrpTar::openTar() {
 			return -1;
 		} else if (oaes_pid == 0) {
 			// Child
-			close(oaesfd[0]); // Close unused pipe
-			int stdinfd = fileno(stdin);
-			close(stdinfd);   // close stdin
-			dup2(oaesfd[1], fileno(stdout)); // remap stdout
-			dup2(input_fd, stdinfd); // remap input fd to stdin
+			dup2(oaesfd[1], STDOUT_FILENO); // remap stdout
+			dup2(input_fd, STDIN_FILENO); // remap input fd to stdin
 			if (execlp("openaes", "openaes", "dec", "--key", password.c_str(), NULL) < 0) {
 				LOGINFO("execlp openaes ERROR!\n");
 				gui_err("restore_error=Error during restore process.");
-				close(input_fd);
-				close(oaesfd[1]);
 				_exit(-1);
 			}
 		} else {
 			// Parent
 			close(oaesfd[1]); // close parent output
 			fd = oaesfd[0];   // copy parent input
-			if (tar_fdopen(&t, fd, charRootDir, NULL, O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+			if (tar_fdopen(&t, fd, charRootDir, NULL, O_CLOEXEC | O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 				close(fd);
 				LOGINFO("tar_fdopen failed\n");
 				gui_err("restore_error=Error during restore process.");
@@ -1279,17 +1232,17 @@ int twrpTar::openTar() {
 		LOGINFO("Opening gzip compressed tar...\n");
 		if (part_settings->adbbackup)  {
 			LOGINFO("opening TW_ADB_RESTORE compressed stream\n");
-			input_fd = open(TW_ADB_RESTORE, O_RDONLY | O_LARGEFILE);
+			input_fd = open(TW_ADB_RESTORE, O_CLOEXEC | O_RDONLY | O_LARGEFILE);
 		}
 		else
-			input_fd = open(tarfn.c_str(), O_RDONLY | O_LARGEFILE);
+			input_fd = open(tarfn.c_str(), O_CLOEXEC | O_RDONLY | O_LARGEFILE);
 
 		if (input_fd < 0) {
 			gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(tarfn)(strerror(errno)));
 			return -1;
 		}
 
-		if (pipe(pigzfd) < 0) {
+		if (pipe2(pigzfd, O_CLOEXEC) < 0) {
 			LOGINFO("Error creating pipe\n");
 			gui_err("restore_error=Error during restore process.");
 			close(input_fd);
@@ -1306,13 +1259,10 @@ int twrpTar::openTar() {
 			return -1;
 		} else if (pigz_pid == 0) {
 			// Child
-			close(pigzfd[0]);
-			dup2(pigzfd[1], fileno(stdout)); // remap stdout
-			dup2(input_fd, fileno(stdin)); // remap input fd to stdin
+			dup2(pigzfd[1], STDOUT_FILENO); // remap stdout
+			dup2(input_fd, STDIN_FILENO); // remap input fd to stdin
 			if (execlp("pigz", "pigz", "-d", "-c", NULL) < 0) {
-				close(pigzfd[1]);
-				close(input_fd);
-				LOGINFO("execlp openaes ERROR!\n");
+				LOGINFO("execlp pigz ERROR!\n");
 				gui_err("restore_error=Error during restore process.");
 				_exit(-1);
 			}
@@ -1320,7 +1270,7 @@ int twrpTar::openTar() {
 			// Parent
 			close(pigzfd[1]); // close parent output
 			fd = pigzfd[0];   // copy parent input
-			if (tar_fdopen(&t, fd, charRootDir, NULL, O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+			if (tar_fdopen(&t, fd, charRootDir, NULL, O_CLOEXEC | O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 				close(fd);
 				LOGINFO("tar_fdopen failed\n");
 				gui_err("restore_error=Error during restore process.");
@@ -1331,14 +1281,14 @@ int twrpTar::openTar() {
 		if (part_settings->adbbackup) {
 			LOGINFO("Opening TW_ADB_RESTORE uncompressed stream\n");
 			input_fd = open(TW_ADB_RESTORE, O_RDONLY);
-			if (tar_fdopen(&t, input_fd, charRootDir, NULL, O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+			if (tar_fdopen(&t, input_fd, charRootDir, NULL, O_CLOEXEC | O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 				LOGERR("Unable to open tar archive '%s'\n", charTarFile);
 				gui_err("restore_error=Error during restore process.");
 				return -1;
 			}
 		}
 		else {
-			if (tar_open(&t, charTarFile, NULL, O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
+			if (tar_open(&t, charTarFile, NULL, O_CLOEXEC | O_RDONLY | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, TWTAR_FLAGS) != 0) {
 				LOGERR("Unable to open tar archive '%s'\n", charTarFile);
 				gui_err("restore_error=Error during restore process.");
 				return -1;
@@ -1395,7 +1345,6 @@ int twrpTar::closeTar() {
 		return -1;
 	}
 	if (current_archive_type > 0) {
-		close(fd);
 		int status;
 		if (pigz_pid > 0 && TWFunc::Wait_For_Child(pigz_pid, &status, "pigz") != 0)
 			return -1;

From 5343a3ca2afcdd895677c5c3ff16a83af372c7b7 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Fri, 7 Feb 2020 19:58:10 +0100
Subject: [PATCH 069/207] Add info that flashing AB zip will flash to the
 inactive slot

Also inform user, that a reboot is required to switch slots

Change-Id: I7d609ee3d231e5d38d9145962e979e012d9a0ac8
---
 gui/theme/common/languages/en.xml | 2 ++
 twinstall.cpp                     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index e26ccb7314..006e4ce0b5 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -723,5 +723,7 @@
 		<string name="unmount_system">Unmounting System...</string>
 		<string name="unmount_system_err">Failed unmounting System</string>
 		<string name="fbe_wipe_msg">WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.</string>
+		<string name="flash_ab_inactive">Flashing A/B zip to inactive slot: {1}</string>
+		<string name="flash_ab_reboot">To flash additional zips, please reboot recovery to switch to the updated slot.</string>
 	</resources>
 </language>
diff --git a/twinstall.cpp b/twinstall.cpp
index 16911c8662..2b6f9c77ce 100755
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -441,6 +441,7 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 	} else {
 		if (Zip.EntryExists(AB_OTA)) {
 			LOGINFO("AB zip\n");
+			gui_msg(Msg(msg::kHighlight, "flash_ab_inactive=Flashing A/B zip to inactive slot: {1}")(PartitionManager.Get_Active_Slot_Display()=="A"?"B":"A"));
 			// We need this so backuptool can do its magic
 			bool system_mount_state = PartitionManager.Is_Mounted_By_Path(PartitionManager.Get_Android_Root_Path());
 			bool vendor_mount_state = PartitionManager.Is_Mounted_By_Path("/vendor");
@@ -455,6 +456,7 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 				PartitionManager.UnMount_By_Path("/vendor", true);
 			if (!system_mount_state)
 				PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), true);
+			gui_warn("flash_ab_reboot=To flash additional zips, please reboot recovery to switch to the updated slot.");
 
 		} else {
 			if (Zip.EntryExists("ui.xml")) {

From 90df3de75ef05e014ba363d65a59421a04375e5a Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Fri, 7 Feb 2020 20:33:43 +0100
Subject: [PATCH 070/207] Replace "Reboot System" with "Reboot" for A/B devices

Users may want to reboot to recovery or bootloader after flashing
A/B zips to switch slots and install additional zips.

Change-Id: I128ceff6d0b361921c7ad7623eab93044e942d18
---
 gui/theme/common/landscape.xml | 12 ++++++++++++
 gui/theme/common/portrait.xml  | 11 +++++++++++
 gui/theme/common/watch.xml     | 11 +++++++++++
 3 files changed, 34 insertions(+)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 230b72f7b8..3af174ee3d 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -572,6 +572,7 @@
 			</button>
 
 			<button style="main_button_half_width">
+				<condition var1="tw_ab_device" var2="0"/>
 				<placement x="%center_x%" y="%row15a_y%"/>
 				<text>{@reboot_system_btn=Reboot System}</text>
 				<actions>
@@ -580,6 +581,17 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_width">
+				<condition var1="tw_ab_device" var2="1"/>
+				<placement x="%center_x%" y="%row15a_y%"/>
+				<text>{@reboot_btn=Reboot}</text>
+				<actions>
+					<action function="set">tw_back=main2</action>
+					<action function="page">reboot</action>
+				</actions>
+			</button>
+
+
 			<action>
 				<touch key="back"/>
 				<actions>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 8370414640..64b8776d00 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -524,6 +524,7 @@
 			</button>
 
 			<button style="main_button_half_height">
+				<condition var1="tw_ab_device" var2="0"/>
 				<placement x="%center_x%" y="%row21a_y%"/>
 				<text>{@reboot_system_btn=Reboot System}</text>
 				<actions>
@@ -532,6 +533,16 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_height">
+				<condition var1="tw_ab_device" var2="1"/>
+				<placement x="%center_x%" y="%row21a_y%"/>
+				<text>{@reboot_btn=Reboot}</text>
+				<actions>
+					<action function="set">tw_back=main2</action>
+					<action function="page">reboot</action>
+				</actions>
+			</button>
+
 			<action>
 				<touch key="back"/>
 				<actions>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 05b7bd2490..70ccf3816b 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -751,6 +751,7 @@
 			</button>
 
 			<button style="main_button_half_height">
+				<condition var1="tw_ab_device" var2="0"/>
 				<placement x="%col1_x_right%" y="%row13_y%"/>
 				<text>{@reboot_system_btn=Reboot System}</text>
 				<actions>
@@ -759,6 +760,16 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_height">
+				<condition var1="tw_ab_device" var2="1"/>
+				<placement x="%col1_x_right%" y="%row13_y%"/>
+				<text>{@reboot_btn=Reboot}</text>
+				<actions>
+					<action function="set">tw_back=main2</action>
+					<action function="page">reboot</action>
+				</actions>
+			</button>
+
 			<action>
 				<touch key="back"/>
 				<actions>

From ab16437de14fd9f1203b7e0ce82ea18eb56cae78 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Mon, 3 Feb 2020 15:38:02 +0100
Subject: [PATCH 071/207] Rework progressbar logic, implement scoped/split
 progressbar

Rework progressbar according to AOSP, this should fix various
issues with progressbar.

From AOSP:

   progress <frac> <secs>
       fill up the next <frac> part of of the progress bar over <secs> seconds. If <secs> is
       zero, use `set_progress` commands to manually control the progress of this segment of the
       bar.

   set_progress <frac>
       <frac> should be between 0.0 and 1.0; sets the progress bar within the segment defined by
       the most recent progress command.

Change-Id: I7f92359046288f3529cb2e98e6d54d410a248f1d
---
 data.cpp       | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 data.hpp       |  3 ++-
 gui/action.cpp |  6 ++++++
 twinstall.cpp  |  2 +-
 4 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/data.cpp b/data.cpp
index 83fb601117..1f9498fa47 100755
--- a/data.cpp
+++ b/data.cpp
@@ -510,18 +510,56 @@ int DataManager::SetValue(const string& varName, const unsigned long long& value
 	return SetValue(varName, valStr.str(), persist);
 }
 
+// For legacy code that doesn't set a scope
 int DataManager::SetProgress(const float Fraction) {
-	return SetValue("ui_progress", (float) (Fraction * 100.0));
+	if (SetValue("ui_portion_size", 0) != 0)
+		return -1;
+	if (SetValue("ui_portion_start", 0) != 0)
+		return -1;
+	ShowProgress(1, 0);
+	int res = _SetProgress(Fraction);
+	if (SetValue("ui_portion_size", 0) != 0)
+		return -1;
+	if (SetValue("ui_portion_start", 0) != 0)
+		return -1;
+	return res;
 }
 
-int DataManager::ShowProgress(const float Portion, const float Seconds)
+int DataManager::_SetProgress(float Fraction) {
+	float Portion_Start, Portion_Size;
+	GetValue("ui_portion_size", Portion_Size);
+	GetValue("ui_portion_start", Portion_Start);
+	//LOGINFO("SetProgress(%.2lf): Portion_Size: %.2lf Portion_Start: %.2lf\n", Fraction, Portion_Size, Portion_Start);
+	if (Fraction < 0.0)
+		Fraction = 0;
+	if (Fraction > 1.0)
+		Fraction = 1;
+	if (SetValue("ui_progress", (float) ((Portion_Start + (Portion_Size * Fraction)) * 100.0)) != 0)
+		return -1;
+	return (SetValue("ui_progress_portion", 0) != 0);
+}
+
+int DataManager::ShowProgress(float Portion, const float Seconds)
 {
-	float Starting_Portion;
-	GetValue("ui_progress_portion", Starting_Portion);
-	if (SetValue("ui_progress_portion", (float)(Portion * 100.0) + Starting_Portion) != 0)
+	float Portion_Start, Portion_Size;
+	GetValue("ui_portion_size", Portion_Size);
+	GetValue("ui_portion_start", Portion_Start);
+	Portion_Start += Portion_Size;
+	if(Portion + Portion_Start > 1.0)
+		Portion = 1.0 - Portion_Start;
+	//LOGINFO("ShowProgress(%.2lf, %.2lf): Portion_Start: %.2lf\n", Portion, Seconds, Portion_Start);
+	if (SetValue("ui_portion_start", Portion_Start) != 0)
 		return -1;
-	if (SetValue("ui_progress_frames", Seconds * 30) != 0)
+	if (SetValue("ui_portion_size", Portion) != 0)
 		return -1;
+	if (SetValue("ui_progress", (float)(Portion_Start * 100.0)) != 0)
+		return -1;
+	if(Seconds) {
+		if (SetValue("ui_progress_portion", (float)((Portion * 100.0) + Portion_Start)) != 0)
+			return -1;
+		if (SetValue("ui_progress_frames", Seconds * 48) != 0)
+			return -1;
+	}
 	return 0;
 }
 
diff --git a/data.hpp b/data.hpp
index d61fe8e7c0..4770ed5839 100755
--- a/data.hpp
+++ b/data.hpp
@@ -51,7 +51,8 @@ class DataManager
 	static int SetValue(const string& varName, const float value, const int persist = 0);
 	static int SetValue(const string& varName, const unsigned long long& value, const int persist = 0);
 	static int SetProgress(const float Fraction);
-	static int ShowProgress(const float Portion, const float Seconds);
+	static int _SetProgress(float Fraction);
+	static int ShowProgress(float Portion, const float Seconds);
 
 	static void DumpValues();
 	static void update_tz_environment_variables();
diff --git a/gui/action.cpp b/gui/action.cpp
index 0216d849e2..1143ba3195 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -369,6 +369,8 @@ int GUIAction::flash_zip(std::string filename, int* wipe_cache)
 	int ret_val = 0;
 
 	DataManager::SetValue("ui_progress", 0);
+	DataManager::SetValue("ui_portion_size", 0);
+	DataManager::SetValue("ui_portion_start", 0);
 
 	if (filename.empty())
 	{
@@ -408,6 +410,8 @@ int GUIAction::flash_zip(std::string filename, int* wipe_cache)
 	// Done
 	DataManager::SetValue("ui_progress", 100);
 	DataManager::SetValue("ui_progress", 0);
+	DataManager::SetValue("ui_portion_size", 0);
+	DataManager::SetValue("ui_portion_start", 0);
 	return ret_val;
 }
 
@@ -490,6 +494,8 @@ void GUIAction::operation_start(const string operation_name)
 	time(&Start);
 	DataManager::SetValue(TW_ACTION_BUSY, 1);
 	DataManager::SetValue("ui_progress", 0);
+	DataManager::SetValue("ui_portion_size", 0);
+	DataManager::SetValue("ui_portion_start", 0);
 	DataManager::SetValue("tw_operation", operation_name);
 	DataManager::SetValue("tw_operation_state", 0);
 	DataManager::SetValue("tw_operation_status", 0);
diff --git a/twinstall.cpp b/twinstall.cpp
index 2b6f9c77ce..ae1abc5c47 100755
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -300,7 +300,7 @@ static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zi
 		} else if (strcmp(command, "set_progress") == 0) {
 			char* fraction_char = strtok(NULL, " \n");
 			float fraction_float = strtof(fraction_char, NULL);
-			DataManager::SetProgress(fraction_float);
+			DataManager::_SetProgress(fraction_float);
 		} else if (strcmp(command, "ui_print") == 0) {
 			char* display_value = strtok(NULL, "\n");
 			if (display_value) {

From 8ff93eb2234f31298d4f3cfe903887c3f6ecc583 Mon Sep 17 00:00:00 2001
From: mauronofrio <poronofrio@gmail.com>
Date: Mon, 16 Mar 2020 14:59:39 +0000
Subject: [PATCH 072/207] Set toolbox as default for android 9+ TWRPs

I created also a new flag for who wants to use busybox
on android 9+ trees.

To use busybox set the flag like this:

TW_FORCE_USE_BUSYBOX := true

Change-Id: If2231e71c008b36e9ae09857539b82d77e2a9a06
---
 Android.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Android.mk b/Android.mk
index 81a2f5ddf2..595d8b410a 100755
--- a/Android.mk
+++ b/Android.mk
@@ -217,6 +217,11 @@ endif
 LOCAL_CFLAGS += -DTW_GIT_REVISION='"$(tw_git_revision)"'
 
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
+ifeq ($(TW_FORCE_USE_BUSYBOX), true)
+    TW_USE_TOOLBOX := false
+else
+    TW_USE_TOOLBOX := true
+endif
 ifeq ($(TW_EXCLUDE_MTP),)
     LOCAL_SHARED_LIBRARIES += libtwrpmtp-ffs
 endif

From 5db50ded70efcea4fe8286689a764860861fdc16 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Mon, 18 May 2020 11:26:23 -0400
Subject: [PATCH 073/207] vold_decrypt: add missing includes for ext4 policies

Change-Id: Ic68360a13ee8b54cff1f7ec01d4ab1be00673266
---
 crypto/vold_decrypt/Android.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/vold_decrypt/Android.mk b/crypto/vold_decrypt/Android.mk
index dc302ad51d..c9b99b4b70 100644
--- a/crypto/vold_decrypt/Android.mk
+++ b/crypto/vold_decrypt/Android.mk
@@ -17,7 +17,6 @@ LOCAL_PATH := $(call my-dir)
 ifeq ($(TW_INCLUDE_CRYPTO), true)
     ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),)
 
-
         # Parse TW_CRYPTO_USE_SYSTEM_VOLD
         ifeq ($(TW_CRYPTO_USE_SYSTEM_VOLD),true)
             # Just enabled, so only vold + vdc
@@ -115,6 +114,12 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
 
         LOCAL_SRC_FILES = vold_decrypt.cpp
         LOCAL_SHARED_LIBRARIES := libcutils
+        LOCAL_C_INCLUDES += system/extras/ext4_utils/include
+        ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
+            LOCAL_C_INCLUDES += bootable/recovery/crypto/fscrypt
+        else
+            LOCAL_C_INCLUDES += bootable/recovery/crypto/ext4crypt
+        endif
         include $(BUILD_STATIC_LIBRARY)
 
         ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)

From f62d249f8e497e73d38251ea4841c69d59492baa Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Wed, 20 May 2020 10:15:34 -0400
Subject: [PATCH 074/207] includes: update includes for base and ext4 policies

Change-Id: I212eec2d4ce07b4b72a1c8582ed83f3f8a038a1e
---
 Android.mk         | 3 +++
 partition.cpp      | 2 ++
 twrp-functions.cpp | 8 ++++++++
 twrp-functions.hpp | 5 +++++
 twrp.cpp           | 7 ++++---
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 595d8b410a..3d9800d35f 100755
--- a/Android.mk
+++ b/Android.mk
@@ -143,6 +143,9 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
     LOCAL_SHARED_LIBRARIES += libstlport
     LOCAL_CFLAGS += -DTW_NO_SHA2_LIBRARY
 endif
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 25; echo $$?),0)
+    LOCAL_CFLAGS += -DUSE_OLD_BASE_INCLUDE
+endif
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0)
     LOCAL_SHARED_LIBRARIES += libmincrypttwrp
     LOCAL_C_INCLUDES += $(LOCAL_PATH)/libmincrypt/includes
diff --git a/partition.cpp b/partition.cpp
index b47c2947f7..e0b56a97a0 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -2458,6 +2458,7 @@ bool TWPartition::Wipe_Data_Without_Wiping_Media() {
 }
 
 bool TWPartition::Recreate_AB_Cache_Dir(const ext4_encryption_policy &policy) {
+#ifdef TW_INCLUDE_FBE
 	struct passwd pd;
 	struct passwd *pwdptr = &pd;
 	struct passwd *tempPd;
@@ -2507,6 +2508,7 @@ bool TWPartition::Recreate_AB_Cache_Dir(const ext4_encryption_policy &policy) {
 			}
 		}
 	}
+#endif
 	return true;
 }
 
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 2f563d9999..e0e4301fa2 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1336,6 +1336,7 @@ int TWFunc::Property_Override(string Prop_Name, string Prop_Value) {
 }
 
 bool TWFunc::Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path) {
+#ifdef TW_INCLUDE_FBE
 	if (!TWFunc::Path_Exists(path)) {
 		LOGERR("Unable to find %s to get policy\n", path.c_str());
 		return false;
@@ -1344,10 +1345,12 @@ bool TWFunc::Get_Encryption_Policy(ext4_encryption_policy &policy, std::string p
 		LOGERR("No policy set for path %s\n", path.c_str());
 		return false;
 	}
+#endif
 	return true;
 }
 
 bool TWFunc::Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy) {
+#ifdef TW_INCLUDE_FBE
 	if (!TWFunc::Path_Exists(path)) {
 		LOGERR("unable to find %s to set policy\n", path.c_str());
 		return false;
@@ -1359,10 +1362,12 @@ bool TWFunc::Set_Encryption_Policy(std::string path, const ext4_encryption_polic
 		LOGERR("unable to set policy for path: %s\n", path.c_str());
 		return false;
 	}
+#endif
 	return true;
 }
 
 bool TWFunc::Is_Data_Wiped(std::string path) {
+#ifdef TW_INCLUDE_FBE
 	DIR* d = opendir(path.c_str());
 	size_t file_count = 0;
 	if (d != NULL) {
@@ -1380,5 +1385,8 @@ bool TWFunc::Is_Data_Wiped(std::string path) {
 	}
 	LOGINFO("file_count: %zu\n", file_count);
 	return file_count == 0;
+#else
+	return true;
+#endif
 }
 #endif // ndef BUILD_TWRPTAR_MAIN
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 9c8378853f..21c16a78e9 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -21,7 +21,12 @@
 
 #include <string>
 #include <vector>
+
+#ifdef USE_FSCRYPT
 #include <ext4_utils/ext4_crypt.h>
+#else
+#include "ext4crypt_tar.h"
+#endif
 
 #include "twrpDigest/twrpDigest.hpp"
 #include "ext4crypt_tar.h"
diff --git a/twrp.cpp b/twrp.cpp
index 036a2375e1..247081fc30 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -43,10 +43,11 @@ extern "C" {
 #include "twrp-functions.hpp"
 #include "data.hpp"
 #include "partitions.hpp"
-#ifdef __ANDROID_API_N__
-#include <android-base/strings.h>
-#else
+
+#ifdef USE_OLD_BASE_INCLUDE
 #include <base/strings.h>
+#else
+#include <android-base/strings.h>
 #endif
 #include "openrecoveryscript.hpp"
 #include "variables.h"

From 5738d3d94312dabc387e3743e3bee0e6efe695b5 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Wed, 20 May 2020 22:16:37 +0200
Subject: [PATCH 075/207] Fix ro.twrp.sar, as was originally intended in #1883

Change-Id: Ifd2d938e4e0901e86dcdfcc15231bcbb129ba8de
---
 twrp.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/twrp.cpp b/twrp.cpp
index 036a2375e1..34bdf9a48c 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -143,14 +143,14 @@ int main(int argc, char **argv) {
 		if(SarPartitionManager.Mount_By_Path("/s", false)) {
 			if (TWFunc::Path_Exists("/s/build.prop")) {
 				LOGINFO("SAR-DETECT: Non-SAR System detected\n");
-				property_set("ro.twrp.sar", "0");
+				property_set("ro.twrp.sar", "false");
 				rmdir("/system_root");
 			} else if (TWFunc::Path_Exists("/s/system/build.prop")) {
 				LOGINFO("SAR-DETECT: SAR System detected\n");
-				property_set("ro.twrp.sar", "1");
+				property_set("ro.twrp.sar", "true");
 			} else {
 				LOGINFO("SAR-DETECT: No build.prop found, falling back to %s\n", fallback_sar ? "SAR" : "Non-SAR");
-				property_set("ro.twrp.sar", fallback_sar ? "1" : "0");
+				property_set("ro.twrp.sar", fallback_sar ? "true" : "false");
 			}
 
 // We are doing this here during SAR-detection, since we are mounting the system-partition anyway
@@ -183,7 +183,7 @@ int main(int argc, char **argv) {
 			SarPartitionManager.UnMount_By_Path("/s", false);
 		} else {
 			LOGINFO("SAR-DETECT: Could not mount system partition, falling back to %s\n", fallback_sar ? "SAR":"Non-SAR");
-			property_set("ro.twrp.sar", fallback_sar ? "1" : "0");
+			property_set("ro.twrp.sar", fallback_sar ? "true" : "false");
 		}
 
 		rmdir("/s");

From 5a79f67a1b1bd1bcadeca0a4896a871646652534 Mon Sep 17 00:00:00 2001
From: Noah Jacobson <noahajac@gmail.com>
Date: Sun, 28 Apr 2019 00:10:07 -0400
Subject: [PATCH 076/207] 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

Change-Id: Id2681bc2b1012a0571417f7a6e0b980b1b25c61c
---
 crypto/ext4crypt/Decrypt.cpp      |  31 ++-
 crypto/ext4crypt/Ext4Crypt.cpp    |  94 +------
 crypto/ext4crypt/Ext4Crypt.h      |   2 +-
 crypto/ext4crypt/Ext4CryptPie.cpp | 440 +-----------------------------
 crypto/ext4crypt/Ext4CryptPie.h   |   4 +-
 gui/action.cpp                    |  24 +-
 gui/gui.hpp                       |   1 +
 gui/listbox.cpp                   |  60 +++-
 gui/theme/common/landscape.xml    |  68 ++++-
 gui/theme/common/languages/en.xml |  12 +-
 gui/theme/common/portrait.xml     |  75 ++++-
 gui/theme/common/watch.xml        |  76 +++++-
 openrecoveryscript.cpp            |  88 ++++--
 orscmd/orscmd.cpp                 |   2 +-
 partition.cpp                     | 120 ++++----
 partitionmanager.cpp              | 172 ++++++++++--
 partitions.hpp                    |  14 +-
 twrp.cpp                          |  12 +-
 18 files changed, 639 insertions(+), 656 deletions(-)

diff --git a/crypto/ext4crypt/Decrypt.cpp b/crypto/ext4crypt/Decrypt.cpp
index d8542dca72..468601fc8b 100644
--- a/crypto/ext4crypt/Decrypt.cpp
+++ b/crypto/ext4crypt/Decrypt.cpp
@@ -543,13 +543,16 @@ std::string unwrapSyntheticPasswordBlob(const std::string& spblob_path, const st
 	std::string disk_decryption_secret_key = "";
 
 	std::string keystore_alias_subid;
-	if (!Find_Keystore_Alias_SubID_And_Prep_Files(user_id, keystore_alias_subid, handle_str)) {
-		printf("failed to scan keystore alias subid and prep keystore files\n");
-		return disk_decryption_secret_key;
-	}
+	// Can be stored in user 0, so check for both.
+	if (!Find_Keystore_Alias_SubID_And_Prep_Files(user_id, keystore_alias_subid, handle_str) &&
+		!Find_Keystore_Alias_SubID_And_Prep_Files(0, keystore_alias_subid, handle_str)) 
+	{
+    	printf("failed to scan keystore alias subid and prep keystore files\n");
+    	return disk_decryption_secret_key;
+  	}
 
 	// First get the keystore service
-    sp<IBinder> binder = getKeystoreBinderRetry();
+	sp<IBinder> binder = getKeystoreBinderRetry();
 #ifdef USE_KEYSTORAGE_4
 	sp<security::IKeystoreService> service = interface_cast<security::IKeystoreService>(binder);
 #else
@@ -1159,15 +1162,15 @@ bool Decrypt_User_Synth_Pass(const userid_t user_id, const std::string& Password
 		printf("e4crypt_unlock_user_key returned fail\n");
 		return Free_Return(retval, weaver_key, &pwd);
 	}
-#ifdef USE_KEYSTORAGE_4
+/*#ifdef USE_KEYSTORAGE_4
 	if (!e4crypt_prepare_user_storage("", user_id, 0, flags)) {
 #else
 	if (!e4crypt_prepare_user_storage(nullptr, user_id, 0, flags)) {
 #endif
 		printf("failed to e4crypt_prepare_user_storage\n");
 		return Free_Return(retval, weaver_key, &pwd);
-	}
-	printf("Decrypted Successfully!\n");
+	}*/
+	printf("User %i Decrypted Successfully!\n", user_id);
 	retval = true;
 	return Free_Return(retval, weaver_key, &pwd);
 }
@@ -1249,15 +1252,15 @@ bool Decrypt_User(const userid_t user_id, const std::string& Password) {
 			printf("e4crypt_unlock_user_key returned fail\n");
 			return false;
 		}
-#ifdef USE_KEYSTORAGE_4
+/*#ifdef USE_KEYSTORAGE_4
 		if (!e4crypt_prepare_user_storage("", user_id, 0, flags)) {
 #else
 		if (!e4crypt_prepare_user_storage(nullptr, user_id, 0, flags)) {
 #endif
 			printf("failed to e4crypt_prepare_user_storage\n");
 			return false;
-		}
-		printf("Decrypted Successfully!\n");
+		}*/
+		printf("User %i Decrypted Successfully!\n", user_id);
 		return true;
 	}
 	if (stat("/data/system_de/0/spblob", &st) == 0) {
@@ -1337,14 +1340,14 @@ bool Decrypt_User(const userid_t user_id, const std::string& Password) {
 		printf("e4crypt_unlock_user_key returned fail\n");
 		return false;
 	}
-#ifdef USE_KEYSTORAGE_4
+/*#ifdef USE_KEYSTORAGE_4
 		if (!e4crypt_prepare_user_storage("", user_id, 0, flags)) {
 #else
 		if (!e4crypt_prepare_user_storage(nullptr, user_id, 0, flags)) {
 #endif
 		printf("failed to e4crypt_prepare_user_storage\n");
 		return false;
-	}
-	printf("Decrypted Successfully!\n");
+	}*/
+	printf("User %i Decrypted Successfully!\n", user_id);
 	return true;
 }
diff --git a/crypto/ext4crypt/Ext4Crypt.cpp b/crypto/ext4crypt/Ext4Crypt.cpp
index c9e71fd9bb..9360b1a2e1 100644
--- a/crypto/ext4crypt/Ext4Crypt.cpp
+++ b/crypto/ext4crypt/Ext4Crypt.cpp
@@ -63,6 +63,7 @@
 #define MANAGE_MISC_DIRS 0
 
 #include <cutils/fs.h>
+#include <cutils/properties.h>
 
 #include <android-base/file.h>
 //#include <android-base/logging.h>
@@ -316,16 +317,6 @@ bool lookup_key_ref(const std::map<userid_t, std::string>& key_map, userid_t use
     return true;
 }
 
-static bool ensure_policy(const std::string& raw_ref __unused, const std::string& path) {
-    return true;
-    // ensure policy will set a policy if one is not set on an empty folder - we don't want to do this in recovery
-    /*if (e4crypt_policy_ensure(path.c_str(), raw_ref.data(), raw_ref.size()) != 0) {
-        LOG(ERROR) << "Failed to set policy on: " << path << "\n";
-        return false;
-    }
-    return true;*/
-}
-
 static bool is_numeric(const char* name) {
     for (const char* p = name; *p != '\0'; p++) {
         if (!isdigit(*p)) return false;
@@ -363,6 +354,9 @@ static bool load_all_de_keys() {
             if (!install_key(key, &raw_ref)) return false;
             s_de_key_raw_refs[user_id] = raw_ref;
             LOG(DEBUG) << "Installed de key for user " << user_id;
+
+            std::string user_prop = "twrp.user." + std::to_string(user_id) + ".decrypt";
+            property_set(user_prop.c_str(), "0");
         }
     }
     // ext4enc:TODO: go through all DE directories, ensure that all user dirs have the
@@ -411,13 +405,6 @@ bool e4crypt_init_user0() {
         // explicit calls to install DE keys for secondary users
         if (!load_all_de_keys()) return false;
     }
-    // We can only safely prepare DE storage here, since CE keys are probably
-    // entangled with user credentials.  The framework will always prepare CE
-    // storage once CE keys are installed.
-    if (!e4crypt_prepare_user_storage(nullptr, 0, 0, FLAG_STORAGE_DE)) {
-        LOG(ERROR) << "Failed to prepare user 0 storage";
-        return false;
-    }
 
     // If this is a non-FBE device that recently left an emulated mode,
     // restore user data directories to known-good state.
@@ -458,79 +445,6 @@ bool e4crypt_unlock_user_key(userid_t user_id, int serial __unused, const char*
         }
     } else {
 		printf("Emulation mode not supported in TWRP\n");
-        // When in emulation mode, we just use chmod. However, we also
-        // unlock directories when not in emulation mode, to bring devices
-        // back into a known-good state.
-        /*if (!emulated_unlock(android::vold::BuildDataSystemCePath(user_id), 0771) ||
-            !emulated_unlock(android::vold::BuildDataMiscCePath(user_id), 01771) ||
-            !emulated_unlock(android::vold::BuildDataMediaCePath(nullptr, user_id), 0770) ||
-            !emulated_unlock(android::vold::BuildDataUserCePath(nullptr, user_id), 0771)) {
-            LOG(ERROR) << "Failed to unlock user " << user_id;
-            return false;
-        }*/
     }
     return true;
 }
-
-bool e4crypt_prepare_user_storage(const char* volume_uuid, userid_t user_id, int serial __unused,
-        int flags) {
-
-    if (flags & FLAG_STORAGE_DE) {
-        // DE_sys key
-        auto system_legacy_path = android::vold::BuildDataSystemLegacyPath(user_id);
-        auto misc_legacy_path = android::vold::BuildDataMiscLegacyPath(user_id);
-        auto profiles_de_path = android::vold::BuildDataProfilesDePath(user_id);
-        auto foreign_de_path = android::vold::BuildDataProfilesForeignDexDePath(user_id);
-
-        // DE_n key
-        auto system_de_path = android::vold::BuildDataSystemDePath(user_id);
-        auto misc_de_path = android::vold::BuildDataMiscDePath(user_id);
-        auto user_de_path = android::vold::BuildDataUserDePath(volume_uuid, user_id);
-
-        if (!prepare_dir(system_legacy_path, 0700, AID_SYSTEM, AID_SYSTEM)) return false;
-#if MANAGE_MISC_DIRS
-        if (!prepare_dir(misc_legacy_path, 0750, multiuser_get_uid(user_id, AID_SYSTEM),
-                multiuser_get_uid(user_id, AID_EVERYBODY))) return false;
-#endif
-        if (!prepare_dir(profiles_de_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false;
-        if (!prepare_dir(foreign_de_path, 0773, AID_SYSTEM, AID_SYSTEM)) return false;
-
-        if (!prepare_dir(system_de_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false;
-        if (!prepare_dir(misc_de_path, 01771, AID_SYSTEM, AID_MISC)) return false;
-        if (!prepare_dir(user_de_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false;
-
-        // For now, FBE is only supported on internal storage
-        if (e4crypt_is_native() && volume_uuid == nullptr) {
-            std::string de_raw_ref;
-            if (!lookup_key_ref(s_de_key_raw_refs, user_id, &de_raw_ref)) return false;
-            if (!ensure_policy(de_raw_ref, system_de_path)) return false;
-            if (!ensure_policy(de_raw_ref, misc_de_path)) return false;
-            if (!ensure_policy(de_raw_ref, user_de_path)) return false;
-        }
-    }
-
-    if (flags & FLAG_STORAGE_CE) {
-        // CE_n key
-        auto system_ce_path = android::vold::BuildDataSystemCePath(user_id);
-        auto misc_ce_path = android::vold::BuildDataMiscCePath(user_id);
-        auto media_ce_path = android::vold::BuildDataMediaCePath(volume_uuid, user_id);
-        auto user_ce_path = android::vold::BuildDataUserCePath(volume_uuid, user_id);
-
-        if (!prepare_dir(system_ce_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false;
-        if (!prepare_dir(misc_ce_path, 01771, AID_SYSTEM, AID_MISC)) return false;
-        if (!prepare_dir(media_ce_path, 0770, AID_MEDIA_RW, AID_MEDIA_RW)) return false;
-        if (!prepare_dir(user_ce_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false;
-
-        // For now, FBE is only supported on internal storage
-        if (e4crypt_is_native() && volume_uuid == nullptr) {
-            std::string ce_raw_ref;
-            if (!lookup_key_ref(s_ce_key_raw_refs, user_id, &ce_raw_ref)) return false;
-            if (!ensure_policy(ce_raw_ref, system_ce_path)) return false;
-            if (!ensure_policy(ce_raw_ref, misc_ce_path)) return false;
-            if (!ensure_policy(ce_raw_ref, media_ce_path)) return false;
-            if (!ensure_policy(ce_raw_ref, user_ce_path)) return false;
-        }
-    }
-
-    return true;
-}
diff --git a/crypto/ext4crypt/Ext4Crypt.h b/crypto/ext4crypt/Ext4Crypt.h
index 57623e35c2..beb5d8fe3d 100644
--- a/crypto/ext4crypt/Ext4Crypt.h
+++ b/crypto/ext4crypt/Ext4Crypt.h
@@ -38,7 +38,7 @@ bool e4crypt_init_user0();
 bool e4crypt_unlock_user_key(userid_t user_id, int serial, const char* token, const char* secret);
 //bool e4crypt_lock_user_key(userid_t user_id);
 
-bool e4crypt_prepare_user_storage(const char* volume_uuid, userid_t user_id, int serial, int flags);
+//bool e4crypt_prepare_user_storage(const char* volume_uuid, userid_t user_id, int serial, int flags);
 //bool e4crypt_destroy_user_storage(const char* volume_uuid, userid_t user_id, int flags);
 
 bool lookup_key_ref(const std::map<userid_t, std::string>& key_map, userid_t user_id,
diff --git a/crypto/ext4crypt/Ext4CryptPie.cpp b/crypto/ext4crypt/Ext4CryptPie.cpp
index 548e4e445c..48b4ec963e 100644
--- a/crypto/ext4crypt/Ext4CryptPie.cpp
+++ b/crypto/ext4crypt/Ext4CryptPie.cpp
@@ -110,9 +110,9 @@ static bool e4crypt_is_emulated() {
     return property_get_bool("persist.sys.emulate_fbe", false);
 }
 
-static const char* escape_empty(const std::string& value) {
+/*static const char* escape_empty(const std::string& value) {
     return value.empty() ? "null" : value.c_str();
-}
+}*/
 
 static std::string get_de_key_path(userid_t user_id) {
     return StringPrintf("%s/de/%d", user_key_dir.c_str(), user_id);
@@ -155,23 +155,6 @@ static std::string get_ce_key_current_path(const std::string& directory_path) {
     return directory_path + "/current";
 }
 
-/*static bool get_ce_key_new_path(const std::string& directory_path,
-                                const std::vector<std::string>& paths,
-                                std::string *ce_key_path) {
-    if (paths.empty()) {
-        *ce_key_path = get_ce_key_current_path(directory_path);
-        return true;
-    }
-    for (unsigned int i = 0; i < UINT_MAX; i++) {
-        auto const candidate = StringPrintf("%s/cx%010u", directory_path.c_str(), i);
-        if (paths[0] < candidate) {
-            *ce_key_path = candidate;
-            return true;
-        }
-    }
-    return false;
-}*/
-
 // Discard all keys but the named one; rename it to canonical name.
 // No point in acting on errors in this; ignore them.
 static void fixate_user_ce_key(const std::string& directory_path, const std::string &to_fix,
@@ -259,15 +242,6 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
     return true;
 }
 
-/*static bool destroy_dir(const std::string& dir) {
-    LOG(DEBUG) << "Destroying: " << dir;
-    if (rmdir(dir.c_str()) != 0 && errno != ENOENT) {
-        PLOG(ERROR) << "Failed to destroy " << dir;
-        return false;
-    }
-    return true;
-}*/
-
 // NB this assumes that there is only one thread listening for crypt commands, because
 // it creates keys in a fixed location.
 static bool create_and_install_user_keys(userid_t user_id, bool create_ephemeral) {
@@ -327,13 +301,6 @@ static void get_data_file_encryption_modes(PolicyKeyRef* key_ref) {
         android::base::GetProperty("fbe.filenames", "aes-256-heh");
 }
 
-static bool ensure_policy(const PolicyKeyRef& key_ref, const std::string& path) {
-    return true;
-    /*return e4crypt_policy_ensure(path.c_str(), key_ref.key_raw_ref.data(),
-                                 key_ref.key_raw_ref.size(), key_ref.contents_mode.c_str(),
-                                 key_ref.filenames_mode.c_str()) == 0;*/
-}
-
 static bool is_numeric(const char* name) {
     for (const char* p = name; *p != '\0'; p++) {
         if (!isdigit(*p)) return false;
@@ -379,6 +346,9 @@ static bool load_all_de_keys() {
             if (!android::vold::installKey(key, &raw_ref)) return false;
             s_de_key_raw_refs[user_id] = raw_ref;
             LOG(DEBUG) << "Installed de key for user " << user_id << std::endl;
+
+            std::string user_prop = "twrp.user." + std::to_string(user_id) + ".decrypt";
+            property_set(user_prop.c_str(), "0");
         }
     }
     // ext4enc:TODO: go through all DE directories, ensure that all user dirs have the
@@ -435,13 +405,6 @@ bool e4crypt_init_user0() {
         // explicit calls to install DE keys for secondary users
         if (!load_all_de_keys()) return false;
     }
-    // We can only safely prepare DE storage here, since CE keys are probably
-    // entangled with user credentials.  The framework will always prepare CE
-    // storage once CE keys are installed.
-    if (!e4crypt_prepare_user_storage("", 0, 0, /*android::os::IVold::*/STORAGE_FLAG_DE)) {
-        LOG(ERROR) << "Failed to prepare user 0 storage" << std::endl;
-        return false;
-    }
 
     // If this is a non-FBE device that recently left an emulated mode,
     // restore user data directories to known-good state.
@@ -452,92 +415,6 @@ bool e4crypt_init_user0() {
     return true;
 }
 
-/*bool e4crypt_vold_create_user_key(userid_t user_id, int serial, bool ephemeral) {
-    LOG(DEBUG) << "TWRP NOT e4crypt_vold_create_user_key for " << user_id << " serial " << serial;
-    return true;
-    if (!e4crypt_is_native()) {
-        return true;
-    }
-    // FIXME test for existence of key that is not loaded yet
-    if (s_ce_key_raw_refs.count(user_id) != 0) {
-        LOG(ERROR) << "Already exists, can't e4crypt_vold_create_user_key for " << user_id
-                   << " serial " << serial;
-        // FIXME should we fail the command?
-        return true;
-    }
-    if (!create_and_install_user_keys(user_id, ephemeral)) {
-        return false;
-    }
-    return true;
-}
-
-static void drop_caches() {
-    // Clean any dirty pages (otherwise they won't be dropped).
-    sync();
-    // Drop inode and page caches.
-    if (!WriteStringToFile("3", "/proc/sys/vm/drop_caches")) {
-        PLOG(ERROR) << "Failed to drop caches during key eviction";
-    }
-}
-
-static bool evict_ce_key(userid_t user_id) {
-	LOG(ERROR) << "TWRP NOT evict_ce_key\n";
-	return true;
-    s_ce_keys.erase(user_id);
-    bool success = true;
-    std::string raw_ref;
-    // If we haven't loaded the CE key, no need to evict it.
-    if (lookup_key_ref(s_ce_key_raw_refs, user_id, &raw_ref)) {
-        success &= android::vold::evictKey(raw_ref);
-        drop_caches();
-    }
-    s_ce_key_raw_refs.erase(user_id);
-    return success;
-}
-
-bool e4crypt_destroy_user_key(userid_t user_id) {
-    LOG(DEBUG) << "NOT e4crypt_destroy_user_key(" << user_id << ")";
-    return true;
-    if (!e4crypt_is_native()) {
-        return true;
-    }
-    bool success = true;
-    std::string raw_ref;
-    success &= evict_ce_key(user_id);
-    success &= lookup_key_ref(s_de_key_raw_refs, user_id, &raw_ref)
-        && android::vold::evictKey(raw_ref);
-    s_de_key_raw_refs.erase(user_id);
-    auto it = s_ephemeral_users.find(user_id);
-    if (it != s_ephemeral_users.end()) {
-        s_ephemeral_users.erase(it);
-    } else {
-        for (auto const path: get_ce_key_paths(get_ce_key_directory_path(user_id))) {
-            success &= android::vold::destroyKey(path);
-        }
-        auto de_key_path = get_de_key_path(user_id);
-        if (android::vold::pathExists(de_key_path)) {
-            success &= android::vold::destroyKey(de_key_path);
-        } else {
-            LOG(INFO) << "Not present so not erasing: " << de_key_path;
-        }
-    }
-    return success;
-}
-
-static bool emulated_lock(const std::string& path) {
-    if (chmod(path.c_str(), 0000) != 0) {
-        PLOG(ERROR) << "Failed to chmod " << path;
-        return false;
-    }
-#if EMULATED_USES_SELINUX
-    if (setfilecon(path.c_str(), "u:object_r:storage_stub_file:s0") != 0) {
-        PLOG(WARNING) << "Failed to setfilecon " << path;
-        return false;
-    }
-#endif
-    return true;
-}*/
-
 static bool emulated_unlock(const std::string& path, mode_t mode) {
     if (chmod(path.c_str(), mode) != 0) {
         PLOG(ERROR) << "Failed to chmod " << path << std::endl;
@@ -566,92 +443,6 @@ static bool parse_hex(const std::string& hex, std::string* result) {
     return true;
 }
 
-static std::string volkey_path(const std::string& misc_path, const std::string& volume_uuid) {
-    return misc_path + "/vold/volume_keys/" + volume_uuid + "/default";
-}
-
-static std::string volume_secdiscardable_path(const std::string& volume_uuid) {
-    return systemwide_volume_key_dir + "/" + volume_uuid + "/secdiscardable";
-}
-
-static bool read_or_create_volkey(const std::string& misc_path, const std::string& volume_uuid,
-                                  PolicyKeyRef* key_ref) {
-    auto secdiscardable_path = volume_secdiscardable_path(volume_uuid);
-    std::string secdiscardable_hash;
-    bool wrapped_key_supported = false;
-    if (android::vold::pathExists(secdiscardable_path)) {
-        if (!android::vold::readSecdiscardable(secdiscardable_path, &secdiscardable_hash))
-            return false;
-    } else {
-        if (fs_mkdirs(secdiscardable_path.c_str(), 0700) != 0) {
-            PLOG(ERROR) << "Creating directories for: " << secdiscardable_path << std::endl;
-            return false;
-        }
-        if (!android::vold::createSecdiscardable(secdiscardable_path, &secdiscardable_hash))
-            return false;
-    }
-    auto key_path = volkey_path(misc_path, volume_uuid);
-    if (fs_mkdirs(key_path.c_str(), 0700) != 0) {
-        PLOG(ERROR) << "Creating directories for: " << key_path << std::endl;
-        return false;
-    }
-    android::vold::KeyAuthentication auth("", secdiscardable_hash);
-    wrapped_key_supported = is_wrapped_key_supported_external();
-    if (!android::vold::retrieveAndInstallKey(true, auth, key_path, key_path + "_tmp",
-                                              &key_ref->key_raw_ref, wrapped_key_supported))
-        return false;
-    key_ref->contents_mode =
-        android::base::GetProperty("ro.crypto.volume.contents_mode", "aes-256-xts");
-    key_ref->filenames_mode =
-        android::base::GetProperty("ro.crypto.volume.filenames_mode", "aes-256-heh");
-    return true;
-}
-
-/*static bool destroy_volkey(const std::string& misc_path, const std::string& volume_uuid) {
-    auto path = volkey_path(misc_path, volume_uuid);
-    if (!android::vold::pathExists(path)) return true;
-    return android::vold::destroyKey(path);
-}
-
-bool e4crypt_add_user_key_auth(userid_t user_id, int serial, const std::string& token_hex,
-                               const std::string& secret_hex) {
-    LOG(DEBUG) << "e4crypt_add_user_key_auth " << user_id << " serial=" << serial
-               << " token_present=" << (token_hex != "!");
-    if (!e4crypt_is_native()) return true;
-    if (s_ephemeral_users.count(user_id) != 0) return true;
-    std::string token, secret;
-    if (!parse_hex(token_hex, &token)) return false;
-    if (!parse_hex(secret_hex, &secret)) return false;
-    auto auth = secret.empty() ? kEmptyAuthentication
-                                   : android::vold::KeyAuthentication(token, secret);
-    auto it = s_ce_keys.find(user_id);
-    if (it == s_ce_keys.end()) {
-        LOG(ERROR) << "Key not loaded into memory, can't change for user " << user_id;
-        return false;
-    }
-    const auto &ce_key = it->second;
-    auto const directory_path = get_ce_key_directory_path(user_id);
-    auto const paths = get_ce_key_paths(directory_path);
-    std::string ce_key_path;
-    if (!get_ce_key_new_path(directory_path, paths, &ce_key_path)) return false;
-    if (!android::vold::storeKeyAtomically(ce_key_path, user_key_temp, auth, ce_key)) return false;
-    return true;
-}
-
-bool e4crypt_fixate_newest_user_key_auth(userid_t user_id) {
-    LOG(DEBUG) << "e4crypt_fixate_newest_user_key_auth " << user_id;
-    if (!e4crypt_is_native()) return true;
-    if (s_ephemeral_users.count(user_id) != 0) return true;
-    auto const directory_path = get_ce_key_directory_path(user_id);
-    auto const paths = get_ce_key_paths(directory_path);
-    if (paths.empty()) {
-        LOG(ERROR) << "No ce keys present, cannot fixate for user " << user_id;
-        return false;
-    }
-    fixate_user_ce_key(directory_path, paths[0], paths);
-    return true;
-}*/
-
 // TODO: rename to 'install' for consistency, and take flags to know which keys to install
 bool e4crypt_unlock_user_key(userid_t user_id, int serial, const std::string& token_hex,
                              const std::string& secret_hex) {
@@ -684,224 +475,3 @@ bool e4crypt_unlock_user_key(userid_t user_id, int serial, const std::string& to
     }
     return true;
 }
-
-// TODO: rename to 'evict' for consistency
-/*bool e4crypt_lock_user_key(userid_t user_id) {
-    LOG(DEBUG) << "TWRP NOTe4crypt_lock_user_key " << user_id;
-    return true;
-    if (e4crypt_is_native()) {
-        return evict_ce_key(user_id);
-    } else if (e4crypt_is_emulated()) {
-        // When in emulation mode, we just use chmod
-        if (!emulated_lock(android::vold::BuildDataSystemCePath(user_id)) ||
-            !emulated_lock(android::vold::BuildDataMiscCePath(user_id)) ||
-            !emulated_lock(android::vold::BuildDataMediaCePath("", user_id)) ||
-            !emulated_lock(android::vold::BuildDataUserCePath("", user_id))) {
-            LOG(ERROR) << "Failed to lock user " << user_id;
-            return false;
-        }
-    }
-
-    return true;
-}*/
-
-static bool prepare_subdirs(const std::string& action, const std::string& volume_uuid,
-                            userid_t user_id, int flags) {
-    LOG(ERROR) << "not actually forking for vold_prepare_subdirs\n";
-    return true;
-    /*if (0 != android::vold::ForkExecvp(
-                 std::vector<std::string>{prepare_subdirs_path, action, volume_uuid,
-                                          std::to_string(user_id), std::to_string(flags)})) {
-        LOG(ERROR) << "vold_prepare_subdirs failed";
-        return false;
-    }
-    return true;*/
-}
-
-bool e4crypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_id, int serial,
-                                  int flags) {
-    LOG(DEBUG) << "e4crypt_prepare_user_storage for volume " << escape_empty(volume_uuid)
-               << ", user " << user_id << ", serial " << serial << ", flags " << flags << std::endl;
-
-    if (flags & /*android::os::IVold::*/STORAGE_FLAG_DE) {
-        // DE_sys key
-        auto system_legacy_path = android::vold::BuildDataSystemLegacyPath(user_id);
-        auto misc_legacy_path = android::vold::BuildDataMiscLegacyPath(user_id);
-        auto profiles_de_path = android::vold::BuildDataProfilesDePath(user_id);
-
-        // DE_n key
-        auto system_de_path = android::vold::BuildDataSystemDePath(user_id);
-        auto misc_de_path = android::vold::BuildDataMiscDePath(user_id);
-        auto vendor_de_path = android::vold::BuildDataVendorDePath(user_id);
-        auto user_de_path = android::vold::BuildDataUserDePath(nullptr, user_id);
-
-        if (volume_uuid.empty()) {
-            if (!prepare_dir(system_legacy_path, 0700, AID_SYSTEM, AID_SYSTEM)) return false;
-#if MANAGE_MISC_DIRS
-            if (!prepare_dir(misc_legacy_path, 0750, multiuser_get_uid(user_id, AID_SYSTEM),
-                    multiuser_get_uid(user_id, AID_EVERYBODY))) return false;
-#endif
-            if (!prepare_dir(profiles_de_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false;
-            if (!prepare_dir(system_de_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false;
-            if (!prepare_dir(misc_de_path, 01771, AID_SYSTEM, AID_MISC)) return false;
-            if (!prepare_dir(vendor_de_path, 0771, AID_ROOT, AID_ROOT)) return false;
-        }
-        if (!prepare_dir(user_de_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false;
-
-        if (e4crypt_is_native()) {
-            PolicyKeyRef de_ref;
-            if (volume_uuid.empty()) {
-                if (!lookup_key_ref(s_de_key_raw_refs, user_id, &de_ref.key_raw_ref)) return false;
-                get_data_file_encryption_modes(&de_ref);
-                if (!ensure_policy(de_ref, system_de_path)) return false;
-                if (!ensure_policy(de_ref, misc_de_path)) return false;
-                if (!ensure_policy(de_ref, vendor_de_path)) return false;
-            } else {
-                if (!read_or_create_volkey(misc_de_path, nullptr, &de_ref)) return false;
-            }
-            if (!ensure_policy(de_ref, user_de_path)) return false;
-        }
-    }
-
-    if (flags & /*android::os::IVold::*/STORAGE_FLAG_CE) {
-        // CE_n key
-        auto system_ce_path = android::vold::BuildDataSystemCePath(user_id);
-        auto misc_ce_path = android::vold::BuildDataMiscCePath(user_id);
-        auto vendor_ce_path = android::vold::BuildDataVendorCePath(user_id);
-        auto media_ce_path = android::vold::BuildDataMediaCePath(nullptr, user_id);
-        auto user_ce_path = android::vold::BuildDataUserCePath(nullptr, user_id);
-
-        if (volume_uuid.empty()) {
-            if (!prepare_dir(system_ce_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false;
-            if (!prepare_dir(misc_ce_path, 01771, AID_SYSTEM, AID_MISC)) return false;
-            if (!prepare_dir(vendor_ce_path, 0771, AID_ROOT, AID_ROOT)) return false;
-        }
-        if (!prepare_dir(media_ce_path, 0770, AID_MEDIA_RW, AID_MEDIA_RW)) return false;
-        if (!prepare_dir(user_ce_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false;
-
-        if (e4crypt_is_native()) {
-            PolicyKeyRef ce_ref;
-            if (volume_uuid.empty()) {
-                if (!lookup_key_ref(s_ce_key_raw_refs, user_id, &ce_ref.key_raw_ref)) return false;
-                get_data_file_encryption_modes(&ce_ref);
-                if (!ensure_policy(ce_ref, system_ce_path)) return false;
-                if (!ensure_policy(ce_ref, misc_ce_path)) return false;
-                if (!ensure_policy(ce_ref, vendor_ce_path)) return false;
-            } else {
-                if (!read_or_create_volkey(misc_ce_path, nullptr, &ce_ref)) return false;
-            }
-            if (!ensure_policy(ce_ref, media_ce_path)) return false;
-            if (!ensure_policy(ce_ref, user_ce_path)) return false;
-        }
-
-        if (volume_uuid.empty()) {
-            // Now that credentials have been installed, we can run restorecon
-            // over these paths
-            // NOTE: these paths need to be kept in sync with libselinux
-            //android::vold::RestoreconRecursive(system_ce_path);
-            //android::vold::RestoreconRecursive(misc_ce_path);
-        }
-    }
-    if (!prepare_subdirs("prepare", volume_uuid, user_id, flags)) return false;
-    return true;
-}
-
-/*bool e4crypt_destroy_user_storage(const std::string& volume_uuid, userid_t user_id, int flags) {
-    LOG(DEBUG) << "TWRP NOT e4crypt_destroy_user_storage for volume " << escape_empty(volume_uuid)
-               << ", user " << user_id << ", flags " << flags;
-    bool res = true;
-    return res;
-
-    res &= prepare_subdirs("destroy", volume_uuid, user_id, flags);
-
-    if (flags & android::os::IVold::STORAGE_FLAG_CE) {
-        // CE_n key
-        auto system_ce_path = android::vold::BuildDataSystemCePath(user_id);
-        auto misc_ce_path = android::vold::BuildDataMiscCePath(user_id);
-        auto vendor_ce_path = android::vold::BuildDataVendorCePath(user_id);
-        auto media_ce_path = android::vold::BuildDataMediaCePath(nullptr, user_id);
-        auto user_ce_path = android::vold::BuildDataUserCePath(nullptr, user_id);
-
-        res &= destroy_dir(media_ce_path);
-        res &= destroy_dir(user_ce_path);
-        if (volume_uuid.empty()) {
-            res &= destroy_dir(system_ce_path);
-            res &= destroy_dir(misc_ce_path);
-            res &= destroy_dir(vendor_ce_path);
-        } else {
-            if (e4crypt_is_native()) {
-                res &= destroy_volkey(misc_ce_path, volume_uuid);
-            }
-        }
-    }
-
-    if (flags & android::os::IVold::STORAGE_FLAG_DE) {
-        // DE_sys key
-        auto system_legacy_path = android::vold::BuildDataSystemLegacyPath(user_id);
-        auto misc_legacy_path = android::vold::BuildDataMiscLegacyPath(user_id);
-        auto profiles_de_path = android::vold::BuildDataProfilesDePath(user_id);
-
-        // DE_n key
-        auto system_de_path = android::vold::BuildDataSystemDePath(user_id);
-        auto misc_de_path = android::vold::BuildDataMiscDePath(user_id);
-        auto vendor_de_path = android::vold::BuildDataVendorDePath(user_id);
-        auto user_de_path = android::vold::BuildDataUserDePath(nullptr, user_id);
-
-        res &= destroy_dir(user_de_path);
-        if (volume_uuid.empty()) {
-            res &= destroy_dir(system_legacy_path);
-#if MANAGE_MISC_DIRS
-            res &= destroy_dir(misc_legacy_path);
-#endif
-            res &= destroy_dir(profiles_de_path);
-            res &= destroy_dir(system_de_path);
-            res &= destroy_dir(misc_de_path);
-            res &= destroy_dir(vendor_de_path);
-        } else {
-            if (e4crypt_is_native()) {
-                res &= destroy_volkey(misc_de_path, volume_uuid);
-            }
-        }
-    }
-
-    return res;
-}
-
-static bool destroy_volume_keys(const std::string& directory_path, const std::string& volume_uuid) {
-	LOG(ERROR) << "TWRP NOT destroy_volume_keys\n";
-	return true;
-    auto dirp = std::unique_ptr<DIR, int (*)(DIR*)>(opendir(directory_path.c_str()), closedir);
-    if (!dirp) {
-        PLOG(ERROR) << "Unable to open directory: " + directory_path;
-        return false;
-    }
-    bool res = true;
-    for (;;) {
-        errno = 0;
-        auto const entry = readdir(dirp.get());
-        if (!entry) {
-            if (errno) {
-                PLOG(ERROR) << "Unable to read directory: " + directory_path;
-                return false;
-            }
-            break;
-        }
-        if (entry->d_type != DT_DIR || entry->d_name[0] == '.') {
-            LOG(DEBUG) << "Skipping non-user " << entry->d_name;
-            continue;
-        }
-        res &= destroy_volkey(directory_path + "/" + entry->d_name, volume_uuid);
-    }
-    return res;
-}
-
-bool e4crypt_destroy_volume_keys(const std::string& volume_uuid) {
-    bool res = true;
-    LOG(DEBUG) << "TWRP NOT e4crypt_destroy_volume_keys for volume " << escape_empty(volume_uuid);
-    /*return res;
-    auto secdiscardable_path = volume_secdiscardable_path(volume_uuid);
-    res &= android::vold::runSecdiscardSingle(secdiscardable_path);
-    res &= destroy_volume_keys("/data/misc_ce", volume_uuid);
-    res &= destroy_volume_keys("/data/misc_de", volume_uuid);
-    return res;
-}*/
diff --git a/crypto/ext4crypt/Ext4CryptPie.h b/crypto/ext4crypt/Ext4CryptPie.h
index d6d6ecf285..7236bc00f0 100644
--- a/crypto/ext4crypt/Ext4CryptPie.h
+++ b/crypto/ext4crypt/Ext4CryptPie.h
@@ -32,8 +32,8 @@ bool e4crypt_unlock_user_key(userid_t user_id, int serial, const std::string& to
                              const std::string& secret);
 //bool e4crypt_lock_user_key(userid_t user_id);
 
-bool e4crypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_id, int serial,
-                                  int flags);
+/*bool e4crypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_id, int serial,
+                                  int flags);*/
 /*bool e4crypt_destroy_user_storage(const std::string& volume_uuid, userid_t user_id, int flags);
 
 bool e4crypt_destroy_volume_keys(const std::string& volume_uuid);*/
diff --git a/gui/action.cpp b/gui/action.cpp
index 1143ba3195..85366b9c7f 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -63,6 +63,7 @@ std::set<string> GUIAction::setActionsRunningInCallerThread;
 static string zip_queue[10];
 static int zip_queue_index;
 pid_t sideload_child_pid;
+extern std::vector<users_struct> Users_List;
 
 static void *ActionThread_work_wrapper(void *data);
 
@@ -1501,12 +1502,31 @@ int GUIAction::decrypt(std::string arg __unused)
 		simulate_progress_bar();
 	} else {
 		string Password;
+		string userID;
 		DataManager::GetValue("tw_crypto_password", Password);
-		op_status = PartitionManager.Decrypt_Device(Password);
+
+		if (DataManager::GetIntValue(TW_IS_FBE)) {  // for FBE
+			DataManager::GetValue("tw_crypto_user_id", userID);
+			if (userID != "") {
+				op_status = PartitionManager.Decrypt_Device(Password, atoi(userID.c_str()));
+				if (userID != "0") {
+					if (op_status != 0)
+						op_status = 1;
+					operation_end(op_status);
+	          		return 0;
+				}
+			} else {
+				LOGINFO("User ID not found\n");
+				op_status = 1;
+			}
+		::sleep(1);
+		} else {  // for FDE
+			op_status = PartitionManager.Decrypt_Device(Password);
+		}
+
 		if (op_status != 0)
 			op_status = 1;
 		else {
-
 			DataManager::SetValue(TW_IS_ENCRYPTED, 0);
 
 			int has_datamedia;
diff --git a/gui/gui.hpp b/gui/gui.hpp
index d5b9553d69..7e4ee4ea89 100644
--- a/gui/gui.hpp
+++ b/gui/gui.hpp
@@ -28,6 +28,7 @@ void gui_warn(const char* text);
 void gui_err(const char* text);
 void gui_highlight(const char* text);
 void gui_msg(Message msg);
+void gui_err(Message msg);
 
 std::string gui_parse_text(std::string inText);
 std::string gui_lookup(const std::string& resource_name, const std::string& default_value);
diff --git a/gui/listbox.cpp b/gui/listbox.cpp
index 9fbe09234d..3386465e29 100644
--- a/gui/listbox.cpp
+++ b/gui/listbox.cpp
@@ -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) {
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 3af174ee3d..7fc9980b00 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -759,6 +759,7 @@
 				<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="page">%tw_clear_destination%</action>
 			</action>
 		</page>
@@ -1062,8 +1063,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>
 
@@ -2517,6 +2523,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>
 
@@ -3383,6 +3393,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>
@@ -4396,10 +4416,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>
@@ -5379,5 +5406,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>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 006e4ce0b5..47ab708fb2 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -141,6 +141,7 @@
 		<string name="factory_reset2">(not including internal storage)</string>
 		<string name="factory_reset3">Most of the time this is</string>
 		<string name="factory_reset4">the only wipe that you need.</string>
+		<string name="factory_reset5">(not including users/lockscreen)</string>
 		<string name="factory_resetting">Factory Reset...</string>
 		<string name="advanced_wipe_hdr">Advanced Wipe</string>
 		<string name="advanced_wipe_btn">Advanced Wipe</string>
@@ -511,6 +512,15 @@
 		<string name="fix_recovery_loop_complete">Fix Recovery Bootloop Complete</string>
 		<string name="fixing_recovery_loop_patch">Patching kernel...</string>
 		<string name="fix_recovery_loop_patch_error">Error patching kernel.</string>
+		<string name="decrypt_users">Decrypt Users</string>
+		<string name="decrypt_users_selection">Select a user ID to decrypt</string>
+		<string name="select_user">Select User</string>
+		<string name="backup_storage_undecrypt_warning">Backup not include some files of user {1}, because the user is not decrypted.</string>
+		<string name="decrypting_user_fbe">Attempting to decrypt FBE for user {1}...</string>
+		<string name="decrypt_user_success_fbe">User {1} Decrypted Successfully</string>
+		<string name="decrypt_user_fail_fbe">Failed to decrypt user {1}</string>
+		<string name="decrypt_data_enter_pass_fbe">Enter Password for User [%tw_crypto_user_id%]</string>
+		<string name="decrypt_data_enter_pattern_fbe">Enter Pattern for User [%tw_crypto_user_id%]</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Kernel does not have support for reading SELinux contexts.</string>
@@ -687,7 +697,7 @@
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">%llu of %llu files, %i%%</string>
 		<string name="size_progress">%lluMB of %lluMB, %i%%</string>
-		<string name="decrypt_cmd">Attempting to decrypt data partition via command line.</string>
+		<string name="decrypt_cmd" version="2">Attempting to decrypt data partition or user data via command line.</string>
 		<string name="base_pkg_err">Failed to load base packages.</string>
 		<string name="simulating">Simulating actions...</string>
 		<string name="backup_cancel">Backup Cancelled</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 64b8776d00..a14fc43387 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -710,6 +710,7 @@
 				<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="page">%tw_clear_destination%</action>
 			</action>
 		</page>
@@ -1013,8 +1014,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>
 
@@ -2673,6 +2679,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>
 
@@ -3543,6 +3553,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>
@@ -4557,10 +4577,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>
@@ -4616,10 +4643,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"/>
@@ -5139,5 +5173,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>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 70ccf3816b..af6a643993 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -975,6 +975,7 @@
 				<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="page">%tw_clear_destination%</action>
 			</action>
 		</page>
@@ -1385,8 +1386,13 @@
 			</text>
 
 			<text style="text_m_accent">
-				<condition var1="tw_has_data_media" var2="1"/>
 				<placement x="%center_x%" y="%row2_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="%row3_y%" placement="5"/>
 				<text>{@factory_reset2=(not including internal storage)}</text>
 			</text>
 
@@ -3194,6 +3200,10 @@
 				</conditions>
 				<placement x="%col1_x_left%" y="%row6_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>
 
@@ -4158,6 +4168,16 @@
 
 			<listbox style="advanced_listbox">
 				<placement x="%indent%" y="%row2_header_y%" w="%content_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>
@@ -5256,10 +5276,17 @@
 			</text>
 
 			<text style="text_m_accent">
+				<condition var1="tw_is_fbe" op="!=" var2="1"/>
 				<placement x="%col1_x_left%" y="%row1_y%"/>
 				<text>{@decrypt_data_enter_pass=Enter Password:}</text>
 			</text>
 
+			<text style="text_m_accent">
+				<condition var1="tw_is_fbe" var2="1"/>
+				<placement x="%col1_x_left%" y="%row1_y%"/>
+				<text>{@decrypt_data_enter_pass_fbe=Enter Password for User [%tw_crypto_user_id%]}</text>
+			</text>
+
 			<input>
 				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%input_height%"/>
 				<text>%tw_crypto_display%</text>
@@ -5316,11 +5343,19 @@
 			</text>
 
 			<text style="text_m_accent">
+				<condition var1="tw_is_fbe" op="!=" var2="1"/>
 				<condition var1="tw_password_fail" op="!=" var2="1"/>
 				<placement x="%center_x%" y="%row5_y%" placement="5"/>
 				<text>{@decrypt_data_enter_pattern=Enter Pattern.}</text>
 			</text>
 
+			<text style="text_m_accent">
+				<condition var1="tw_is_fbe" var2="1"/>
+				<condition var1="tw_password_fail" op="!=" var2="1"/>
+				<placement x="%center_x%" y="%row5_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="%row5_y%" placement="5"/>
@@ -5711,5 +5746,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="%row2_header_y%" w="%content_width%" h="%fileselector_install_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="%col1_x_left%" y="%row13_y%" textplacement="6"/>
+				<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>
diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index 903bc6c8c6..ad14bc22c6 100755
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -399,13 +399,22 @@ int OpenRecoveryScript::run_script_file(void) {
 				if (ret_val != 0)
 					ret_val = 1; // failure
 			} else if (strcmp(command, "decrypt") == 0) {
+				// twrp cmd cannot decrypt a password with space, should decrypt on gui
 				if (*value) {
-					ret_val = PartitionManager.Decrypt_Device(value);
+					string tmp = value;
+					std::vector<string> args = TWFunc::Split_String(tmp, " ");
+
+					string pass = args[0];
+					string userid = "0";
+					if (args.size() > 1)
+						userid = args[1];
+
+					ret_val = PartitionManager.Decrypt_Device(pass, atoi(userid.c_str()));
 					if (ret_val != 0)
-						ret_val = 1; // failure
+						ret_val = 1;  // failure
 				} else {
 					gui_err("no_pwd=No password provided.");
-					ret_val = 1; // failure
+					ret_val = 1;  // failure
 				}
 			} else {
 				LOGERR("Unrecognized script command: '%s'\n", command);
@@ -416,23 +425,28 @@ int OpenRecoveryScript::run_script_file(void) {
 		unlink(SCRIPT_FILE_TMP);
 		gui_msg("done_ors=Done processing script file");
 	} else {
-		gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(SCRIPT_FILE_TMP)(strerror(errno)));
+		gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(SCRIPT_FILE_TMP)(
+			strerror(errno)));
 		return 1;
 	}
 
-	if (install_cmd && DataManager::GetIntValue(TW_HAS_INJECTTWRP) == 1 && DataManager::GetIntValue(TW_INJECT_AFTER_ZIP) == 1) {
+	if (install_cmd && DataManager::GetIntValue(TW_HAS_INJECTTWRP) == 1 &&
+	DataManager::GetIntValue(TW_INJECT_AFTER_ZIP) == 1) {
 		gui_msg("injecttwrp=Injecting TWRP into boot image...");
 		TWPartition* Boot = PartitionManager.Find_Partition_By_Path("/boot");
 		if (Boot == NULL || Boot->Current_File_System != "emmc")
-			TWFunc::Exec_Cmd("injecttwrp --dump /tmp/backup_recovery_ramdisk.img /tmp/injected_boot.img --flash");
+			TWFunc::Exec_Cmd(
+			"injecttwrp --dump /tmp/backup_recovery_ramdisk.img /tmp/injected_boot.img --flash");
 		else {
-			string injectcmd = "injecttwrp --dump /tmp/backup_recovery_ramdisk.img /tmp/injected_boot.img --flash bd=" + Boot->Actual_Block_Device;
+			string injectcmd =
+			"injecttwrp --dump /tmp/backup_recovery_ramdisk.img /tmp/injected_boot.img --flash bd=" +
+			Boot->Actual_Block_Device;
 			TWFunc::Exec_Cmd(injectcmd.c_str());
 		}
 		gui_msg("done=Done.");
 	}
 	if (sideload)
-		ret_val = 1; // Forces booting to the home page after sideload
+		ret_val = 1;  // Forces booting to the home page after sideload
 	return ret_val;
 }
 
@@ -645,26 +659,48 @@ int OpenRecoveryScript::Run_OpenRecoveryScript_Action() {
 
 // this is called by the "twcmd" GUI action when a command is received via FIFO from the "twrp" command line tool
 void OpenRecoveryScript::Run_CLI_Command(const char* command) {
-	if (strlen(command) > 11 && strncmp(command, "runscript", 9) == 0) {
-		const char* filename = command + 10;
-		if (OpenRecoveryScript::copy_script_file(filename) == 0) {
-			LOGINFO("Unable to copy script file\n");
+	string tmp = command;
+	std::vector<string> parts =
+		TWFunc::Split_String(tmp, " ");  // pats[0] is cmd, parts[1...] is args
+	string cmd_str = parts[0];
+
+	if (cmd_str == "runscript") {
+		if (parts.size() > 1) {
+			string filename = parts[1];
+			if (OpenRecoveryScript::copy_script_file(filename) == 0) {
+				LOGINFO("Unable to copy script file\n");
+			} else {
+				OpenRecoveryScript::run_script_file();
+			}
 		} else {
-			OpenRecoveryScript::run_script_file();
+			LOGINFO("Missing parameter: script file name\n");
 		}
-	} else if (strlen(command) > 5 && strncmp(command, "get", 3) == 0) {
-		const char* varname = command + 4;
-		string value;
-		DataManager::GetValue(varname, value);
-		gui_print("%s = %s\n", varname, value.c_str());
-	} else if (strlen(command) > 9 && strncmp(command, "decrypt", 7) == 0) {
-		const char* pass = command + 8;
-		gui_msg("decrypt_cmd=Attempting to decrypt data partition via command line.");
-		if (PartitionManager.Decrypt_Device(pass) == 0) {
-			// set_page_done = 1;  // done by singleaction_page anyway
-			std::string orsFile = TWFunc::get_cache_dir() + "/openrecoveryscript";
-			if (TWFunc::Path_Exists(orsFile)) {
-				Run_OpenRecoveryScript_Action();
+	} else if (cmd_str == "get") {
+		if (parts.size() > 1) {
+			string varname = parts[1];
+			string value;
+			DataManager::GetValue(varname, value);
+			gui_print("%s = %s\n", varname.c_str(), value.c_str());
+		} else {
+			LOGINFO("Missing parameter: var name\n");
+		}
+	} else if (cmd_str == "decrypt") {
+		// twrp cmd cannot decrypt a password with space, should decrypt on gui
+		if (parts.size() == 1) {
+			gui_err("no_pwd=No password provided.");
+		} else {
+			string pass = parts[1];
+			string userid = "0";
+			if (parts.size() > 2)
+				userid = parts[2];
+
+			gui_msg("decrypt_cmd=Attempting to decrypt data partition or user data via command line.");
+			if (PartitionManager.Decrypt_Device(pass, atoi(userid.c_str())) == 0) {
+				// set_page_done = 1;  // done by singleaction_page anyway
+				std::string orsFile = TWFunc::get_cache_dir() + "/openrecoveryscript";
+				if (TWFunc::Path_Exists(orsFile)) {
+					Run_OpenRecoveryScript_Action();
+				}
 			}
 		}
 	} else if (OpenRecoveryScript::Insert_ORS_Command(command)) {
diff --git a/orscmd/orscmd.cpp b/orscmd/orscmd.cpp
index c47c0f67f6..0a12a08664 100644
--- a/orscmd/orscmd.cpp
+++ b/orscmd/orscmd.cpp
@@ -45,7 +45,7 @@ void print_usage(void) {
 	printf("  wipe <partition name>\n");
 	printf("  sideload\n");
 	printf("  set <variable> [value]\n");
-	printf("  decrypt <password>\n");
+	printf("  decrypt <password> [USER ID]\n");
 	printf("  remountrw\n");
 	printf("  fixperms\n");
 	printf("  mount <path>\n");
diff --git a/partition.cpp b/partition.cpp
index b47c2947f7..3469eb48c4 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -654,17 +654,20 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 		DataManager::SetValue(TW_IS_DECRYPTED, 1);
 		Is_Encrypted = true;
 		Is_Decrypted = true;
-		if (Key_Directory.empty())
+		if (Key_Directory.empty()) {
 			Is_FBE = false;
-		else
+			DataManager::SetValue(TW_IS_FBE, 0);
+		} else {
 			Is_FBE = true;
-		DataManager::SetValue(TW_IS_FBE, 0);
+			DataManager::SetValue(TW_IS_FBE, 1);
+		}
 		Decrypted_Block_Device = crypto_blkdev;
 		LOGINFO("Data already decrypted, new block device: '%s'\n", crypto_blkdev);
 	} else if (!Mount(false)) {
 		if (Is_Present) {
 			if (Key_Directory.empty()) {
-				set_partition_data(Actual_Block_Device.c_str(), Crypto_Key_Location.c_str(), Fstab_File_System.c_str());
+				set_partition_data(Actual_Block_Device.c_str(), Crypto_Key_Location.c_str(),
+				Fstab_File_System.c_str());
 				if (cryptfs_check_footer() == 0) {
 					Is_Encrypted = true;
 					Is_Decrypted = false;
@@ -673,6 +676,7 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 					Setup_Image();
 					DataManager::SetValue(TW_IS_ENCRYPTED, 1);
 					DataManager::SetValue(TW_CRYPTO_PWTYPE, cryptfs_get_password_type());
+					DataManager::SetValue("tw_crypto_pwtype_0", cryptfs_get_password_type());
 					DataManager::SetValue(TW_CRYPTO_PASSWORD, "");
 					DataManager::SetValue("tw_crypto_display", "");
 				} else {
@@ -683,10 +687,10 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 				Is_Decrypted = false;
 			}
 		} else if (Key_Directory.empty()) {
-			LOGERR("Primary block device '%s' for mount point '%s' is not present!\n", Primary_Block_Device.c_str(), Mount_Point.c_str());
+			LOGERR("Primary block device '%s' for mount point '%s' is not present!\n",
+			Primary_Block_Device.c_str(), Mount_Point.c_str());
 		}
 	} else {
-
 		if (!Decrypt_FBE_DE()) {
 			char wrappedvalue[PROPERTY_VALUE_MAX];
 			property_get("fbe.data.wrappedkey", wrappedvalue, "");
@@ -718,46 +722,54 @@ bool TWPartition::Decrypt_FBE_DE() {
 if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 		LOGINFO("File Based Encryption is present\n");
 #ifdef TW_INCLUDE_FBE
-		ExcludeAll(Mount_Point + "/convert_fbe");
-		ExcludeAll(Mount_Point + "/unencrypted");
-		//ExcludeAll(Mount_Point + "/system/users/0"); // we WILL need to retain some of this if multiple users are present or we just need to delete more folders for the extra users somewhere else
-		ExcludeAll(Mount_Point + "/misc/vold/user_keys");
-		//ExcludeAll(Mount_Point + "/system_ce");
-		//ExcludeAll(Mount_Point + "/system_de");
-		//ExcludeAll(Mount_Point + "/misc_ce");
-		//ExcludeAll(Mount_Point + "/misc_de");
-		ExcludeAll(Mount_Point + "/system/gatekeeper.password.key");
-		ExcludeAll(Mount_Point + "/system/gatekeeper.pattern.key");
-		ExcludeAll(Mount_Point + "/system/locksettings.db");
-		//ExcludeAll(Mount_Point + "/system/locksettings.db-shm"); // don't seem to need this one, but the other 2 are needed
-		ExcludeAll(Mount_Point + "/system/locksettings.db-wal");
-		//ExcludeAll(Mount_Point + "/user_de");
-		//ExcludeAll(Mount_Point + "/misc/profiles/cur/0"); // might be important later
-		ExcludeAll(Mount_Point + "/misc/gatekeeper");
-		ExcludeAll(Mount_Point + "/misc/keystore");
-		ExcludeAll(Mount_Point + "/drm/kek.dat");
-		ExcludeAll(Mount_Point + "/system_de/0/spblob"); // contains data needed to decrypt pixel 2
-		int retry_count = 3;
-		while (!Decrypt_DE() && --retry_count)
-			usleep(2000);
-		if (retry_count > 0) {
-			property_set("ro.crypto.state", "encrypted");
-			Is_Encrypted = true;
-			Is_Decrypted = false;
-			Is_FBE = true;
-			DataManager::SetValue(TW_IS_FBE, 1);
-			DataManager::SetValue(TW_IS_ENCRYPTED, 1);
-			string filename;
-			int pwd_type = Get_Password_Type(0, filename);
-			if (pwd_type < 0) {
-				LOGERR("This TWRP does not have synthetic password decrypt support\n");
-				pwd_type = 0; // default password
-			}
-			DataManager::SetValue(TW_CRYPTO_PWTYPE, pwd_type);
-			DataManager::SetValue(TW_CRYPTO_PASSWORD, "");
-			DataManager::SetValue("tw_crypto_display", "");
-			return true;
-		}
+	Is_FBE = true;
+	DataManager::SetValue(TW_IS_FBE, 1);
+	ExcludeAll(Mount_Point + "/convert_fbe");
+	ExcludeAll(Mount_Point + "/unencrypted");
+	ExcludeAll(Mount_Point + "/misc/vold/user_keys");
+	ExcludeAll(Mount_Point + "/system/gatekeeper.password.key");
+	ExcludeAll(Mount_Point + "/system/gatekeeper.pattern.key");
+	ExcludeAll(Mount_Point + "/system/locksettings.db");
+	ExcludeAll(Mount_Point + "/system/locksettings.db-wal");
+	ExcludeAll(Mount_Point + "/misc/gatekeeper");
+	ExcludeAll(Mount_Point + "/misc/keystore");
+	ExcludeAll(Mount_Point + "/drm/kek.dat");
+	ExcludeAll(Mount_Point + "/system_de/0/spblob");  // contains data needed to decrypt pixel 2
+	ExcludeAll(Mount_Point + "/system/users/0/gatekeeper.password.key");
+	ExcludeAll(Mount_Point + "/system/users/0/gatekeeper.pattern.key");
+	ExcludeAll(Mount_Point + "/cache");
+	int retry_count = 3;
+	while (!Decrypt_DE() && --retry_count)
+		usleep(2000);
+	PartitionManager.Parse_Users();  // after load_all_de_keys() to parse_users
+	std::vector<users_struct>::iterator iter;
+	std::vector<users_struct>* userList = PartitionManager.Get_Users_List();
+	for (iter = userList->begin(); iter != userList->end(); iter++) {
+		if (atoi((*iter).userId.c_str()) != 0) {
+			ExcludeAll(Mount_Point + "/system_de/" + (*iter).userId + "/spblob");
+			ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/gatekeeper.password.key");
+			ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/gatekeeper.pattern.key");
+			ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/locksettings.db");
+			ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/locksettings.db-wal");
+		}
+	}
+	if (retry_count > 0) {
+		property_set("ro.crypto.state", "encrypted");
+		Is_Encrypted = true;
+		Is_Decrypted = false;
+		DataManager::SetValue(TW_IS_ENCRYPTED, 1);
+		string filename;
+		int pwd_type = Get_Password_Type(0, filename);
+		if (pwd_type < 0) {
+			LOGERR("This TWRP does not have synthetic password decrypt support\n");
+			pwd_type = 0;  // default password
+		}
+		DataManager::SetValue(TW_CRYPTO_PWTYPE, pwd_type);
+		DataManager::SetValue("tw_crypto_pwtype_0", pwd_type);
+		DataManager::SetValue(TW_CRYPTO_PASSWORD, "");
+		DataManager::SetValue("tw_crypto_display", "");
+		return true;
+	}
 #else
 		LOGERR("FBE found but FBE support not present in TWRP\n");
 #endif
@@ -2623,6 +2635,22 @@ bool TWPartition::Backup_Tar(PartitionSettings *part_settings, pid_t *tar_fork_p
 	Full_FileName = part_settings->Backup_Folder + "/" + Backup_FileName;
 	if (Has_Data_Media)
 		gui_msg(Msg(msg::kWarning, "backup_storage_warning=Backups of {1} do not include any files in internal storage such as pictures or downloads.")(Display_Name));
+	if (Mount_Point == "/data" && DataManager::GetIntValue(TW_IS_FBE)) {
+		std::vector<users_struct>::iterator iter;
+		std::vector<users_struct>* userList = PartitionManager.Get_Users_List();
+		for (iter = userList->begin(); iter != userList->end(); iter++) {
+			if (!(*iter).isDecrypted && (*iter).userId != "0") {
+				gui_msg(Msg(msg::kWarning,
+				"backup_storage_undecrypt_warning=Backup will not include some files from user {1} "
+				"because the user is not decrypted.")((*iter).userId));
+				backup_exclusions.add_absolute_dir("/data/system_ce/" + (*iter).userId);
+				backup_exclusions.add_absolute_dir("/data/misc_ce/" + (*iter).userId);
+				backup_exclusions.add_absolute_dir("/data/vendor_ce/" + (*iter).userId);
+				backup_exclusions.add_absolute_dir("/data/media/" + (*iter).userId);
+				backup_exclusions.add_absolute_dir("/data/user/" + (*iter).userId);
+			}
+		}
+	}
 	tar.part_settings = part_settings;
 	tar.backup_exclusions = &backup_exclusions;
 	tar.setdir(Backup_Path);
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index f9adb02a0e..80833958b1 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -72,18 +72,18 @@ extern "C" {
 }
 
 #ifdef TW_INCLUDE_CRYPTO
-	#include "crypto/fde/cryptfs.h"
-	#include "gui/rapidxml.hpp"
-	#include "gui/pages.hpp"
-	#ifdef TW_INCLUDE_FBE
-		#include "crypto/ext4crypt/Decrypt.h"
-		#ifdef TW_INCLUDE_FBE_METADATA_DECRYPT
-			#include "crypto/ext4crypt/MetadataCrypt.h"
-		#endif
-	#endif
-	#ifdef TW_CRYPTO_USE_SYSTEM_VOLD
-		#include "crypto/vold_decrypt/vold_decrypt.h"
-	#endif
+#include "crypto/fde/cryptfs.h"
+#include "gui/rapidxml.hpp"
+#include "gui/pages.hpp"
+#ifdef TW_INCLUDE_FBE
+#include "crypto/ext4crypt/Decrypt.h"
+#ifdef TW_INCLUDE_FBE_METADATA_DECRYPT
+#include "crypto/ext4crypt/MetadataCrypt.h"
+#endif
+#endif
+#ifdef TW_CRYPTO_USE_SYSTEM_VOLD
+#include "crypto/vold_decrypt/vold_decrypt.h"
+#endif
 #endif
 
 #ifdef AB_OTA_UPDATER
@@ -92,6 +92,7 @@ extern "C" {
 #endif
 
 extern bool datamedia;
+std::vector<users_struct> Users_List;
 
 TWPartitionManager::TWPartitionManager(void) {
 	mtp_was_enabled = false;
@@ -349,10 +350,12 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error,
 				}
 			} else {
 				DataManager::SetValue("TW_CRYPTO_TYPE", password_type);
+				DataManager::SetValue("tw_crypto_pwtype_0", password_type);
 			}
 		}
 	}
-	if (Decrypt_Data && (!Decrypt_Data->Is_Encrypted || Decrypt_Data->Is_Decrypted) && Decrypt_Data->Mount(false)) {
+	if (Decrypt_Data && (!Decrypt_Data->Is_Encrypted || Decrypt_Data->Is_Decrypted) &&
+	Decrypt_Data->Mount(false)) {
 		Decrypt_Adopted();
 	}
 #endif
@@ -1671,11 +1674,11 @@ void TWPartitionManager::Post_Decrypt(const string& Block_Device) {
 		} else {
 			gui_msg("decrypt_success_nodev=Data successfully decrypted");
 		}
+		property_set("twrp.decrypt.done", "true");
 		dat->Setup_File_System(false);
-		dat->Current_File_System = dat->Fstab_File_System; // Needed if we're ignoring blkid because encrypted devices start out as emmc
+		dat->Current_File_System = dat->Fstab_File_System;  // Needed if we're ignoring blkid because encrypted devices start out as emmc
 
-		// Sleep for a bit so that the device will be ready
-		sleep(1);
+		sleep(1); // Sleep for a bit so that the device will be ready
 		if (dat->Has_Data_Media && dat->Mount(false) && TWFunc::Path_Exists("/data/media/0")) {
 			dat->Storage_Path = "/data/media/0";
 			dat->Symlink_Path = dat->Storage_Path;
@@ -1690,7 +1693,92 @@ void TWPartitionManager::Post_Decrypt(const string& Block_Device) {
 		LOGERR("Unable to locate data partition.\n");
 }
 
-int TWPartitionManager::Decrypt_Device(string Password) {
+void TWPartitionManager::Parse_Users() {
+#ifdef TW_INCLUDE_FBE
+	char user_check_result[PROPERTY_VALUE_MAX];
+	for (int userId = 0; userId <= 9999; userId++) {
+		string prop = "twrp.user." + to_string(userId) + ".decrypt";
+		property_get(prop.c_str(), user_check_result, "-1");
+		if (strcmp(user_check_result, "-1") != 0) {
+			if (userId < 0 || userId > 9999) {
+				LOGINFO("Incorrect user id %d\n", userId);
+				continue;
+			}
+			struct users_struct user;
+			user.userId = to_string(userId);
+
+			// Attempt to get name of user. Fallback to user ID if this fails.
+			char* userFile = PageManager::LoadFileToBuffer("/data/system/users/" + to_string(userId) + ".xml", NULL);
+			if (userFile == NULL) 
+				user.userName = to_string(userId);
+			else {
+				xml_document<> *userXml = new xml_document<>();
+				userXml->parse<0>(userFile);
+				xml_node<>* userNode = userXml->first_node("user");
+				if (userNode == nullptr) {
+					user.userName = to_string(userId);
+				} else {
+					xml_node<>* nameNode = userNode->first_node("name");
+					if (nameNode == nullptr)
+						user.userName = to_string(userId);
+					else {
+						string userName = nameNode->value();
+						user.userName = userName + " (" + to_string(userId) + ")";
+					}
+				}
+			}
+
+			string filename;
+			user.type = Get_Password_Type(userId, filename);
+
+			user.isDecrypted = false;
+			if (strcmp(user_check_result, "1") == 0)
+				user.isDecrypted = true;
+			Users_List.push_back(user);
+		}
+	}
+	Check_Users_Decryption_Status();
+#endif
+}
+
+std::vector<users_struct>* TWPartitionManager::Get_Users_List() {
+	return &Users_List;
+}
+
+void TWPartitionManager::Mark_User_Decrypted(int userID) {
+#ifdef TW_INCLUDE_FBE
+	std::vector<users_struct>::iterator iter;
+	for (iter = Users_List.begin(); iter != Users_List.end(); iter++) {
+		if (atoi((*iter).userId.c_str()) == userID) {
+			(*iter).isDecrypted = true;
+			string user_prop_decrypted = "twrp.user." + to_string(userID) + ".decrypt";
+			property_set(user_prop_decrypted.c_str(), "1");
+			break;
+		}
+	}
+	Check_Users_Decryption_Status();
+#endif
+}
+
+void TWPartitionManager::Check_Users_Decryption_Status() {
+#ifdef TW_INCLUDE_FBE
+	int all_is_decrypted = 1;
+	std::vector<users_struct>::iterator iter;
+	for (iter = Users_List.begin(); iter != Users_List.end(); iter++) {
+		if (!(*iter).isDecrypted) {
+			all_is_decrypted = 0;
+			break;
+		}
+	}
+	if (all_is_decrypted == 1) {
+		DataManager::SetValue("tw_all_users_decrypted", "1");
+		property_set("twrp.all.users.decrypted", "true");
+	} else
+		DataManager::SetValue("tw_all_users_decrypted", "0");
+#endif
+}
+
+int TWPartitionManager::Decrypt_Device(string Password, int user_id) {
 #ifdef TW_INCLUDE_CRYPTO
 	char crypto_state[PROPERTY_VALUE_MAX], crypto_blkdev[PROPERTY_VALUE_MAX];
 	std::vector<TWPartition*>::iterator iter;
@@ -1714,14 +1802,49 @@ int TWPartitionManager::Decrypt_Device(string Password) {
 #ifdef TW_INCLUDE_FBE
 		if (!Mount_By_Path("/data", true)) // /data has to be mounted for FBE
 			return -1;
+
+		bool user_need_decrypt = false;
+		std::vector<users_struct>::iterator iter;
+		for (iter = Users_List.begin(); iter != Users_List.end(); iter++) {
+			if (atoi((*iter).userId.c_str()) == user_id && !(*iter).isDecrypted) {
+				user_need_decrypt = true;
+			}
+		}
+		if (!user_need_decrypt) {
+			LOGINFO("User %d does not require decryption\n", user_id);
+			return 0;
+		}
+
 		int retry_count = 10;
 		while (!TWFunc::Path_Exists("/data/system/users/gatekeeper.password.key") && --retry_count)
-			usleep(2000); // A small sleep is needed after mounting /data to ensure reliable decrypt... maybe because of DE?
-		int user_id = DataManager::GetIntValue("tw_decrypt_user_id");
-		LOGINFO("Decrypting FBE for user %i\n", user_id);
+			usleep(2000); // A small sleep is needed after mounting /data to ensure reliable decrypt...maybe because of DE?
+		gui_msg(Msg("decrypting_user_fbe=Attempting to decrypt FBE for user {1}...")(user_id));
 		if (Decrypt_User(user_id, Password)) {
-			Post_Decrypt("");
+			gui_msg(Msg("decrypt_user_success_fbe=User {1} Decrypted Successfully")(user_id));
+			Mark_User_Decrypted(user_id);
+			if (user_id == 0) {
+				// When decrypting user 0 also try all other users
+				std::vector<users_struct>::iterator iter;
+				for (iter = Users_List.begin(); iter != Users_List.end(); iter++) {
+					if ((*iter).userId == "0" || (*iter).isDecrypted)
+						continue;
+
+					int tmp_user_id = atoi((*iter).userId.c_str());
+					gui_msg(Msg("decrypting_user_fbe=Attempting to decrypt FBE for user {1}...")(tmp_user_id));
+					if (Decrypt_User(tmp_user_id, Password) ||
+					(Password != "!" && Decrypt_User(tmp_user_id, "!"))) { // "!" means default password
+						gui_msg(Msg("decrypt_user_success_fbe=User {1} Decrypted Successfully")(tmp_user_id));
+						Mark_User_Decrypted(tmp_user_id);
+					} else {
+						gui_msg(Msg("decrypt_user_fail_fbe=Failed to decrypt user {1}")(tmp_user_id));
+					}
+				}
+				Post_Decrypt("");
+			}
+
 			return 0;
+		} else {
+			gui_msg(Msg(msg::kError, "decrypt_user_fail_fbe=Failed to decrypt user {1}")(user_id));
 		}
 #else
 		LOGERR("FBE support is not present\n");
@@ -1729,6 +1852,13 @@ int TWPartitionManager::Decrypt_Device(string Password) {
 		return -1;
 	}
 
+	char isdecrypteddata[PROPERTY_VALUE_MAX];
+	property_get("twrp.decrypt.done", isdecrypteddata, "");
+	if (strcmp(isdecrypteddata, "true") == 0) {
+		LOGINFO("Data has no decryption required\n");
+		return 0;
+	}
+
 	int pwret = -1;
 	pid_t pid = fork();
 	if (pid < 0) {
diff --git a/partitions.hpp b/partitions.hpp
index 5a52fa3081..424e7ddeae 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -300,6 +300,13 @@ friend class GUIAction;
 friend class PageManager;
 };
 
+struct users_struct {
+	std::string userId;
+	std::string userName;
+	int type;
+	bool isDecrypted;
+};
+
 class TWPartitionManager
 {
 public:
@@ -336,7 +343,8 @@ class TWPartitionManager
 	int Repair_By_Path(string Path, bool Display_Error);                      // Repairs a partition based on path
 	int Resize_By_Path(string Path, bool Display_Error);                      // Resizes a partition based on path
 	void Update_System_Details();                                             // Updates fstab, file systems, sizes, etc.
-	int Decrypt_Device(string Password);                                      // Attempt to decrypt any encrypted partitions
+	int Decrypt_Device(string Password, int user_id = 0);                     // Attempt to decrypt any encrypted partitions
+	void Parse_Users();                                                       // Parse FBE users
 	int usb_storage_enable(void);                                             // Enable USB storage mode
 	int usb_storage_disable(void);                                            // Disable USB storage mode
 	void Mount_All_Storage(void);                                             // Mounts all storage locations
@@ -382,6 +390,7 @@ class TWPartitionManager
 	bool Prepare_Repack(TWPartition* Part, const std::string& Temp_Folder_Destination, const bool Create_Backup, const std::string& Backup_Name); // Prepares an image for repacking by unpacking it to the temp folder destination
 	bool Prepare_Repack(const std::string& Source_Path, const std::string& Temp_Folder_Destination, const bool Copy_Source, const bool Create_Destination = true); // Prepares an image for repacking by unpacking it to the temp folder destination
 	bool Repack_Images(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options); // Repacks the boot image with a new kernel or a new ramdisk
+	std::vector<users_struct>* Get_Users_List();                              // Returns pointer to list of users
 
 private:
 	void Setup_Settings_Storage_Partition(TWPartition* Part);                 // Sets up settings storage
@@ -400,10 +409,13 @@ class TWPartitionManager
 	int mtp_write_fd;
 	pid_t tar_fork_pid;                                                       // PID of twrpTar fork
 	Backup_Method_enum Backup_Method;                                         // Method used for backup
+	void Mark_User_Decrypted(int userID);                                     // Marks given user ID in Users_List as decrypted
+	void Check_Users_Decryption_Status();                                      // Checks to see if all users are decrypted
 
 private:
 	std::vector<TWPartition*> Partitions;                                     // Vector list of all partitions
 	string Active_Slot_Display;                                               // Current Active Slot (A or B) for display purposes
+	std::vector<users_struct> Users_List;                                     // List of FBE users
 };
 
 extern TWPartitionManager PartitionManager;
diff --git a/twrp.cpp b/twrp.cpp
index 34bdf9a48c..1550bfe3cc 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -304,8 +304,10 @@ int main(int argc, char **argv) {
 	// Offer to decrypt if the device is encrypted
 	if (DataManager::GetIntValue(TW_IS_ENCRYPTED) != 0) {
 		LOGINFO("Is encrypted, do decrypt page first\n");
-		if (gui_startPage("decrypt", 1, 1) != 0) {
-			LOGERR("Failed to start decrypt GUI page.\n");
+	if (DataManager::GetIntValue(TW_IS_FBE))
+		DataManager::SetValue("tw_crypto_user_id", "0");
+	if (gui_startPage("decrypt", 1, 1) != 0) {
+		LOGERR("Failed to start decrypt GUI page.\n");
 		} else {
 			// Check for and load custom theme if present
 			TWFunc::check_selinux_support();
@@ -321,8 +323,7 @@ int main(int argc, char **argv) {
 	}
 
 	// Fixup the RTC clock on devices which require it
-	if (crash_counter == 0)
-		TWFunc::Fixup_Time_On_Boot();
+	if (crash_counter == 0) TWFunc::Fixup_Time_On_Boot();
 
 	// Read the settings file
 	TWFunc::Update_Log_File();
@@ -334,7 +335,8 @@ int main(int argc, char **argv) {
 	std::string cacheDir = TWFunc::get_cache_dir();
 	std::string orsFile = cacheDir + "/recovery/openrecoveryscript";
 
-	if (TWFunc::Path_Exists(SCRIPT_FILE_TMP) || (DataManager::GetIntValue(TW_IS_ENCRYPTED) == 0 && TWFunc::Path_Exists(orsFile))) {
+	if (TWFunc::Path_Exists(SCRIPT_FILE_TMP) ||
+	(DataManager::GetIntValue(TW_IS_ENCRYPTED) == 0 && TWFunc::Path_Exists(orsFile))) {
 		OpenRecoveryScript::Run_OpenRecoveryScript();
 	}
 

From 28d8dec40d60a31309fcf6259dad38cd328f0717 Mon Sep 17 00:00:00 2001
From: Sean hoyt <seanhoyt963@gmail.com>
Date: Sun, 15 Jul 2018 06:16:09 +0200
Subject: [PATCH 077/207] bootable: Change how blank screen works

This is required on some devices where previous to 8.1/8.0 the blank
screen flag worked but don't now.

Test: Tested on begonia, screen is now no longer black

Change-Id: Ib4ff607d220bcb1aa5166fea23cc7ecb0e012fdd
---
 gui/Android.mk         | 3 +++
 gui/blanktimer.hpp     | 3 ++-
 gui/gui.cpp            | 6 ++++++
 minuitwrp/Android.mk   | 3 ---
 minuitwrp/graphics.cpp | 6 ------
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gui/Android.mk b/gui/Android.mk
index 60ba325b17..02bd0a1927 100755
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -89,6 +89,9 @@ endif
 ifeq ($(TW_ROUND_SCREEN), true)
     LOCAL_CFLAGS += -DTW_ROUND_SCREEN
 endif
+ifeq ($(TW_SCREEN_BLANK_ON_BOOT), true)
+    LOCAL_CFLAGS += -DTW_SCREEN_BLANK_ON_BOOT
+endif
 
 LOCAL_C_INCLUDES += \
     bionic \
diff --git a/gui/blanktimer.hpp b/gui/blanktimer.hpp
index fe7b77c174..6aca270878 100644
--- a/gui/blanktimer.hpp
+++ b/gui/blanktimer.hpp
@@ -42,10 +42,11 @@ class blanktimer
 
 	bool isScreenOff();
 
+	void blank(void);
+
 private:
 	void setTimer(void);
 	string getBrightness(void);
-	void blank(void);
 
 	pthread_mutex_t mutex;
 	enum State { kOn = 0, kDim = 1, kOff = 2, kBlanked = 3 };
diff --git a/gui/gui.cpp b/gui/gui.cpp
index ce8c3e29d9..ade4d792da 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -754,6 +754,12 @@ extern "C" int gui_init(void)
 	gr_init();
 	TWFunc::Set_Brightness(DataManager::GetStrValue("tw_brightness"));
 
+#ifdef TW_SCREEN_BLANK_ON_BOOT
+        printf("TW_SCREEN_BLANK_ON_BOOT := true\n");
+        blankTimer.blank();
+        blankTimer.resetTimerAndUnblank();
+#endif
+
 	// load and show splash screen
 	if (PageManager::LoadPackage("splash", TWRES "splash.xml", "splash")) {
 		LOGERR("Failed to load splash screen XML.\n");
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index 2ca2091e1a..7e5ddd8619 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -142,9 +142,6 @@ ifneq ($(TARGET_RECOVERY_OVERSCAN_PERCENT),)
 else
   LOCAL_CFLAGS += -DOVERSCAN_PERCENT=0
 endif
-ifeq ($(TW_SCREEN_BLANK_ON_BOOT), true)
-    LOCAL_CFLAGS += -DTW_SCREEN_BLANK_ON_BOOT
-endif
 ifeq ($(TW_FBIOPAN), true)
     LOCAL_CFLAGS += -DTW_FBIOPAN
 endif
diff --git a/minuitwrp/graphics.cpp b/minuitwrp/graphics.cpp
index 47ff3b9179..c3d6ca5af4 100644
--- a/minuitwrp/graphics.cpp
+++ b/minuitwrp/graphics.cpp
@@ -421,12 +421,6 @@ int gr_init(void)
     gr_flip();
     gr_flip();
 
-#ifdef TW_SCREEN_BLANK_ON_BOOT
-    printf("TW_SCREEN_BLANK_ON_BOOT := true\n");
-    gr_fb_blank(true);
-    gr_fb_blank(false);
-#endif
-
     return 0;
 }
 

From ffc9896603b9ff55a4f6e7b5a8cea39b1571611c Mon Sep 17 00:00:00 2001
From: mauronofrio <poronofrio@gmail.com>
Date: Sun, 24 May 2020 18:53:50 +0000
Subject: [PATCH 078/207] Little fix of double includes

Change-Id: Ie19404b9662d6d8757dacc8a6e43fe937ea004c9
---
 twrp-functions.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 21c16a78e9..fa666456c1 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -29,7 +29,6 @@
 #endif
 
 #include "twrpDigest/twrpDigest.hpp"
-#include "ext4crypt_tar.h"
 
 #ifndef BUILD_TWRPTAR_MAIN
 #include "partitions.hpp"

From ef675d1e2c685c7ca3d7e719611cd68e92ebd178 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Mon, 25 May 2020 10:10:54 -0400
Subject: [PATCH 079/207] debug: remove extra debug statements

Change-Id: I6043d7a5c3ea23b9bd58d09af2d3bb13e026493e
---
 twrp-functions.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index e0e4301fa2..7673795c5c 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1373,7 +1373,6 @@ bool TWFunc::Is_Data_Wiped(std::string path) {
 	if (d != NULL) {
 		struct dirent* de;
 		while ((de = readdir(d)) != NULL) {
-			LOGINFO("file: %s\n", de->d_name);
 			if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
 				continue;
 			if (strncmp(de->d_name, "lost+found", 10) == 0 || strncmp(de->d_name, "media", 5) == 0)
@@ -1383,7 +1382,6 @@ bool TWFunc::Is_Data_Wiped(std::string path) {
 		}
 		closedir(d);
 	}
-	LOGINFO("file_count: %zu\n", file_count);
 	return file_count == 0;
 #else
 	return true;

From b51f4af5286750bf15ffe61fd85e8600cbfd15c5 Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Tue, 11 Feb 2020 11:13:32 +0530
Subject: [PATCH 080/207] crypto: Update crypto fde

* Some missed in https://github.com/TeamWin/android_bootable_recovery/commit/191a6948d9f1f627cc53c38d72d4bce2e7897753

* Crypto msg from https://source.codeaurora.org/quic/la/platform/system/vold/commit/cryptfs.cpp?h=LA.UM.8.1.r1-13500-sm8150.0&id=e1a7e772699216121dd8fa774381ffeedb076139

* As devices required to update 'Upgraded key' through keymaster in v4.0.

Change-Id: Ia66be6917c4690f0d70ba89ea33ebfa2fcb6974a
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 crypto/fde/cryptfs.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/crypto/fde/cryptfs.cpp b/crypto/fde/cryptfs.cpp
index 5b8757c52d..9ba4f0b0b2 100644
--- a/crypto/fde/cryptfs.cpp
+++ b/crypto/fde/cryptfs.cpp
@@ -528,7 +528,9 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
             ftr->keymaster_blob, KEYMASTER_BLOB_SIZE, &ftr->keymaster_blob_size);
 #endif //TW_KEYMASTER_MAX_API == 3
 #if TW_KEYMASTER_MAX_API >= 4
-    //for (;;) {
+    for (int c = 1;c <= 20;c++) { // 20 tries are enough for signing keymaster
+        if (c > 2)
+            usleep(5000); // if failed in two tries lets rest
         auto result = keymaster_sign_object_for_cryptfs_scrypt(
             ftr->keymaster_blob, ftr->keymaster_blob_size, KEYMASTER_CRYPTFS_RATE_LIMIT, to_sign,
             to_sign_size, signature, signature_size);
@@ -552,8 +554,7 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
             SLOGE("Failed to write upgraded key to disk\n");
         }*/
         SLOGD("Key upgraded successfully\n");
-        return 0;
-    //}
+    }
 #endif
     return -1;
 }
@@ -912,7 +913,10 @@ static int load_crypto_mapping_table(struct crypt_mnt_ftr *crypt_ftr,
   tgt->length = crypt_ftr->fs_size;
   crypt_params = buffer + sizeof(struct dm_ioctl) + sizeof(struct dm_target_spec);
   buff_offset = crypt_params - buffer;
-  SLOGI("Extra parameters for dm_crypt: %s\n", extra_params);
+  SLOGI(
+	"Creating crypto dev \"%s\"; cipher=%s, keysize=%u, real_dev=%s, len=%llu, params=\"%s\"\n",
+	name, crypt_ftr->crypto_type_name, crypt_ftr->keysize, real_blk_name, tgt->length * 512,
+	extra_params);
 
 #ifdef CONFIG_HW_DISK_ENCRYPTION
   if(is_hw_disk_encryption((char*)crypt_ftr->crypto_type_name)) {

From 5738e760646d67791e938954a8873da41209d58c Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Sun, 10 May 2020 04:18:30 +0530
Subject: [PATCH 081/207] partitionmanager: magisk update sytnax as per new
 binaries

Change-Id: I51994b991472cf103de067b9856ff3df1bf35a90
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 gui/action.cpp       | 4 ++--
 partitionmanager.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gui/action.cpp b/gui/action.cpp
index 85366b9c7f..f955ccaca7 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -2175,7 +2175,7 @@ int GUIAction::fixabrecoverybootloop(std::string arg __unused)
 			goto exit;
 		DataManager::SetProgress(.25);
 		gui_msg("fixing_recovery_loop_patch=Patching kernel...");
-		std::string command = "cd " REPACK_ORIG_DIR " && /sbin/magiskboot --hexpatch kernel 77616E745F696E697472616D667300 736B69705F696E697472616D667300";
+		std::string command = "cd " REPACK_ORIG_DIR " && /sbin/magiskboot hexpatch kernel 77616E745F696E697472616D667300 736B69705F696E697472616D667300";
 		if (TWFunc::Exec_Cmd(command) != 0) {
 			gui_msg(Msg(msg::kError, "fix_recovery_loop_patch_error=Error patching kernel."));
 			goto exit;
@@ -2191,7 +2191,7 @@ int GUIAction::fixabrecoverybootloop(std::string arg __unused)
 		}
 		DataManager::SetProgress(.5);
 		gui_msg(Msg("repacking_image=Repacking {1}...")(part->Display_Name));
-		command = "cd " REPACK_ORIG_DIR " && /sbin/magiskboot --repack " REPACK_ORIG_DIR "boot.img";
+		command = "cd " REPACK_ORIG_DIR " && /sbin/magiskboot repack " REPACK_ORIG_DIR "boot.img";
 		if (TWFunc::Exec_Cmd(command) != 0) {
 			gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
 			goto exit;
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 80833958b1..bcf891c1ca 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -3254,7 +3254,7 @@ bool TWPartitionManager::Prepare_Repack(const std::string& Source_Path, const st
 		if (TWFunc::copy_file(Source_Path, destination, 0644))
 			return false;
 	}
-	std::string command = "cd " + Temp_Folder_Destination + " && /sbin/magiskboot --unpack -h '" + Source_Path +"'";
+	std::string command = "cd " + Temp_Folder_Destination + " && /sbin/magiskboot unpack -h '" + Source_Path +"'";
 	if (TWFunc::Exec_Cmd(command) != 0) {
 		LOGINFO("Error unpacking %s!\n", Source_Path.c_str());
 		gui_msg(Msg(msg::kError, "unpack_error=Error unpacking image."));
@@ -3306,7 +3306,7 @@ bool TWPartitionManager::Repack_Images(const std::string& Target_Image, const st
 		LOGERR("Disabling verity is not implemented yet\n");
 	if (Repack_Options.Disable_Force_Encrypt)
 		LOGERR("Disabling force encrypt is not implemented yet\n");
-	std::string command = "cd " + path + " && /sbin/magiskboot --repack " + path + "boot.img";
+	std::string command = "cd " + path + " && /sbin/magiskboot repack " + path + "boot.img";
 	if (TWFunc::Exec_Cmd(command) != 0) {
 		gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
 		return false;
@@ -3335,7 +3335,7 @@ bool TWPartitionManager::Repack_Images(const std::string& Target_Image, const st
 			return false;
 		}
 		path = REPACK_ORIG_DIR;
-		command = "cd " + path + " && /sbin/magiskboot --repack " + path + "boot.img";
+		command = "cd " + path + " && /sbin/magiskboot repack " + path + "boot.img";
 		if (TWFunc::Exec_Cmd(command) != 0) {
 			gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
 			return false;

From 589daae9ccd2951263bd183125c0ad6de454e277 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Fri, 5 Jun 2020 17:38:08 +0200
Subject: [PATCH 082/207] Remove /system -> /system_root/system symlink in
 ZIP-install

when unmounting system /system_root/system is symlinked to
/system on devices built with BOARD_BUILD_SYSTEM_ROOT_IMAGE

Some ZIPs don't play well with a symlink when trying to mount to
/system.

Change-Id: Ifb0a105ddc0337353a7e1ac234c9f1e5b387e992
---
 twinstall.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/twinstall.cpp b/twinstall.cpp
index ae1abc5c47..427a9347af 100755
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -419,6 +419,8 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 			gui_err("unmount_system_err=Failed unmounting System");
 			return -1;
 		}
+		unlink("/system");
+		mkdir("/system", 0755);
 	}
 
 	time_t start, stop;

From bf0b0fb2a3f4753cb1b44a0a41136bdd6a75273b Mon Sep 17 00:00:00 2001
From: Noah Jacobson <noah@noahjacobson.com>
Date: Fri, 5 Jun 2020 12:47:20 -0400
Subject: [PATCH 083/207] multiuser: Parse users only when Decrypt_DE runs
 successfully

Change-Id: I62b3ae3876843387a33ecf25501f7ee50f4c7f99
---
 partition.cpp        | 24 ++++++++++++------------
 partitionmanager.cpp |  2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/partition.cpp b/partition.cpp
index cb969a4bef..7ae43ba015 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -741,18 +741,6 @@ if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 	int retry_count = 3;
 	while (!Decrypt_DE() && --retry_count)
 		usleep(2000);
-	PartitionManager.Parse_Users();  // after load_all_de_keys() to parse_users
-	std::vector<users_struct>::iterator iter;
-	std::vector<users_struct>* userList = PartitionManager.Get_Users_List();
-	for (iter = userList->begin(); iter != userList->end(); iter++) {
-		if (atoi((*iter).userId.c_str()) != 0) {
-			ExcludeAll(Mount_Point + "/system_de/" + (*iter).userId + "/spblob");
-			ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/gatekeeper.password.key");
-			ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/gatekeeper.pattern.key");
-			ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/locksettings.db");
-			ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/locksettings.db-wal");
-		}
-	}
 	if (retry_count > 0) {
 		property_set("ro.crypto.state", "encrypted");
 		Is_Encrypted = true;
@@ -764,6 +752,18 @@ if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 			LOGERR("This TWRP does not have synthetic password decrypt support\n");
 			pwd_type = 0;  // default password
 		}
+		PartitionManager.Parse_Users();  // after load_all_de_keys() to parse_users
+		std::vector<users_struct>::iterator iter;
+		std::vector<users_struct>* userList = PartitionManager.Get_Users_List();
+		for (iter = userList->begin(); iter != userList->end(); iter++) {
+			if (atoi((*iter).userId.c_str()) != 0) {
+				ExcludeAll(Mount_Point + "/system_de/" + (*iter).userId + "/spblob");
+				ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/gatekeeper.password.key");
+				ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/gatekeeper.pattern.key");
+				ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/locksettings.db");
+				ExcludeAll(Mount_Point + "/system/users/" + (*iter).userId + "/locksettings.db-wal");
+			}
+		}
 		DataManager::SetValue(TW_CRYPTO_PWTYPE, pwd_type);
 		DataManager::SetValue("tw_crypto_pwtype_0", pwd_type);
 		DataManager::SetValue(TW_CRYPTO_PASSWORD, "");
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index bcf891c1ca..d5dc9fe289 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1766,11 +1766,13 @@ void TWPartitionManager::Check_Users_Decryption_Status() {
 	std::vector<users_struct>::iterator iter;
 	for (iter = Users_List.begin(); iter != Users_List.end(); iter++) {
 		if (!(*iter).isDecrypted) {
+			LOGINFO("User %s is not decrypted.\n", (*iter).userId.c_str());
 			all_is_decrypted = 0;
 			break;
 		}
 	}
 	if (all_is_decrypted == 1) {
+		LOGINFO("All found users are decrypted.\n");
 		DataManager::SetValue("tw_all_users_decrypted", "1");
 		property_set("twrp.all.users.decrypted", "true");
 	} else

From 86a4370e6fe4bb20033b0de3a261aec4bf3573db Mon Sep 17 00:00:00 2001
From: Stefan Tauner <stefan.tauner@gmx.at>
Date: Sat, 11 Jan 2020 22:28:53 +0100
Subject: [PATCH 084/207] Add and install permission file for Android 9+

Without this, installing the twrp app as system app leads to
reboot loops into recovery with log messages like:
java.lang.IllegalStateException: Signature|privileged permissions not in privapp-permissions whitelist: {me.twrp.twrpapp: android.permission.READ_PRECISE_PHONE_STATE, me.twrp.twrpapp: android.permission.BATTERY_STATS, me.twrp.twrpapp: android.permission.PACKAGE_USAGE_STATS}

Change-Id: I6156323ea0d23512b0d7eefbd03aa627f3002ae8
---
 gui/action.cpp                           | 16 ++++++++++++++++
 prebuilt/Android.mk                      |  9 +++++++++
 prebuilt/privapp-permissions-twrpapp.xml |  8 ++++++++
 3 files changed, 33 insertions(+)
 mode change 100755 => 100644 gui/action.cpp
 create mode 100644 prebuilt/privapp-permissions-twrpapp.xml

diff --git a/gui/action.cpp b/gui/action.cpp
old mode 100755
new mode 100644
index f955ccaca7..b26d55bb79
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -2058,6 +2058,22 @@ int GUIAction::installapp(std::string arg __unused)
 							LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno));
 							goto exit;
 						}
+
+						// System apps require their permissions to be pre-set via an XML file in /etc/permissions
+						string permission_path = base_path + "/etc/permissions/privapp-permissions-twrpapp.xml";
+						if (TWFunc::copy_file("/sbin/privapp-permissions-twrpapp.xml", permission_path, 0644)) {
+							LOGERR("Error copying permission file\n");
+							goto exit;
+						}
+						if (chown(permission_path.c_str(), 1000, 1000)) {
+							LOGERR("chown %s error: %s\n", permission_path.c_str(), strerror(errno));
+							goto exit;
+						}
+						if (setfilecon(permission_path.c_str(), (security_context_t)context.c_str()) < 0) {
+							LOGERR("setfilecon %s error: %s\n", permission_path.c_str(), strerror(errno));
+							goto exit;
+						}
+
 						sync();
 						sync();
 						PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), true);
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 788068d853..ae5b4bec13 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -562,6 +562,15 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
+#TWRP App permissions for Android 9+
+include $(CLEAR_VARS)
+LOCAL_MODULE := privapp-permissions-twrpapp.xml
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
 ifeq ($(TW_INCLUDE_CRYPTO), true)
     ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),)
         ifneq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
diff --git a/prebuilt/privapp-permissions-twrpapp.xml b/prebuilt/privapp-permissions-twrpapp.xml
new file mode 100644
index 0000000000..9b294c2917
--- /dev/null
+++ b/prebuilt/privapp-permissions-twrpapp.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="me.twrp.twrpapp">
+        <permission name="android.permission.BATTERY_STATS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+    </privapp-permissions>
+</permissions>

From e0e43403b9bdd9261e733aa0448d7689a9f23ced Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Fri, 5 Jun 2020 11:50:26 -0400
Subject: [PATCH 085/207] twrp version update: update to 3.4.0 release notes
 are on twrp.me

Change-Id: I3762fb3e2c3ffb4cbdc6d93ce424cacc7e0ef418
---
 variables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.h b/variables.h
index 24cde92bd1..32a7b99385 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.3.1"
+#define TW_MAIN_VERSION_STR       "3.4.0"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 
 #define TW_USE_COMPRESSION_VAR      "tw_use_compression"

From 4e37953bc945549a704884d7d5250f01d9d01bfc Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 5 Jun 2020 20:42:16 -0400
Subject: [PATCH 086/207] Fix build in 5.1 tree. to_string doesn't exist in
 bionic in 5.1.

Change-Id: If10b76f7a2b695c4be470812e048c66f5920d798
---
 partition.cpp | 5 ++++-
 twrp.cpp      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/partition.cpp b/partition.cpp
index 7ae43ba015..78c68db04b 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -422,7 +422,10 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 		else
 			return true;
 	} else if (Mount_Point == "auto") {
-		Mount_Point = "/auto" + to_string(auto_index);
+		Mount_Point = "/auto";
+		char autoi[5];
+		sprintf(autoi, "%i", auto_index);
+		Mount_Point += autoi;
 		Backup_Path = Mount_Point;
 		Storage_Path = Mount_Point;
 		Backup_Name = Mount_Point.substr(1);
diff --git a/twrp.cpp b/twrp.cpp
index cf519bb67a..37053d29a8 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -45,7 +45,7 @@ extern "C" {
 #include "partitions.hpp"
 
 #ifdef USE_OLD_BASE_INCLUDE
-#include <base/strings.h>
+#include <strings.h>
 #else
 #include <android-base/strings.h>
 #endif

From 909daa959c99cf3a6abbe224ec3fc45669df4440 Mon Sep 17 00:00:00 2001
From: Mohd Faraz <mohd.faraz.abc@gmail.com>
Date: Sat, 30 May 2020 21:06:32 +0530
Subject: [PATCH 087/207] TWRP: Enable qti input haptics vibrators support

 * these type of vibrators are present in newer devices based on
   board sm8150 & above. Like Oneplus 7 series, Redmi K20 Pro, etc.
 * to enable it add TW_SUPPORT_INPUT_1_2_HAPTICS := true in Boardconfig.mk
 * you will need to add the vendor vibrator service to init and run it in your device tree
Change-Id: I0fe6612def149e70808ca41829b6f7ba0b23cd62
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 minuitwrp/Android.mk |  7 +++++++
 minuitwrp/events.cpp | 12 +++++++++++-
 prebuilt/Android.mk  |  6 ++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index 7e5ddd8619..b1fb26ae55 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -10,6 +10,13 @@ LOCAL_SRC_FILES := \
     graphics_utils.cpp \
     events.cpp
 
+ifeq ($(TW_SUPPORT_INPUT_1_2_HAPTICS),true)
+    ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
+        LOCAL_SHARED_LIBRARIES += android.hardware.vibrator@1.2 libhidlbase
+        LOCAL_CFLAGS += -DUSE_QTI_HAPTICS
+    endif
+endif
+
 ifneq ($(TW_BOARD_CUSTOM_GRAPHICS),)
     $(warning ****************************************************************************)
     $(warning * TW_BOARD_CUSTOM_GRAPHICS support has been deprecated in TWRP.            *)
diff --git a/minuitwrp/events.cpp b/minuitwrp/events.cpp
index a2a3d166b3..955acf31f1 100755
--- a/minuitwrp/events.cpp
+++ b/minuitwrp/events.cpp
@@ -28,6 +28,10 @@
 #include <string.h>
 #include <fstream>
 
+#ifdef USE_QTI_HAPTICS
+#include <android/hardware/vibrator/1.2/IVibrator.h>
+#endif
+
 #include "../common.h"
 
 #include "minui.h"
@@ -130,12 +134,18 @@ int vibrate(int timeout_ms)
     char tout[6];
     sprintf(tout, "%i", timeout_ms);
 
+#ifdef USE_QTI_HAPTICS
+    android::sp<android::hardware::vibrator::V1_2::IVibrator> vib = android::hardware::vibrator::V1_2::IVibrator::getService();
+    if (vib != nullptr) {
+        vib->on((uint32_t)timeout_ms);
+    }
+#else
     if (std::ifstream(LEDS_HAPTICS_ACTIVATE_FILE).good()) {
         write_to_file(LEDS_HAPTICS_DURATION_FILE, tout);
         write_to_file(LEDS_HAPTICS_ACTIVATE_FILE, "1");
     } else
         write_to_file(VIBRATOR_TIMEOUT_FILE, tout);
-
+#endif
     return 0;
 }
 #endif
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index ae5b4bec13..29351136ce 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -226,6 +226,12 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
             RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/keystore_cli
             RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/servicemanager
             RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.system.wifi.keystore@1.0.so
+            ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
+                RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.vibrator@1.0.so
+                RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.vibrator@1.1.so
+                RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.vibrator@1.2.so
+            endif
+
             ifneq ($(wildcard system/keymaster/keymaster_stl.cpp),)
                 RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_portable.so
                 RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_staging.so

From 186eb7002d95e28325f2d2e42637c989e08ac618 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Mon, 8 Jun 2020 15:59:32 -0400
Subject: [PATCH 088/207] ext4crypt: fix include location for recovery-twrp in
 lineage

Change-Id: Iefa73425fc13f41f5a267cce0c5d4047edc25e9e
---
 Android.mk     | 2 +-
 gui/Android.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 3d9800d35f..ab3bcc82b4 100755
--- a/Android.mk
+++ b/Android.mk
@@ -184,7 +184,7 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
     ifeq ($(shell test $(PLATFORM_SDK_VERSION) -le 28; echo $$?),0)
         LOCAL_C_INCLUDES += system/extras/ext4_utils \
             system/extras/ext4_utils/include \
-            bootable/recovery/crypto/ext4crypt
+	    $(commands_TWRP_local_path)/crypto/ext4crypt
         LOCAL_SHARED_LIBRARIES += libext4_utils
         ifneq ($(wildcard external/lz4/Android.mk),)
             #LOCAL_STATIC_LIBRARIES += liblz4
diff --git a/gui/Android.mk b/gui/Android.mk
index 02bd0a1927..f08378c3b5 100755
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -50,7 +50,7 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
     ifeq ($(shell test $(PLATFORM_SDK_VERSION) -le 28; echo $$?),0)
         LOCAL_C_INCLUDES += system/extras/ext4_utils \
             system/extras/ext4_utils/include \
-            bootable/recovery/crypto/ext4crypt
+            $(LOCAL_PATH)/../crypto/ext4crypt
         LOCAL_SHARED_LIBRARIES += libext4_utils
     endif
 endif

From 314cbd5698d1750a31c9cf4284d3ce8dfadce157 Mon Sep 17 00:00:00 2001
From: LameMonster82 <gregariivanov@gmail.com>
Date: Thu, 4 Jun 2020 13:31:12 +0200
Subject: [PATCH 089/207] add support for TSPDRV vibration

* Needed for the LG V30, G7, V35, V40

* Use TW_HAPTICS_TSPDRV in your BoardConfig.mk to enable it.

Change-Id: I0970ed5c046e851f7e6f562283523c7214c8d2b5
---
 minuitwrp/Android.mk |   5 ++
 minuitwrp/events.cpp |   2 +
 minuitwrp/tspdrv.cpp | 193 +++++++++++++++++++++++++++++++++++++++++++
 minuitwrp/tspdrv.h   | 100 ++++++++++++++++++++++
 4 files changed, 300 insertions(+)
 create mode 100644 minuitwrp/tspdrv.cpp
 create mode 100644 minuitwrp/tspdrv.h

diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index b1fb26ae55..c844082833 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -187,6 +187,11 @@ ifneq ($(TW_WHITELIST_INPUT),)
   LOCAL_CFLAGS += -DWHITELIST_INPUT=$(TW_WHITELIST_INPUT)
 endif
 
+ifeq ($(TW_HAPTICS_TSPDRV), true)
+  LOCAL_SRC_FILES += tspdrv.cpp
+  LOCAL_CFLAGS += -DTW_HAPTICS_TSPDRV
+endif
+
 ifeq ($(TW_DISABLE_TTF), true)
     $(warning ****************************************************************************)
     $(warning * TW_DISABLE_TTF support has been deprecated in TWRP.                      *)
diff --git a/minuitwrp/events.cpp b/minuitwrp/events.cpp
index 955acf31f1..7e5bc42e8a 100755
--- a/minuitwrp/events.cpp
+++ b/minuitwrp/events.cpp
@@ -128,6 +128,7 @@ int write_to_file(const std::string& fn, const std::string& line) {
 }
 
 #ifndef TW_NO_HAPTICS
+#ifndef TW_HAPTICS_TSPDRV
 int vibrate(int timeout_ms)
 {
     if (timeout_ms > 10000) timeout_ms = 1000;
@@ -149,6 +150,7 @@ int vibrate(int timeout_ms)
     return 0;
 }
 #endif
+#endif
 
 /* Returns empty tokens */
 static char *vk_strtok_r(char *str, const char *delim, char **save_str)
diff --git a/minuitwrp/tspdrv.cpp b/minuitwrp/tspdrv.cpp
new file mode 100644
index 0000000000..6967cd59b7
--- /dev/null
+++ b/minuitwrp/tspdrv.cpp
@@ -0,0 +1,193 @@
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <cinttypes>
+#include <cmath>
+#include <iostream>
+#include <sys/ioctl.h>
+
+#include "tspdrv.h"
+
+int tspdrv_initialized = 0;
+int tspdrv_file_desc;
+int tspdrv_numActuators = 0;
+
+int initialize_tspdrv()
+{
+    // Open device file as read/write for ioctl and write 
+    tspdrv_file_desc = open(TSPDRV, O_RDWR);
+    if(tspdrv_file_desc < 0)
+    {
+        printf("Failed to open device file: %s", TSPDRV);
+        return -1;
+    }
+
+    // create default device parameters
+    device_parameter dev_param1 { 0, VIBE_KP_CFG_FREQUENCY_PARAM1, 0};
+    device_parameter dev_param2 { 0, VIBE_KP_CFG_FREQUENCY_PARAM2, 0};
+    device_parameter dev_param3 { 0, VIBE_KP_CFG_FREQUENCY_PARAM3, 0};
+    device_parameter dev_param4 { 0, VIBE_KP_CFG_FREQUENCY_PARAM4, 400};
+    device_parameter dev_param5 { 0, VIBE_KP_CFG_FREQUENCY_PARAM5, 13435};
+    device_parameter dev_param6 { 0, VIBE_KP_CFG_FREQUENCY_PARAM6, 0};
+    device_parameter dev_param_update_rate {0, VIBE_KP_CFG_UPDATE_RATE_MS, 5};
+
+    // Set magic number for vibration driver, wont allow us to write data without!
+    int ret = ioctl(tspdrv_file_desc, TSPDRV_SET_MAGIC_NUMBER, TSPDRV_MAGIC_NUMBER);
+    if(ret != 0)
+    {
+        printf("Failed to set magic number");
+        return -ret;
+    }
+
+    // Set default device parameter 1
+    ret = ioctl(tspdrv_file_desc, TSPDRV_SET_DEVICE_PARAMETER, &dev_param1);
+    if(ret != 0)
+    {
+        printf("Failed to set device parameter 1");
+        return -ret;
+    }
+
+    // Set default device parameter 2
+    ret = ioctl(tspdrv_file_desc, TSPDRV_SET_DEVICE_PARAMETER, &dev_param2);
+    if(ret != 0)
+    {
+        printf("Failed to set device parameter 2");
+        return -ret;
+    }
+
+    // Set default device parameter 3
+    ret = ioctl(tspdrv_file_desc, TSPDRV_SET_DEVICE_PARAMETER, &dev_param3);
+    if(ret != 0)
+    {
+        printf("Failed to set device parameter 3");
+        return -ret;
+    }
+
+    // Set default device parameter 4
+    ret = ioctl(tspdrv_file_desc, TSPDRV_SET_DEVICE_PARAMETER, &dev_param4);
+    if(ret != 0)
+    {
+        printf("Failed to set device parameter 4");
+        return -ret;
+    }
+
+    // Set default device parameter 5
+    ret = ioctl(tspdrv_file_desc, TSPDRV_SET_DEVICE_PARAMETER, &dev_param5);
+    if(ret != 0)
+    {
+        printf("Failed to set device parameter 5");
+        return -ret;
+    }
+
+    // Set default device parameter 6
+    ret = ioctl(tspdrv_file_desc, TSPDRV_SET_DEVICE_PARAMETER, &dev_param6);
+    if(ret != 0)
+    {
+        printf("Failed to set device parameter 6");
+        return -ret;
+    }
+
+    // Set default device parameter update rate
+    ret = ioctl(tspdrv_file_desc, TSPDRV_SET_DEVICE_PARAMETER, &dev_param_update_rate);
+    if(ret != 0)
+    {
+        printf("Failed to set device parameter update rate");
+        return -ret;
+    }
+
+    // Get number of actuators the device has
+    ret = ioctl(tspdrv_file_desc, TSPDRV_GET_NUM_ACTUATORS, 0);
+    if(ret == 0)
+    {
+        printf("No actuators found!");
+        return -2;
+    }
+
+    tspdrv_numActuators = ret;
+    tspdrv_initialized = 1;
+    return 0;
+}
+
+int tspdrv_off()  {
+
+    for(int32_t i = 0; i < tspdrv_numActuators; i++)
+    {
+        int32_t ret = ioctl(tspdrv_file_desc, TSPDRV_DISABLE_AMP, i);
+        if(ret != 0)
+        {
+            printf("Failed to deactivate Actuator with index %d", i);
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+int vibrate(int timeout_ms)
+{
+    double BUFFER_ENTRIES_PER_MS = 8.21;
+    uint8_t DEFAULT_AMPLITUDE = 127;
+    int32_t OUTPUT_BUFFER_SIZE = 40;
+
+    if(!tspdrv_initialized)
+    {
+        printf("Initializing TSPDRV\n");
+        if(initialize_tspdrv() == 0)
+        {
+            printf("TSPDRV initialized\n");
+        }
+    }
+
+    // Calculate needed buffer entries
+    int32_t bufferSize = (int32_t) round(BUFFER_ENTRIES_PER_MS * timeout_ms); 
+    VibeUInt8 fullBuffer[bufferSize];
+
+    // turn previous vibrations off
+    tspdrv_off();
+
+    for(int32_t i = 0; i < bufferSize; i++)
+    {
+        // The vibration is a sine curve, the negative parts are 255 + negative value
+        fullBuffer[i] = (VibeUInt8) (DEFAULT_AMPLITUDE * sin(i/BUFFER_ENTRIES_PER_MS));
+    }
+
+    // Amount of buffer arrays with size of OUTPUT_BUFFER_SIZE
+    int32_t numBuffers = (int32_t) ceil((double)bufferSize / (double)OUTPUT_BUFFER_SIZE);
+    VibeUInt8 outputBuffers[numBuffers][OUTPUT_BUFFER_SIZE];
+    memset(outputBuffers, 0, sizeof(outputBuffers));  // zero the array before we fill it with values
+
+    for(int32_t i = 0; i < bufferSize; i++)
+    {
+        // split fullBuffer into multiple smaller buffers with size OUTPUT_BUFFER_SIZE
+        outputBuffers[i/OUTPUT_BUFFER_SIZE][i%OUTPUT_BUFFER_SIZE] = fullBuffer[i];
+    }
+
+    for(int32_t i = 0; i < tspdrv_numActuators; i++)
+    {
+        for(int32_t j = 0; j < numBuffers; j++)
+        {
+            char output[OUTPUT_BUFFER_SIZE + SPI_HEADER_SIZE];
+            memset(output, 0, sizeof(output));
+            output[0] = i;  // first byte is actuator index
+            output[1] = 8;  // per definition has to be 8
+            output[2] = OUTPUT_BUFFER_SIZE; // size of the following output buffer
+            for(int32_t k = 3; k < OUTPUT_BUFFER_SIZE+3; k++)
+            {
+                output[k] = outputBuffers[j][k-3];
+            }
+            // write the buffer to the device
+            write(tspdrv_file_desc, output, sizeof(output));
+            if((j+1) % 4 == 0)
+            {
+                // every 4 buffers, but not the first if theres only 1, we send an ENABLE_AMP signal
+                int32_t ret = ioctl(tspdrv_file_desc, TSPDRV_ENABLE_AMP, i);
+                if(ret != 0)
+                {
+                    printf("Failed to activate Actuator with index %d", i);
+                    return -1;
+                }
+            }
+        }
+    }
+    return 0;
+}
\ No newline at end of file
diff --git a/minuitwrp/tspdrv.h b/minuitwrp/tspdrv.h
new file mode 100644
index 0000000000..afb294eeaf
--- /dev/null
+++ b/minuitwrp/tspdrv.h
@@ -0,0 +1,100 @@
+/*
+** =========================================================================
+** File:
+**     tspdrv.h
+**
+** Description:
+**     Constants and type definitions for the TouchSense Kernel Module.
+**
+** Portions Copyright (c) 2008-2017 Immersion Corporation. All Rights Reserved.
+**
+** This file contains Original Code and/or Modifications of Original Code
+** as defined in and that are subject to the GNU Public License v2 -
+** (the 'License'). You may not use this file except in compliance with the
+** License. You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or contact
+** TouchSenseSales@immersion.com.
+**
+** The Original Code and all software distributed under the License are
+** distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+** EXPRESS OR IMPLIED, AND IMMERSION HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+** INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
+** FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. Please see
+** the License for the specific language governing rights and limitations
+** under the License.
+** =========================================================================
+*/
+
+#ifndef _TSPDRV_H
+#define _TSPDRV_H
+
+/* Constants */
+#define MODULE_NAME                         "tspdrv"
+#define TSPDRV                              "/dev/tspdrv"
+#define TSPDRV_MAGIC_NUMBER                 0x494D4D52
+#define TSPDRV_IOCTL_GROUP                  0x52
+#define TSPDRV_STOP_KERNEL_TIMER            _IO(TSPDRV_IOCTL_GROUP, 1) /* obsolete, may be removed in future */
+#define TSPDRV_SET_MAGIC_NUMBER             _IO(TSPDRV_IOCTL_GROUP, 2)
+#define TSPDRV_ENABLE_AMP                   _IO(TSPDRV_IOCTL_GROUP, 3)
+#define TSPDRV_DISABLE_AMP                  _IO(TSPDRV_IOCTL_GROUP, 4)
+#define TSPDRV_GET_NUM_ACTUATORS            _IO(TSPDRV_IOCTL_GROUP, 5)
+#define TSPDRV_SET_DEVICE_PARAMETER         _IO(TSPDRV_IOCTL_GROUP, 6)
+#define TSPDRV_SET_DBG_LEVEL                _IO(TSPDRV_IOCTL_GROUP, 7)
+#define TSPDRV_GET_DBG_LEVEL                _IO(TSPDRV_IOCTL_GROUP, 8)
+#define TSPDRV_SET_RUNTIME_RECORD_FLAG      _IO(TSPDRV_IOCTL_GROUP, 9)
+#define TSPDRV_GET_RUNTIME_RECORD_FLAG      _IO(TSPDRV_IOCTL_GROUP, 10)
+#define TSPDRV_SET_RUNTIME_RECORD_BUF_SIZE  _IO(TSPDRV_IOCTL_GROUP, 11)
+#define TSPDRV_GET_RUNTIME_RECORD_BUF_SIZE  _IO(TSPDRV_IOCTL_GROUP, 12)
+#define TSPDRV_GET_PARAM_FILE_ID            _IO(TSPDRV_IOCTL_GROUP, 13)
+#define TSPDRV_GET_DEVICE_STATUS            _IO(TSPDRV_IOCTL_GROUP, 14)
+/*
+** Frequency constant parameters to control force output values and signals.
+*/
+#define VIBE_KP_CFG_FREQUENCY_PARAM1        85
+#define VIBE_KP_CFG_FREQUENCY_PARAM2        86
+#define VIBE_KP_CFG_FREQUENCY_PARAM3        87
+#define VIBE_KP_CFG_FREQUENCY_PARAM4        88
+#define VIBE_KP_CFG_FREQUENCY_PARAM5        89
+#define VIBE_KP_CFG_FREQUENCY_PARAM6        90
+
+/*
+** Force update rate in milliseconds.
+*/
+#define VIBE_KP_CFG_UPDATE_RATE_MS          95
+
+#define VIBE_MAX_DEVICE_NAME_LENGTH         64
+#define SPI_HEADER_SIZE                     3   /* DO NOT CHANGE - SPI buffer header size */
+#define VIBE_OUTPUT_SAMPLE_SIZE             50  /* DO NOT CHANGE - maximum number of samples */
+#define MAX_DEBUG_BUFFER_LENGTH             1024
+
+typedef int8_t		VibeInt8;
+typedef u_int8_t	VibeUInt8;
+typedef int16_t		VibeInt16;
+typedef u_int16_t	VibeUInt16;
+typedef int32_t		VibeInt32;
+typedef u_int32_t	VibeUInt32;
+typedef u_int8_t	VibeBool;
+typedef VibeInt32	VibeStatus;
+
+/* Device parameters sent to the kernel module, tspdrv.ko */
+typedef struct
+{
+    VibeInt32 nDeviceIndex;
+    VibeInt32 nDeviceParamID;
+    VibeInt32 nDeviceParamValue;
+} device_parameter;
+
+typedef struct
+{
+    VibeUInt8 nActuatorIndex;  /* 1st byte is actuator index */
+    VibeUInt8 nBitDepth;       /* 2nd byte is bit depth */
+    VibeUInt8 nBufferSize;     /* 3rd byte is data size */
+    VibeUInt8 dataBuffer[40];
+} actuator_samples_buffer;
+
+/* Error and Return value codes */
+#define VIBE_S_SUCCESS                      0	/* Success */
+#define VIBE_E_FAIL			   -4	/* Generic error */
+
+#endif  /* _TSPDRV_H */

From 3754fabbea2eefeb7c1a0c5bc804f1e14a686855 Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Sat, 6 Jun 2020 20:50:57 +0530
Subject: [PATCH 090/207] fix flashing issue after restore policy issue

 * since commit: https://github.com/TeamWin/android_bootable_recovery/commit/a2bd7b7758a4585814f642d55301043276d8a002
   after factory reset /data/recovery doesn't recreates in A-only devices.

 * so fixes issue flashing newer roms need access to /data/recovery

Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
Change-Id: I02cb67f7161571b1aa02784049231d42872a3587
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 data.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/data.cpp b/data.cpp
index 1f9498fa47..618fc3c7a3 100755
--- a/data.cpp
+++ b/data.cpp
@@ -1101,6 +1101,14 @@ void DataManager::Output_Version(void)
 			LOGINFO("Unable to mount '%s' to write version number.\n", Path.c_str());
 			return;
 		}
+
+		if (!TWFunc::Path_Exists(recoveryCacheDir)) {
+			LOGINFO("Recreating %s folder.\n", recoveryCacheDir.c_str());
+			if (!TWFunc::Create_Dir_Recursive(recoveryCacheDir.c_str(), S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP, 0, 0)) {
+				LOGERR("DataManager::Output_Version -- Unable to make %s: %s\n", recoveryCacheDir.c_str(), strerror(errno));
+				return;
+			}
+		}
 	}
 
 	std::string verPath = recoveryCacheDir + ".version";

From 0cd6be903b3129b30d5abe40d3a0f30545eef27d Mon Sep 17 00:00:00 2001
From: Patrick Zacharias <littlefighter1996@googlemail.com>
Date: Sat, 6 Jun 2020 16:02:58 +0200
Subject: [PATCH 091/207] gui: Repair OEM build

Building with TW_OEM_BUILD results in errors during compilation:

error: unused label 'error' [-Werror,-Wunused-label]
error: unused parameter 'allow_commands' [-Werror,-Wunused-parameter]

These changes are required to allow compilation to complete.

Change-Id: Iddc5bf1b90120de19a472c48b21d3531b758cacf
---
 gui/gui.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gui/gui.cpp b/gui/gui.cpp
index ade4d792da..cd6fa59734 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -864,10 +864,12 @@ extern "C" int gui_loadCustomResources(void)
 #endif
 	return 0;
 
+#ifndef TW_OEM_BUILD
 error:
 	LOGERR("An internal error has occurred: unable to load theme.\n");
 	gGuiInitialized = 0;
 	return -1;
+#endif
 }
 
 extern "C" int gui_start(void)
@@ -875,7 +877,7 @@ extern "C" int gui_start(void)
 	return gui_startPage("main", 1, 0);
 }
 
-extern "C" int gui_startPage(const char *page_name, const int allow_commands, int stop_on_page_done)
+extern "C" int gui_startPage(const char *page_name, __attribute__((unused)) const int allow_commands, int stop_on_page_done)
 {
 	if (!gGuiInitialized)
 		return -1;

From 27020944c2472c28b12ceccf676d58c2709af890 Mon Sep 17 00:00:00 2001
From: mauronofrio <poronofrio@gmail.com>
Date: Fri, 10 Jan 2020 16:44:28 +0100
Subject: [PATCH 092/207] Allow Gui File Selector filter to check among more
 extensions

For example now in Install menu we are seeing all files with .zip
extension, after this commit we can see also files with .ZIP extension.
Just add the extension between ";" separator.

Change-Id: I6ddd2a812a182570af3d76711b1e3e13740a466b
---
 gui/Android.mk       |  1 +
 gui/fileselector.cpp | 34 +++++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/gui/Android.mk b/gui/Android.mk
index f08378c3b5..b14b3d8945 100755
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -95,6 +95,7 @@ endif
 
 LOCAL_C_INCLUDES += \
     bionic \
+    system/core/base/include \
     system/core/include \
     system/core/libpixelflinger/include
 
diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp
index fe378c8482..2778f96055 100644
--- a/gui/fileselector.cpp
+++ b/gui/fileselector.cpp
@@ -20,7 +20,15 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <algorithm>
-
+#ifdef __ANDROID_API_M__
+#include <vector>
+#ifdef __ANDROID_API_N__
+#include <android-base/strings.h>
+#else
+#include <base/strings.h>
+#endif
+#else
+#endif
 extern "C" {
 #include "../twcommon.h"
 }
@@ -279,11 +287,31 @@ int GUIFileSelector::GetFileList(const std::string folder)
 			if (mShowNavFolders || (data.fileName != "." && data.fileName != ".."))
 				mFolderList.push_back(data);
 		} else if (data.fileType == DT_REG || data.fileType == DT_LNK || data.fileType == DT_BLK) {
-			if (mExtn.empty() || (data.fileName.length() > mExtn.length() && data.fileName.substr(data.fileName.length() - mExtn.length()) == mExtn)) {
-				if (mExtn == ".ab" && twadbbu::Check_ADB_Backup_File(path))
+#ifdef __ANDROID_API_M__
+			std::vector<std::string> mExtnResults = android::base::Split(mExtn, ";");
+			for (const std::string& mExtnElement : mExtnResults)
+			{
+				std::string mExtnName = android::base::Trim(mExtnElement);
+				if (mExtnName.empty() || (data.fileName.length() > mExtnName.length() && data.fileName.substr(data.fileName.length() - mExtnName.length()) == mExtnName)) {
+					if (mExtnName == ".ab" && twadbbu::Check_ADB_Backup_File(path))
+						mFolderList.push_back(data);
+					else
+						mFileList.push_back(data);
+			}
+#else //On android 5.1 we can't use android::base::Trim and Split so just use the first extension written in the list
+			std::size_t seppos = mExtn.find_first_of(";");
+			std::string mExtnf;
+			if (seppos!=std::string::npos){
+				mExtnf = mExtn.substr(0, seppos);
+			} else {
+			mExtnf = mExtn;
+			}
+			if (mExtnf.empty() || (data.fileName.length() > mExtnf.length() && data.fileName.substr(data.fileName.length() - mExtnf.length()) == mExtnf)) {
+				if (mExtnf == ".ab" && twadbbu::Check_ADB_Backup_File(path))
 					mFolderList.push_back(data);
 				else
 					mFileList.push_back(data);
+#endif
 			}
 		}
 	}

From cf0dffce3413261f149a3565d8f27cb32490ae54 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Mon, 17 Feb 2020 16:44:50 -0500
Subject: [PATCH 093/207] FBE: set TW_IS_FBE based on whether key version path
 exists

- Should not be determined by whether support exists in TWRP
- Set to 0 by default if FBE is not detected

This also prevents the wrappedkey check from running
on FDE devices

Change-Id: I85d1952facdfafdaa1571fc1b11d4b4b7d9ba48e
---
 partition.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/partition.cpp b/partition.cpp
index 78c68db04b..1471bd686d 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -723,10 +723,10 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 
 bool TWPartition::Decrypt_FBE_DE() {
 if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
+		DataManager::SetValue(TW_IS_FBE, 1);
 		LOGINFO("File Based Encryption is present\n");
 #ifdef TW_INCLUDE_FBE
 	Is_FBE = true;
-	DataManager::SetValue(TW_IS_FBE, 1);
 	ExcludeAll(Mount_Point + "/convert_fbe");
 	ExcludeAll(Mount_Point + "/unencrypted");
 	ExcludeAll(Mount_Point + "/misc/vold/user_keys");
@@ -777,6 +777,7 @@ if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 		LOGERR("FBE found but FBE support not present in TWRP\n");
 #endif
 	}
+	DataManager::SetValue(TW_IS_FBE, 0);
 	return false;
 }
 

From 0ff59845f2f8dddedb4cee9a9faf86a6294cce66 Mon Sep 17 00:00:00 2001
From: mauronofrio <poronofrio@gmail.com>
Date: Sat, 26 Oct 2019 19:47:55 +0200
Subject: [PATCH 094/207] Add ozip decryption for Oppo/Realme device

This function will automatically decrypt .ozip file in a .zip and it will
save the .zip in the same folder of the .ozip and with the same name.
After the decryption, the flash will start.

To enable this function you have to set a Boardconfig flag with the
decryption key like i did here:

https://github.com/mauronofrio/android_device_realme_RMX1901/commit/a30625f80a31b9b85e4948fc9f9beeb61d5bcb8a

Original projects:
https://github.com/sabpprook/ozip2zip
https://github.com/bkerler/oppo_ozip_decrypt

Change-Id: Ic93243a565008c442bcf2992069b2801532ac7c1
---
 Android.mk                        |   5 +
 gui/Android.mk                    |   6 +-
 gui/action.cpp                    |  25 +++++
 gui/objects.hpp                   |   1 +
 gui/theme/common/landscape.xml    |   2 +-
 gui/theme/common/languages/en.xml |   2 +
 gui/theme/common/portrait.xml     |   2 +-
 gui/theme/common/watch.xml        |   2 +-
 ozip_decrypt/Android.mk           |  11 +++
 ozip_decrypt/ozip_decrypt.cpp     | 152 ++++++++++++++++++++++++++++++
 prebuilt/Android.mk               |   3 +
 11 files changed, 207 insertions(+), 4 deletions(-)
 create mode 100644 ozip_decrypt/Android.mk
 create mode 100644 ozip_decrypt/ozip_decrypt.cpp

diff --git a/Android.mk b/Android.mk
index ab3bcc82b4..af49367f48 100755
--- a/Android.mk
+++ b/Android.mk
@@ -897,6 +897,11 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0)
     include $(commands_TWRP_local_path)/libmincrypt/Android.mk
 endif
 
+ifneq ($(TW_OZIP_DECRYPT_KEY),)
+    TWRP_REQUIRED_MODULES += ozip_decrypt
+    include $(commands_TWRP_local_path)/ozip_decrypt/Android.mk
+endif
+
 ifeq ($(TW_INCLUDE_CRYPTO), true)
     include $(commands_TWRP_local_path)/crypto/fde/Android.mk
     include $(commands_TWRP_local_path)/crypto/scrypt/Android.mk
diff --git a/gui/Android.mk b/gui/Android.mk
index b14b3d8945..2243ba80b9 100755
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -64,7 +64,11 @@ endif
 ifneq ($(TW_USE_KEY_CODE_TOUCH_SYNC),)
     LOCAL_CFLAGS += -DTW_USE_KEY_CODE_TOUCH_SYNC=$(TW_USE_KEY_CODE_TOUCH_SYNC)
 endif
-
+ifneq ($(TW_OZIP_DECRYPT_KEY),)
+    LOCAL_CFLAGS += -DTW_OZIP_DECRYPT_KEY=\"$(TW_OZIP_DECRYPT_KEY)\"
+else
+    LOCAL_CFLAGS += -DTW_OZIP_DECRYPT_KEY=0
+endif
 ifneq ($(TW_NO_SCREEN_BLANK),)
     LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK
 endif
diff --git a/gui/action.cpp b/gui/action.cpp
index b26d55bb79..caa626d3e1 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1029,6 +1029,17 @@ void GUIAction::reinject_after_flash()
 	}
 }
 
+int GUIAction::ozip_decrypt(string zip_path)
+{
+	if (!TWFunc::Path_Exists("/sbin/ozip_decrypt")) {
+            return 1;
+        }
+    gui_msg("ozip_decrypt_decryption=Starting Ozip Decryption...");
+	TWFunc::Exec_Cmd("ozip_decrypt " + (string)TW_OZIP_DECRYPT_KEY + " '" + zip_path + "'");
+    gui_msg("ozip_decrypt_finish=Ozip Decryption Finished!");
+	return 0;
+}
+
 int GUIAction::flash(std::string arg)
 {
 	int i, ret_val = 0, wipe_cache = 0;
@@ -1039,6 +1050,20 @@ int GUIAction::flash(std::string arg)
 		size_t slashpos = zip_path.find_last_of('/');
 		string zip_filename = (slashpos == string::npos) ? zip_path : zip_path.substr(slashpos + 1);
 		operation_start("Flashing");
+		if((zip_path.substr(zip_path.size() - 4, 4)) == "ozip")
+		{
+			if((ozip_decrypt(zip_path)) != 0)
+			{
+		LOGERR("Unable to find ozip_decrypt!");
+				break;
+			}
+			zip_filename = (zip_filename.substr(0, zip_filename.size() - 4)).append("zip");
+			zip_path = (zip_path.substr(0, zip_path.size() - 4)).append("zip");
+			if (!TWFunc::Path_Exists(zip_path)) {
+				LOGERR("Unable to find decrypted zip");
+				break;
+			}
+		}
 		DataManager::SetValue("tw_filename", zip_path);
 		DataManager::SetValue("tw_file", zip_filename);
 		DataManager::SetValue(TW_ZIP_INDEX, (i + 1));
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 3f7241831f..24e9d24724 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -288,6 +288,7 @@ class GUIAction : public GUIObject, public ActionObject
 	ThreadType getThreadType(const Action& action);
 	void simulate_progress_bar(void);
 	int flash_zip(std::string filename, int* wipe_cache);
+	int ozip_decrypt(std::string zip_path);
 	void reinject_after_flash();
 	void operation_start(const string operation_name);
 	void operation_end(const int operation_status);
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 7fc9980b00..3d8646c65a 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -310,7 +310,7 @@
 				<condition var1="tw_selectimage" var2="0"/>
 				<placement x="%col2_x_left%" y="%row1a_y%" w="%fileselector_install_width%" h="%fileselector_install_height%"/>
 				<text>%tw_zip_location%</text>
-				<filter extn=".zip" folders="0" files="1"/>
+				<filter extn=".zip;.ozip;.ZIP;.OZIP" folders="0" files="1"/>
 				<path name="tw_zip_location" default="/sdcard"/>
 				<data name="tw_filename"/>
 				<selection name="tw_file"/>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 47ab708fb2..fbcf43610b 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -735,5 +735,7 @@
 		<string name="fbe_wipe_msg">WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.</string>
 		<string name="flash_ab_inactive">Flashing A/B zip to inactive slot: {1}</string>
 		<string name="flash_ab_reboot">To flash additional zips, please reboot recovery to switch to the updated slot.</string>
+		<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
+		<string name="ozip_decrypt_finish">Ozip Decryption Finished!</string>
 	</resources>
 </language>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index a14fc43387..4b8cd4ad14 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -267,7 +267,7 @@
 				<condition var1="tw_selectimage" var2="0"/>
 				<placement x="%indent%" y="%row3_y%" w="%content_width%" h="%fileselector_install_height%"/>
 				<text>%tw_zip_location%</text>
-				<filter extn=".zip" folders="1" files="1"/>
+				<filter extn=".zip;.ozip;.ZIP;.OZIP" folders="1" files="1"/>
 				<path name="tw_zip_location" default="/sdcard"/>
 				<data name="tw_filename"/>
 				<selection name="tw_file"/>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index af6a643993..7b474ddd3b 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -398,7 +398,7 @@
 				<condition var1="tw_selectimage" var2="0"/>
 				<placement x="%indent%" y="%row2_header_y%" w="%content_width%" h="%fileselector_install_height%"/>
 				<text>%tw_zip_location%</text>
-				<filter extn=".zip" folders="1" files="1"/>
+				<filter extn=".zip;.ozip;.ZIP;.OZIP" folders="1" files="1"/>
 				<path name="tw_zip_location" default="/sdcard"/>
 				<data name="tw_filename"/>
 				<selection name="tw_file"/>
diff --git a/ozip_decrypt/Android.mk b/ozip_decrypt/Android.mk
new file mode 100644
index 0000000000..161cae88ce
--- /dev/null
+++ b/ozip_decrypt/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ozip_decrypt
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := ozip_decrypt.cpp
+LOCAL_C_INCLUDES := external/boringssl/src/include
+LOCAL_SHARED_LIBRARIES := libcrypto
+include $(BUILD_EXECUTABLE)
diff --git a/ozip_decrypt/ozip_decrypt.cpp b/ozip_decrypt/ozip_decrypt.cpp
new file mode 100644
index 0000000000..97826ec192
--- /dev/null
+++ b/ozip_decrypt/ozip_decrypt.cpp
@@ -0,0 +1,152 @@
+/*
+	Copyright 2020 Mauronofrio
+
+	This file is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This file is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	GNU General Public License <http://www.gnu.org/licenses/>.
+*/
+
+#include <iostream>
+#include <string.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
+#define _FILE_OFFSET_BITS 64
+//extern "C" __int64 __cdecl _ftelli64(FILE*);
+
+using namespace std;
+typedef std::basic_string<unsigned char> u_string;
+
+int decrypt(unsigned char* ciphertext, int ciphertext_len, unsigned char* key,
+	unsigned char* iv, unsigned char* plaintext)
+{
+	EVP_CIPHER_CTX* ctx;
+	int len;
+	int plaintext_len;
+	ctx = EVP_CIPHER_CTX_new();
+	EVP_DecryptInit_ex(ctx, EVP_aes_128_ecb(), NULL, key, iv);
+	EVP_DecryptUpdate(ctx, plaintext, &len, ciphertext, ciphertext_len);
+	plaintext_len = len;
+	EVP_DecryptFinal_ex(ctx, plaintext + len, &len);
+	plaintext_len += len;
+	EVP_CIPHER_CTX_free(ctx);
+	return plaintext_len;
+}
+
+std::string hexToASCII(string hex)
+{
+	int len = hex.length();
+	std::string newString;
+	for (int i = 0; i < len; i += 2)
+	{
+		string byte = hex.substr(i, 2);
+		char chr = (char)(int)strtol(byte.c_str(), nullptr, 16);
+		newString.push_back(chr);
+	}
+	return newString;
+}
+
+bool testkey(const char* keyf, const char* path) {
+	u_string key = (unsigned char*)(hexToASCII(keyf)).c_str();
+	int data[17];
+	FILE* fps = fopen(path, "rb");
+	fseek(fps, 4176, SEEK_SET);
+	fread(data, sizeof(char), 16, fps);
+	fclose(fps);
+	u_string udata = (unsigned char*)data;
+	EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
+	EVP_CIPHER_CTX_init(ctx);
+	EVP_DecryptInit_ex(ctx, EVP_aes_128_ecb(), NULL, key.c_str(), NULL);
+	EVP_CIPHER_CTX_set_padding(ctx, false);
+	unsigned char buffer[1024], * pointer = buffer;
+	int outlen;
+	EVP_DecryptUpdate(ctx, pointer, &outlen, udata.c_str(), udata.length());
+	pointer += outlen;
+	EVP_DecryptFinal_ex(ctx, pointer, &outlen);
+	pointer += outlen;
+	EVP_CIPHER_CTX_free(ctx);
+	u_string test= u_string(buffer, pointer - buffer);
+	u_string checktest = test.substr(0, 4);
+	if (checktest == ((unsigned char*) "\x50\x4B\x03\x04") || checktest == ((unsigned char*) "\x41\x4E\x44\x52")) {
+		return true;
+	}
+	return false;
+}
+
+int main(int argc, char* argv[])
+{
+
+	if (argc != 3)
+	{
+		printf("Usage: ozipdecrypt key [*.ozip]\n");
+		return 0;
+	}
+	const char* key = argv[1];
+	const char* path = argv[2];
+	FILE* fp = fopen(path, "rb");
+	char magic[13];
+	fgets(magic, sizeof(magic), fp);
+	string temp(path);
+	temp = (temp.substr(0, temp.size() - 5)).append(".zip");
+	const char* destpath= temp.c_str();
+	if (strcmp(magic, "OPPOENCRYPT!") != 0)
+	{
+		printf("This is not an .ozip file!\n");
+		fclose(fp);
+		int rencheck = rename(path, destpath);
+		if (rencheck == 0) {
+			printf("Renamed .ozip file in .zip file\n");
+		}
+		else
+		{
+			printf("Unable to rename .ozip file in .zip file\n");
+		}
+		return 0;
+	}
+	if (testkey(key, path) == false)
+	{
+		printf("Key is not good!\n");
+		fclose(fp);
+		return 0;
+	}
+	else {
+		printf("Key is good!\n");
+	}
+	FILE* fp2 = fopen(destpath, "wb");
+	fseek(fp, 0L, SEEK_END);
+	unsigned long int sizetot = ftello(fp);
+	fseek(fp, 4176, SEEK_SET);
+	int bdata[16384];
+	unsigned long int sizeseek;
+	printf("Decrypting...\n");
+	while (true)
+	{
+		unsigned char data[17];
+		fread(data, sizeof(char), 16, fp);
+		decrypt(data, sizeof(data), (unsigned char*)(hexToASCII(key)).c_str(), NULL, data);
+		fwrite(data, sizeof(char), 16, fp2);
+		sizeseek = ftello(fp);
+		if ((sizetot - sizeseek) <= 16384) {
+			fread(bdata, sizeof(char), (sizetot - sizeseek), fp);
+			fwrite(bdata, sizeof(char), (sizetot - sizeseek), fp2);
+			break;
+		}
+		else
+		{
+			fread(bdata, sizeof(char), 16384, fp);
+			fwrite(bdata, sizeof(char), 16384, fp2);
+		}
+	}
+	printf("File succesfully decrypted, saved in %s\n", destpath);
+	fclose(fp2);
+	fclose(fp);
+	return 0;
+}
+
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 29351136ce..a4f6f2e4bf 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -59,6 +59,9 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mke2fs
 RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/tune2fs
 RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/resize2fs
 RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/simg2img
+ifneq ($(TW_OZIP_DECRYPT_KEY),)
+    RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/ozip_decrypt
+endif
 ifneq ($(TARGET_ARCH), x86_64)
     RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker
 endif

From 2df249017d7d0ef4f435c597c7901e8ede576eb7 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Fri, 19 Jun 2020 15:31:31 -0400
Subject: [PATCH 095/207] Is_Data_Wiped: simplify function signature

Change-Id: If724d38639cffe1f1ff5658503ed31ffd1ef72e8
---
 twrp-functions.cpp | 7 ++++---
 twrp-functions.hpp | 2 +-
 twrp.cpp           | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 7673795c5c..d3d1be22d9 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -640,7 +640,7 @@ void TWFunc::Update_Intent_File(string Intent) {
 int TWFunc::tw_reboot(RebootCommand command)
 {
 	DataManager::Flush();
-	if (!Is_Data_Wiped("/data"))
+	if (!Is_Data_Wiped())
 		Update_Log_File();
 
 	// Always force a sync before we reboot
@@ -1366,9 +1366,10 @@ bool TWFunc::Set_Encryption_Policy(std::string path, const ext4_encryption_polic
 	return true;
 }
 
-bool TWFunc::Is_Data_Wiped(std::string path) {
+bool TWFunc::Is_Data_Wiped() {
+	std::string data_path = "/data";
 #ifdef TW_INCLUDE_FBE
-	DIR* d = opendir(path.c_str());
+	DIR* d = opendir(data_path.c_str());
 	size_t file_count = 0;
 	if (d != NULL) {
 		struct dirent* de;
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index fa666456c1..8e7005e491 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -122,7 +122,7 @@ class TWFunc
 	static int Property_Override(string Prop_Name, string Prop_Value); // Override properties (including ro. properties)
 	static bool Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path); // return encryption policy for path
 	static bool Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy); // set encryption policy for path
-	static bool Is_Data_Wiped(std::string path); // check if directory has been wiped
+	static bool Is_Data_Wiped(); // check if directory has been wiped
 
 private:
 	static void Copy_Log(string Source, string Destination);
diff --git a/twrp.cpp b/twrp.cpp
index 37053d29a8..1e3f86086c 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -404,7 +404,7 @@ int main(int argc, char **argv) {
 	// Reboot
 	TWFunc::Update_Intent_File(Send_Intent);
 	delete adb_bu_fifo;
-	if (!TWFunc::Is_Data_Wiped("/data"))
+	if (!TWFunc::Is_Data_Wiped())
 		TWFunc::Update_Log_File();
 	gui_msg(Msg("rebooting=Rebooting..."));
 	string Reboot_Arg;

From 349ea555f647d4aed31a87e03203d6f13d4d88ee Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Fri, 19 Jun 2020 16:07:38 -0400
Subject: [PATCH 096/207] log storage: change AB device log storage to
 /data/recovery

This patchset is now exlcuding /data/cache from backup, and removing it
from the wipe exclusion list to prevent errors on restore and wiping
/data.

This patchset changes the directory from /data/cache to /data/recovery for TWRP
to store logs and other file information. This will help with AB
devices that don't want recovery to mess with /data/cache.

This patchset will make ORS use /data/cache for AB devices.

Remove policy code because we don't need to set a policy for the
recovery directory.

Change-Id: Ib06bf7c1e04259bff1e20db70f843371902e62fc
---
 data.cpp                          | 22 ++++++------
 gui/action.cpp                    |  2 +-
 gui/theme/common/languages/en.xml |  1 -
 openrecoveryscript.cpp            | 17 +++++++---
 partition.cpp                     | 49 +++++++--------------------
 partitionmanager.cpp              | 16 ++++-----
 partitions.hpp                    |  2 +-
 twrp-functions.cpp                | 56 +++++++++----------------------
 twrp-functions.hpp                |  9 +++--
 twrp.cpp                          |  7 ++--
 10 files changed, 71 insertions(+), 110 deletions(-)
 mode change 100644 => 100755 gui/action.cpp

diff --git a/data.cpp b/data.cpp
index 618fc3c7a3..bf6e33bc30 100755
--- a/data.cpp
+++ b/data.cpp
@@ -1088,30 +1088,30 @@ void DataManager::Output_Version(void)
 	string Path;
 	char version[255];
 
-	std::string cacheDir = TWFunc::get_cache_dir();
-	if (cacheDir.empty()) {
+	std::string logDir = TWFunc::get_log_dir();
+	if (logDir.empty()) {
 		LOGINFO("Unable to find cache directory\n");
 		return;
 	}
 
-	std::string recoveryCacheDir = cacheDir + "recovery/";
+	std::string recoveryLogDir = logDir + "recovery/";
 
-	if (cacheDir == NON_AB_CACHE_DIR) {
-		if (!PartitionManager.Mount_By_Path(NON_AB_CACHE_DIR, false)) {
+	if (logDir == CACHE_LOGS_DIR) {
+		if (!PartitionManager.Mount_By_Path(CACHE_LOGS_DIR, false)) {
 			LOGINFO("Unable to mount '%s' to write version number.\n", Path.c_str());
 			return;
 		}
 
-		if (!TWFunc::Path_Exists(recoveryCacheDir)) {
-			LOGINFO("Recreating %s folder.\n", recoveryCacheDir.c_str());
-			if (!TWFunc::Create_Dir_Recursive(recoveryCacheDir.c_str(), S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP, 0, 0)) {
-				LOGERR("DataManager::Output_Version -- Unable to make %s: %s\n", recoveryCacheDir.c_str(), strerror(errno));
+		if (!TWFunc::Path_Exists(recoveryLogDir)) {
+			LOGINFO("Recreating %s folder.\n", recoveryLogDir.c_str());
+			if (!TWFunc::Create_Dir_Recursive(recoveryLogDir.c_str(), S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP, 0, 0)) {
+				LOGERR("DataManager::Output_Version -- Unable to make %s: %s\n", recoveryLogDir.c_str(), strerror(errno));
 				return;
 			}
 		}
 	}
 
-	std::string verPath = recoveryCacheDir + ".version";
+	std::string verPath = recoveryLogDir + ".version";
 	if (TWFunc::Path_Exists(verPath)) {
 		unlink(verPath.c_str());
 	}
@@ -1123,7 +1123,7 @@ void DataManager::Output_Version(void)
 	strcpy(version, TW_VERSION_STR);
 	fwrite(version, sizeof(version[0]), strlen(version) / sizeof(version[0]), fp);
 	fclose(fp);
-	TWFunc::copy_file("/etc/recovery.fstab", recoveryCacheDir + "recovery.fstab", 0644);
+	TWFunc::copy_file("/etc/recovery.fstab", recoveryLogDir + "recovery.fstab", 0644);
 	PartitionManager.Output_Storage_Fstab();
 	sync();
 	LOGINFO("Version number saved to '%s'\n", verPath.c_str());
diff --git a/gui/action.cpp b/gui/action.cpp
old mode 100644
new mode 100755
index caa626d3e1..bccf269a26
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -500,7 +500,7 @@ void GUIAction::operation_start(const string operation_name)
 	DataManager::SetValue("tw_operation", operation_name);
 	DataManager::SetValue("tw_operation_state", 0);
 	DataManager::SetValue("tw_operation_status", 0);
-	bool tw_ab_device = TWFunc::get_cache_dir() != NON_AB_CACHE_DIR;
+	bool tw_ab_device = TWFunc::get_log_dir() != CACHE_LOGS_DIR;
 	DataManager::SetValue("tw_ab_device", tw_ab_device);
 }
 
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index fbcf43610b..e1e36f2d86 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -732,7 +732,6 @@
 		<string name="unmount_sys_install">Unmount System before installing a ZIP</string>
 		<string name="unmount_system">Unmounting System...</string>
 		<string name="unmount_system_err">Failed unmounting System</string>
-		<string name="fbe_wipe_msg">WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.</string>
 		<string name="flash_ab_inactive">Flashing A/B zip to inactive slot: {1}</string>
 		<string name="flash_ab_reboot">To flash additional zips, please reboot recovery to switch to the updated slot.</string>
 		<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index ad14bc22c6..5712538569 100755
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -62,10 +62,16 @@ OpenRecoveryScript::VoidFunction OpenRecoveryScript::call_after_cli_command;
 #define SCRIPT_COMMAND_SIZE 512
 
 int OpenRecoveryScript::check_for_script_file(void) {
-	std::string orsFile = TWFunc::get_cache_dir() + "/recovery/openrecoveryscript";
+	std::string logDir = TWFunc::get_log_dir();
+	std::string orsFile;
+	if (logDir == DATA_LOGS_DIR)
+		orsFile = "/data/cache";
+	else
+		orsFile = logDir;
+	orsFile += "/recovery/openrecoveryscript";
 	if (!PartitionManager.Mount_By_Path(orsFile, false)) {
-		LOGINFO("Unable to mount %s for OpenRecoveryScript support.\n", TWFunc::get_cache_dir().c_str());
-		gui_msg(Msg(msg::kError, "unable_to_mount=Unable to mount {1}")(TWFunc::get_cache_dir()));
+		LOGINFO("Unable to mount %s for OpenRecoveryScript support.\n", logDir.c_str());
+		gui_msg(Msg(msg::kError, "unable_to_mount=Unable to mount {1}")(logDir.c_str()));
 		return 0;
 	}
 	if (TWFunc::Path_Exists(orsFile)) {
@@ -697,7 +703,10 @@ void OpenRecoveryScript::Run_CLI_Command(const char* command) {
 			gui_msg("decrypt_cmd=Attempting to decrypt data partition or user data via command line.");
 			if (PartitionManager.Decrypt_Device(pass, atoi(userid.c_str())) == 0) {
 				// set_page_done = 1;  // done by singleaction_page anyway
-				std::string orsFile = TWFunc::get_cache_dir() + "/openrecoveryscript";
+				std::string logDir = TWFunc::get_log_dir();
+				if (logDir == DATA_LOGS_DIR)
+					logDir = "/data/cache";
+				std::string orsFile = logDir + "/openrecoveryscript";
 				if (TWFunc::Path_Exists(orsFile)) {
 					Run_OpenRecoveryScript_Action();
 				}
diff --git a/partition.cpp b/partition.cpp
index 1471bd686d..9c6a64dc81 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -740,7 +740,6 @@ if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 	ExcludeAll(Mount_Point + "/system_de/0/spblob");  // contains data needed to decrypt pixel 2
 	ExcludeAll(Mount_Point + "/system/users/0/gatekeeper.password.key");
 	ExcludeAll(Mount_Point + "/system/users/0/gatekeeper.pattern.key");
-	ExcludeAll(Mount_Point + "/cache");
 	int retry_count = 3;
 	while (!Decrypt_DE() && --retry_count)
 		usleep(2000);
@@ -1181,6 +1180,7 @@ void TWPartition::Setup_Data_Media() {
 		DataManager::SetValue("tw_has_data_media", 1);
 		backup_exclusions.add_absolute_dir("/data/data/com.google.android.music/files");
 		backup_exclusions.add_absolute_dir("/data/per_boot"); // DJ9,14Jan2020 - exclude this dir to prevent "error 255" on AOSP ROMs that create and lock it
+		backup_exclusions.add_absolute_dir("/data/cache");
 		wipe_exclusions.add_absolute_dir(Mount_Point + "/misc/vold"); // adopted storage keys
 		ExcludeAll(Mount_Point + "/.layout_version");
 		ExcludeAll(Mount_Point + "/system/storage.xml");
@@ -1651,11 +1651,6 @@ bool TWPartition::Wipe(string New_File_System) {
 	bool wiped = false, update_crypt = false, recreate_media = true;
 	int check;
 	string Layout_Filename = Mount_Point + "/.layout_version";
-	ext4_encryption_policy policy;
-
-	if (Mount_Point == "/data" && TWFunc::get_cache_dir() == AB_CACHE_DIR && Is_Decrypted) {
-		TWFunc::Get_Encryption_Policy(policy, AB_CACHE_DIR);
-	}
 
 	if (!Can_Be_Wiped) {
 		gui_msg(Msg(msg::kError, "cannot_wipe=Partition {1} cannot be wiped.")(Display_Name));
@@ -1672,10 +1667,10 @@ bool TWPartition::Wipe(string New_File_System) {
 
 	if (Has_Data_Media && Current_File_System == New_File_System) {
 		wiped = Wipe_Data_Without_Wiping_Media();
-		if (Mount_Point == "/data" && TWFunc::get_cache_dir() == AB_CACHE_DIR) {
-			bool created = Recreate_AB_Cache_Dir(policy);
-			if (created)
-				gui_msg(Msg(msg::kWarning, "fbe_wipe_msg=WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.")(TWFunc::get_cache_dir()));
+		if (Mount_Point == "/data" && TWFunc::get_log_dir() == DATA_LOGS_DIR) {
+			bool created = Recreate_Logs_Dir();
+			if (!created)
+				LOGERR("Unable to create log directory for TWRP\n");
 		}
 		recreate_media = false;
 	} else {
@@ -2040,10 +2035,7 @@ bool TWPartition::Wipe_Encryption() {
 		}
 		DataManager::SetValue(TW_IS_ENCRYPTED, 0);
 #ifndef TW_OEM_BUILD
-		if (Is_FBE)
-			gui_msg(Msg(msg::kWarning, "fbe_wipe_msg=WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.")(TWFunc::get_cache_dir()));
-		else
-			gui_msg("format_data_msg=You may need to reboot recovery to be able to use /data again.");
+		gui_msg("format_data_msg=You may need to reboot recovery to be able to use /data again.");
 #endif
 		ret = true;
 		if (!Key_Directory.empty())
@@ -2473,7 +2465,7 @@ bool TWPartition::Wipe_Data_Without_Wiping_Media() {
 #endif // ifdef TW_OEM_BUILD
 }
 
-bool TWPartition::Recreate_AB_Cache_Dir(const ext4_encryption_policy &policy) {
+bool TWPartition::Recreate_Logs_Dir() {
 #ifdef TW_INCLUDE_FBE
 	struct passwd pd;
 	struct passwd *pwdptr = &pd;
@@ -2496,30 +2488,15 @@ bool TWPartition::Recreate_AB_Cache_Dir(const ext4_encryption_policy &policy) {
 		} else {
 			uid = pd.pw_uid;
 			gid = grp.gr_gid;
+			std::string abLogsRecoveryDir(DATA_LOGS_DIR);
+			abLogsRecoveryDir += "/recovery/";
 
-			if (!TWFunc::Create_Dir_Recursive(AB_CACHE_DIR, S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP, uid, gid)) {
-				LOGERR("Unable to recreate %s\n", AB_CACHE_DIR);
-				return false;
-			}
-			if (setfilecon(AB_CACHE_DIR, "u:object_r:cache_file:s0") != 0) {	
-				LOGERR("Unable to set contexts for %s\n", AB_CACHE_DIR);
+			if (!TWFunc::Create_Dir_Recursive(abLogsRecoveryDir, S_IRWXU | S_IRWXG | S_IWGRP | S_IXGRP, uid, gid)) {
+				LOGERR("Unable to recreate %s\n", abLogsRecoveryDir.c_str());
 				return false;
 			}
-			char policy_hex[EXT4_KEY_DESCRIPTOR_SIZE_HEX];
-			policy_to_hex(policy.master_key_descriptor, policy_hex);
-			LOGINFO("setting policy for %s: %s\n", policy_hex, AB_CACHE_DIR);
-			if (sizeof(policy.master_key_descriptor) > 0) {
-				if (!TWFunc::Set_Encryption_Policy(AB_CACHE_DIR, policy)) {
-					LOGERR("Unable to set encryption policy for %s\n", AB_CACHE_DIR);
-					LOGINFO("Removing %s\n", AB_CACHE_DIR);
-					int ret = TWFunc::removeDir(AB_CACHE_DIR, true);
-					if (ret == -1) {
-						LOGERR("Unable to remove %s\n", AB_CACHE_DIR);
-					}
-					return false;
-				}
-			} else {
-				LOGERR("Not setting empty policy to %s\n", AB_CACHE_DIR);
+			if (setfilecon(abLogsRecoveryDir.c_str(), "u:object_r:cache_file:s0") != 0) {
+				LOGERR("Unable to set contexts for %s\n", abLogsRecoveryDir.c_str());
 				return false;
 			}
 		}
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index d5dc9fe289..e4f84967f8 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1402,10 +1402,10 @@ int TWPartitionManager::Wipe_Dalvik_Cache(void) {
 
 	dir.push_back("/data/dalvik-cache");
 
-	std::string cacheDir = TWFunc::get_cache_dir();
-	if (cacheDir == NON_AB_CACHE_DIR) {
-		if (!PartitionManager.Mount_By_Path(NON_AB_CACHE_DIR, false)) {
-			LOGINFO("Unable to mount %s for wiping cache.\n", NON_AB_CACHE_DIR);
+	std::string cacheDir = TWFunc::get_log_dir();
+	if (cacheDir == CACHE_LOGS_DIR) {
+		if (!PartitionManager.Mount_By_Path(CACHE_LOGS_DIR, false)) {
+			LOGINFO("Unable to mount %s for wiping cache.\n", CACHE_LOGS_DIR);
 		}
 		dir.push_back(cacheDir + "dalvik-cache");
 		dir.push_back(cacheDir + "/dc");
@@ -1420,7 +1420,7 @@ int TWPartitionManager::Wipe_Dalvik_Cache(void) {
 		}
 	}
 
-	if (cacheDir == NON_AB_CACHE_DIR) {
+	if (cacheDir == CACHE_LOGS_DIR) {
 		gui_msg("wiping_cache_dalvik=Wiping Dalvik Cache Directories...");
 	} else {
 		gui_msg("wiping_dalvik=Wiping Dalvik Directory...");
@@ -1432,7 +1432,7 @@ int TWPartitionManager::Wipe_Dalvik_Cache(void) {
 		}
 	}
 
-	if (cacheDir == NON_AB_CACHE_DIR) {
+	if (cacheDir == CACHE_LOGS_DIR) {
 		gui_msg("cache_dalvik_done=-- Dalvik Cache Directories Wipe Complete!");
 	} else {
 		gui_msg("dalvik_done=-- Dalvik Directory Wipe Complete!");
@@ -2410,14 +2410,14 @@ void TWPartitionManager::Output_Storage_Fstab(void) {
 	std::vector<TWPartition*>::iterator iter;
 	char storage_partition[255];
 	std::string Temp;
-	std::string cacheDir = TWFunc::get_cache_dir();
+	std::string cacheDir = TWFunc::get_log_dir();
 
 	if (cacheDir.empty()) {
 		LOGINFO("Unable to find cache directory\n");
 		return;
 	}
 
-	std::string storageFstab = TWFunc::get_cache_dir() + "recovery/storage.fstab";
+	std::string storageFstab = TWFunc::get_log_dir() + "recovery/storage.fstab";
 	FILE *fp = fopen(storageFstab.c_str(), "w");
 
 	if (fp == NULL) {
diff --git a/partitions.hpp b/partitions.hpp
index 424e7ddeae..6b9f37531c 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -208,7 +208,7 @@ class TWPartition
 	bool Wipe_NTFS();                                                         // Uses mkntfs to wipe
 	bool Wipe_Data_Without_Wiping_Media();                                    // Uses rm -rf to wipe but does not wipe /data/media
 	bool Wipe_Data_Without_Wiping_Media_Func(const string& parent);           // Uses rm -rf to wipe but does not wipe /data/media
-	bool Recreate_AB_Cache_Dir(const ext4_encryption_policy &policy);				  // Recreate AB_CACHE_DIR after wipe
+	bool Recreate_Logs_Dir();                                                 // Recreate TWRP_AB_LOGS_DIR after wipe
 	void Wipe_Crypto_Key();                                                   // Wipe crypto key from either footer or block device
 	bool Backup_Tar(PartitionSettings *part_settings, pid_t *tar_fork_pid);   // Backs up using tar for file systems
 	bool Backup_Image(PartitionSettings *part_settings);                      // Backs up using raw read/write for emmc memory types
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index d3d1be22d9..ae1d133416 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -584,11 +584,11 @@ void TWFunc::Copy_Log(string Source, string Destination) {
 }
 
 void TWFunc::Update_Log_File(void) {
-	std::string recoveryDir = get_cache_dir() + "recovery/";
+	std::string recoveryDir = get_log_dir() + "recovery/";
 
-	if (get_cache_dir() == NON_AB_CACHE_DIR) {
-		if (!PartitionManager.Mount_By_Path(NON_AB_CACHE_DIR, false)) {
-			LOGINFO("Failed to mount %s for TWFunc::Update_Log_File\n", NON_AB_CACHE_DIR);
+	if (get_log_dir() == CACHE_LOGS_DIR) {
+		if (!PartitionManager.Mount_By_Path(CACHE_LOGS_DIR, false)) {
+			LOGINFO("Failed to mount %s for TWFunc::Update_Log_File\n", CACHE_LOGS_DIR);
 		}
 	}
 
@@ -620,7 +620,7 @@ void TWFunc::Update_Log_File(void) {
 		}
 	}
 
-	if (get_cache_dir() == NON_AB_CACHE_DIR) {
+	if (get_log_dir() == CACHE_LOGS_DIR) {
 		if (PartitionManager.Mount_By_Path("/cache", false)) {
 			if (unlink("/cache/recovery/command") && errno != ENOENT) {
 				LOGINFO("Can't unlink %s\n", "/cache/recovery/command");
@@ -640,8 +640,7 @@ void TWFunc::Update_Intent_File(string Intent) {
 int TWFunc::tw_reboot(RebootCommand command)
 {
 	DataManager::Flush();
-	if (!Is_Data_Wiped())
-		Update_Log_File();
+	Update_Log_File();
 
 	// Always force a sync before we reboot
 	sync();
@@ -1248,20 +1247,20 @@ int TWFunc::stream_adb_backup(string &Restore_Name) {
 	return ret;
 }
 
-std::string TWFunc::get_cache_dir() {
-	if (PartitionManager.Find_Partition_By_Path(NON_AB_CACHE_DIR) == NULL) {
-		if (PartitionManager.Find_Partition_By_Path(AB_CACHE_DIR) == NULL) {
-			if (PartitionManager.Find_Partition_By_Path(PERSIST_CACHE_DIR) == NULL) {
+std::string TWFunc::get_log_dir() {
+	if (PartitionManager.Find_Partition_By_Path(CACHE_LOGS_DIR) == NULL) {
+		if (PartitionManager.Find_Partition_By_Path(DATA_LOGS_DIR) == NULL) {
+			if (PartitionManager.Find_Partition_By_Path(PERSIST_LOGS_DIR) == NULL) {
 				LOGINFO("Unable to find a directory to store TWRP logs.");
 				return "";
 			}
-			return PERSIST_CACHE_DIR;
+			return PERSIST_LOGS_DIR;
 		} else {
-			return AB_CACHE_DIR;
+			return DATA_LOGS_DIR;
 		}
 	}
 	else {
-		return NON_AB_CACHE_DIR;
+		return CACHE_LOGS_DIR;
 	}
 }
 
@@ -1284,12 +1283,12 @@ void TWFunc::check_selinux_support() {
 		printf("SELinux contexts loaded from /file_contexts\n");
 	{ // Check to ensure SELinux can be supported by the kernel
 		char *contexts = NULL;
-		std::string cacheDir = TWFunc::get_cache_dir();
+		std::string cacheDir = TWFunc::get_log_dir();
 		std::string se_context_check = cacheDir + "recovery/";
 		int ret = 0;
 
-		if (cacheDir == NON_AB_CACHE_DIR) {
-			PartitionManager.Mount_By_Path(NON_AB_CACHE_DIR, false);
+		if (cacheDir == CACHE_LOGS_DIR) {
+			PartitionManager.Mount_By_Path(CACHE_LOGS_DIR, false);
 		}
 		if (TWFunc::Path_Exists(se_context_check)) {
 			ret = lgetfilecon(se_context_check.c_str(), &contexts);
@@ -1365,27 +1364,4 @@ bool TWFunc::Set_Encryption_Policy(std::string path, const ext4_encryption_polic
 #endif
 	return true;
 }
-
-bool TWFunc::Is_Data_Wiped() {
-	std::string data_path = "/data";
-#ifdef TW_INCLUDE_FBE
-	DIR* d = opendir(data_path.c_str());
-	size_t file_count = 0;
-	if (d != NULL) {
-		struct dirent* de;
-		while ((de = readdir(d)) != NULL) {
-			if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
-				continue;
-			if (strncmp(de->d_name, "lost+found", 10) == 0 || strncmp(de->d_name, "media", 5) == 0)
-				continue;
-			file_count++;
-
-		}
-		closedir(d);
-	}
-	return file_count == 0;
-#else
-	return true;
-#endif
-}
 #endif // ndef BUILD_TWRPTAR_MAIN
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 8e7005e491..9715d780e7 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -36,9 +36,9 @@
 
 using namespace std;
 
-#define NON_AB_CACHE_DIR "/cache/"
-#define AB_CACHE_DIR "/data/cache/"
-#define PERSIST_CACHE_DIR "/persist/cache/"
+#define CACHE_LOGS_DIR "/cache/"		// For devices with a dedicated cache partition
+#define DATA_LOGS_DIR "/data/"			// For devices that do not have a dedicated cache partition
+#define PERSIST_LOGS_DIR "/persist/"	// For devices with neither cache or dedicated data partition
 
 typedef enum
 {
@@ -116,13 +116,12 @@ class TWFunc
 	static void copy_kernel_log(string curr_storage); // Copy Kernel Log to Current Storage (PSTORE/KMSG)
 	static bool isNumber(string strtocheck); // return true if number, false if not a number
 	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 std::string get_log_dir(); // return recovery log storage directory
 	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
 	static int Property_Override(string Prop_Name, string Prop_Value); // Override properties (including ro. properties)
 	static bool Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path); // return encryption policy for path
 	static bool Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy); // set encryption policy for path
-	static bool Is_Data_Wiped(); // check if directory has been wiped
 
 private:
 	static void Copy_Log(string Source, string Destination);
diff --git a/twrp.cpp b/twrp.cpp
index 1e3f86086c..f7ad7cb15a 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -333,7 +333,9 @@ int main(int argc, char **argv) {
 	GUIConsole::Translate_Now();
 
 	// Run any outstanding OpenRecoveryScript
-	std::string cacheDir = TWFunc::get_cache_dir();
+	std::string cacheDir = TWFunc::get_log_dir();
+	if (cacheDir == DATA_LOGS_DIR)
+		cacheDir = "/data/cache";
 	std::string orsFile = cacheDir + "/recovery/openrecoveryscript";
 
 	if (TWFunc::Path_Exists(SCRIPT_FILE_TMP) ||
@@ -404,8 +406,7 @@ int main(int argc, char **argv) {
 	// Reboot
 	TWFunc::Update_Intent_File(Send_Intent);
 	delete adb_bu_fifo;
-	if (!TWFunc::Is_Data_Wiped())
-		TWFunc::Update_Log_File();
+	TWFunc::Update_Log_File();
 	gui_msg(Msg("rebooting=Rebooting..."));
 	string Reboot_Arg;
 	DataManager::GetValue("tw_reboot_arg", Reboot_Arg);

From c6e2cfecce019d70ed5de74611761a2546e34828 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Fri, 26 Jun 2020 16:14:32 -0400
Subject: [PATCH 097/207] minuitwrp ev_init: delay start if specified in board

This setting in the board will help if it takes longer
for the touchscreen driver to initialize.

Use TW_DELAY_TOUCH_INIT_MS := nnnn where nnnn is in MS.

Change-Id: I0a5c602edfe1214d64adadc980921a7bc0aa2bc5
---
 gui/Android.mk | 4 ++++
 gui/gui.cpp    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/gui/Android.mk b/gui/Android.mk
index 2243ba80b9..b9ff2666c1 100755
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -32,6 +32,10 @@ LOCAL_SRC_FILES := \
     terminal.cpp \
     twmsg.cpp
 
+ifneq ($(TW_DELAY_TOUCH_INIT_MS),)
+    LOCAL_CFLAGS += -DTW_DELAY_TOUCH_INIT_MS=$(TW_DELAY_TOUCH_INIT_MS)
+endif
+
 ifneq ($(TWRP_CUSTOM_KEYBOARD),)
     LOCAL_SRC_FILES += $(TWRP_CUSTOM_KEYBOARD)
 else
diff --git a/gui/gui.cpp b/gui/gui.cpp
index cd6fa59734..beed15e568 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -771,6 +771,9 @@ extern "C" int gui_init(void)
 		PageManager::ReleasePackage("splash");
 	}
 
+#ifdef TW_DELAY_TOUCH_INIT_MS
+	usleep(TW_DELAY_TOUCH_INIT_MS);
+#endif
 	ev_init();
 	return 0;
 }

From 4881c9ed7c86989668a0cd46b5b875c8f7bb9bc0 Mon Sep 17 00:00:00 2001
From: R0rt1z2 <rogerortizleal@gmail.com>
Date: Tue, 30 Jun 2020 23:20:49 +0200
Subject: [PATCH 098/207] Update the Spanish translation.

* Fix some typos in some strings.
* Fix various "bad-spellings" in some strings.

Signed-off-by: R0rt1z2 <rogerortizleal@gmail.com>
Change-Id: I38bc8b32a06ed8b1e69103036f3587623ce2f66a
---
 gui/theme/common/languages/es.xml | 214 ++++++++++++++++++++----------
 1 file changed, 144 insertions(+), 70 deletions(-)

diff --git a/gui/theme/common/languages/es.xml b/gui/theme/common/languages/es.xml
index e096e660f6..06ea30e183 100644
--- a/gui/theme/common/languages/es.xml
+++ b/gui/theme/common/languages/es.xml
@@ -61,21 +61,21 @@
 		<string name="install_select_file_hdr">Seleccionar Archivo</string>
 		<string name="file_selector_folders_hdr">Carpetas</string>
 		<string name="select_file_from_storage">Seleccionar Archivo desde %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
-		<string name="adb_sideload_btn">Carga archivo por ADB</string>
+		<string name="adb_sideload_btn">Cargar archivo por ADB</string>
 		<string name="install_hdr">Instalar</string>
 		<string name="select_storage_hdr">Seleccionar Almacenamiento</string>
 		<string name="select_storage_btn">Seleccionar Almacenamiento</string>
 		<string name="queue_hdr">Cola</string>
 		<string name="zip_queue_count">%tw_zip_queue_count% de un máximo de 10 archivos en cola</string>
 		<string name="zip_queue_count_s">Archivo %tw_zip_queue_count% de 10:</string>
-		<string name="zip_warn1">Esta operación podría instalar software</string>
+		<string name="zip_warn1">Esta operación podría instalar un software</string>
 		<string name="zip_warn2">incompatible y dejar tu dispositivo inutilizable.</string>
-		<string name="zip_back_cancel">Pulsa el botón de atrás para cancelar el añadir este zip.</string>
+		<string name="zip_back_cancel">Pulsa el botón de atrás para no añadir este zip.</string>
 		<string name="zip_back_clear">Pulsa el botón de atrás para limpiar la cola.</string>
 		<string name="folder">Carpeta:</string>
 		<string name="file">Archivo:</string>
 		<string name="zip_sig_chk">Verificar la firma del archivo</string>
-		<string name="inject_twrp_chk">Injectar TWRP después de instalar</string>
+		<string name="inject_twrp_chk">Inyectar TWRP después de instalar</string>
 		<string name="install_reboot_chk">Reiniciar después de completar la instalación</string>
 		<string name="options_hdr">Opciones</string>
 		<string name="confirm_flash_hdr">Confirmar el Flasheo</string>
@@ -119,6 +119,7 @@
 		<string name="factory_reset2">(no incluye almacenamiento interno)</string>
 		<string name="factory_reset3">La mayoría de las veces esta es</string>
 		<string name="factory_reset4">la única limpieza que necesitas.</string>
+		<string name="factory_reset5">(no incluye usuarios/bloqueo de pantalla)</string>
 		<string name="factory_resetting">Restablecimiento de Fábrica...</string>
 		<string name="advanced_wipe_hdr">Limpieza Avanzada</string>
 		<string name="advanced_wipe_btn">Limpieza Avanzada</string>
@@ -186,9 +187,9 @@
 		<string name="swipe_change_fs">Desliza para Cambiar</string>
 		<string name="swipe_change_s">   Cambiar</string>
 		<string name="back_btn">Atrás</string>
-		<string name="wipe_enc_btn">Limpiar Encriptación</string>
+		<string name="wipe_enc_btn">Quitar Encriptación</string>
 		<string name="swipe_factory_reset">Desliza para Restablecer de Fábrica</string>
-		<string name="repair_change_btn">Reparar ó Cambiar Sistema de Archivos</string>
+		<string name="repair_change_btn">Reparar o Cambiar Sistema de Archivos</string>
 		<string name="storage_hdr">Almacenamiento: %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
 		<string name="backup_hdr">Copia de Seguridad</string>
 		<string name="backup_confirm_hdr">Confirmar Copia de Seguridad</string>
@@ -200,26 +201,26 @@
 		<string name="enc_disabled">desactivado - establezca una contraseña para activar</string>
 		<string name="enc_enabled">activado</string>
 		<string name="enable_backup_comp_chk">Habilitar compresión</string>
-		<string name="skip_digest_backup_chk" version="2">Saltar generación Digest durante respaldo</string>
-		<string name="disable_backup_space_chk">Desactivar comprobación de Espacio Libre</string>
+		<string name="skip_digest_backup_chk" version="2">Saltar la generación de el Digest durante la copia de seguridad</string>
+		<string name="disable_backup_space_chk" version="2">Desactivar comprobación de Espacio Libre antes de hacer la copia de seguridad</string>
 		<string name="refresh_sizes_btn">Refrescar Tamaños</string>
-		<string name="swipe_backup">Desliza para Respaldar</string>
+		<string name="swipe_backup">Desliza para Crear la Copia de Seguridad</string>
 		<string name="append_date_btn">Ajustar Fecha</string>
 		<string name="backup_name_exists">Ya existe una copia de seguridad con este nombre.</string>
 		<string name="encrypt_backup">Cifrar tú Copia de seguridad?</string>
-		<string name="enter_pass">Introducir tú contraseña:</string>
-		<string name="enter_pass2">Introducir tú contraseña de nuevo:</string>
+		<string name="enter_pass">Introduce tú contraseña:</string>
+		<string name="enter_pass2">Introduce tú contraseña de nuevo:</string>
 		<string name="pass_not_match">Las Contraseñas no coinciden!</string>
 		<string name="partitions">Particiones:</string>
 		<string name="disabled">Desactivado</string>
 		<string name="enabled">Activado</string>
-		<string name="backup_name_hdr">Establecer nombre de copia de seguridad</string>
+		<string name="backup_name_hdr">Establecer nombre de Copia de Seguridad</string>
 		<string name="progress">Progreso:</string>
 		<string name="backup_complete">¡Copia de seguridad completa!</string>
 		<string name="restore_hdr">Restaurar</string>
 		<string name="sel_backup_hdr">Selecciona la Copia de Seguridad</string>
 		<string name="restore_sel_store_hdr">Seleccionar Copia de Seguridad de %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
-		<string name="restore_sel_pack_fs">Selecciona el Paquete para Restaurar:</string>
+		<string name="restore_sel_pack_fs">Selecciona la Copia de Seguridad para Restaurar:</string>
 		<string name="restore_enc_backup_hdr">Copia de Seguridad Cifrada</string>
 		<string name="restore_dec_fail">¡Contraseña incorrecta, inténtelo de nuevo!</string>
 		<string name="del_backup_btn">Eliminar Copia de seguridad</string>
@@ -233,7 +234,7 @@
 		<string name="restore_try_decrypt_s">Intentando Desencriptarla</string>
 		<string name="restore_backup_date">Copia de seguridad creada en %tw_restore_file_date%</string>
 		<string name="restore_sel_part">Selecciona las Particiones para Restaurar:</string>
-		<string name="restore_enable_digest_chk" version="2">Activar Verificación Digest de la copia de seguridad</string>
+		<string name="restore_enable_digest_chk" version="2">Activar la Verificación de el Digest de la Copia de Seguridad</string>
 		<string name="restore_complete">Restauración Completa</string>
 		<string name="swipe_restore">Desliza para Restaurar</string>
 		<string name="swipe_restore_s">   Restaurar</string>
@@ -249,7 +250,7 @@
 		<string name="mount_sel_part">Selecciona las Particiones para Montar:</string>
 		<string name="mount_sys_ro_chk">Montar partición de sistema en modo lectura</string>
 		<string name="mount_sys_ro_s_chk">Montar System RO</string>
-		<string name="decrypt_data_btn">Desencritar Data</string>
+		<string name="decrypt_data_btn">Desencriptar Data</string>
 		<string name="disable_mtp_btn">Desactivar MTP</string>
 		<string name="enable_mtp_btn">Activar MTP</string>
 		<string name="mount_usb_storage_btn">Montar Almacenamiento USB</string>
@@ -265,19 +266,19 @@
 		<string name="rb_download_btn">Descarga</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Apagando...</string>
-		<string name="swipe_power_off">Deslice para Apagar</string>
+		<string name="swipe_power_off">Desliza para Apagar</string>
 		<string name="swipe_power_off_s">Apagar</string>
-		<string name="sys_ro_hdr">Particion de sistema sin modificar</string>
+		<string name="sys_ro_hdr">Partición de sistema sin modificar</string>
 		<string name="sys_ro_keep">Mantener Sitema solo lectura</string>
 		<string name="sys_rop1">TWRP puede dejar sin modificar la partición del sistema</string>
-		<string name="sys_rop2">para que sea más fácil para usted instalar actualizaciones oficiales.</string>
+		<string name="sys_rop2">para que sea más fácil instalar actualizaciones oficiales.</string>
 		<string name="sys_rop3">TWRP será incapaz de impedir que la stock ROM</string>
-		<string name="sys_rop4">sustituya TWRP y no ofrecerá rootear su dispositivo.</string>
-		<string name="sys_rop5">Instalación de zips o la realización de operaciones adb aún puede</string>
+		<string name="sys_rop4">sustituya TWRP y no ofrecerá la opción para rootear su dispositivo.</string>
+		<string name="sys_rop5">La instalación de zips o la realización de operaciones adb aún puede</string>
 		<string name="sys_rop6">modificar la partición del sistema.</string>
-		<string name="sys_rol1">TWRP puede dejar sin modificar la partición del sistema para que sea más fácil para usted instalar actualizaciones oficiales.</string>
-		<string name="sys_rol2">TWRP será incapaz de impedir que la stock ROM sustituya TWRP y no ofrecerá rootear su dispositivo.</string>
-		<string name="sys_rol3">Instalación de zips o la realización de operaciones adb aún puede modificar la partición del sistema.</string>
+		<string name="sys_rol1">TWRP puede dejar sin modificar la partición del sistema para que sea más fácil instalar actualizaciones oficiales.</string>
+		<string name="sys_rol2">TWRP será incapaz de impedir que la stock ROM sustituya TWRP y no ofrecerá la opción para rootear su dispositivo.</string>
+		<string name="sys_rol3">La instalación de zips o la realización de operaciones adb aún puede modificar la partición del sistema.</string>
 		<string name="sys_ro_never_show_chk">No mostrar nunca más esta pantalla durante el inicio</string>
 		<string name="sys_ro_keep_ro_btn">Mantener modo lectura</string>
 		<string name="swipe_allow_mod">Deslice para Permitir Modificaciones</string>
@@ -286,15 +287,15 @@
 		<string name="settings_gen_hdr">General</string>
 		<string name="settings_gen_s_hdr">General</string>
 		<string name="settings_gen_btn">General</string>
-		<string name="use_rmrf_chk">Usar rm -rf en lugar de formateo</string>
+		<string name="use_rmrf_chk">Usar rm -rf en lugar de formatear</string>
 		<string name="use24clock_chk">Usar reloj 24-horas </string>
-		<string name="rev_navbar_chk">Invertir posición de la barra de navegacion</string>
-		<string name="simact_chk">Simulate actions for theme testing</string>
+		<string name="rev_navbar_chk">Invertir la posición de la barra de navegacion</string>
+		<string name="simact_chk">Simular acciones para probar temas</string>
 		<string name="simfail_chk">Simular fallos de acciones</string>
-		<string name="ctr_navbar_rdo">Centrar Botones de la barra de navegacion</string>
+		<string name="ctr_navbar_rdo">Centrar los Botones de la barra de navegacion</string>
 		<string name="lft_navbar_rdo">Diseño de barra de navegación Invertida izquirda</string>
 		<string name="rht_navbar_rdo">Diseño de barra de navegación Invertida derecha</string>
-		<string name="restore_defaults_btn">Restore Defaults</string>
+		<string name="restore_defaults_btn">Restaurar los Valores por Defecto</string>
 		<string name="settings_tz_btn">Zona Horaria</string>
 		<string name="settings_screen_btn">Pantalla</string>
 		<string name="settings_screen_bright_btn">Brillo de Pantalla</string>
@@ -326,7 +327,7 @@
 		<string name="utcp10">(UTC +10) Eastern Australia, Guam</string>
 		<string name="utcp11">(UTC +11) Vladivostok, Solomon Islands</string>
 		<string name="utcp12">(UTC +12) Auckland, Wellington, Fiji</string>
-		<string name="sel_tz_offset">Selecciona Variación (usualmente 0): %tw_time_zone_guioffset%</string>
+		<string name="sel_tz_offset">Selecciona Variación (normalmente 0): %tw_time_zone_guioffset%</string>
 		<string name="tz_offset_none">Ninguno</string>
 		<string name="tz_offset_0">0</string>
 		<string name="tz_offset_15">15</string>
@@ -340,7 +341,7 @@
 		<string name="settings_screen_timeout_hdr">Tiempo de espera de pantalla</string>
 		<string name="enable_timeout_chk">Activar tiempo de espera de pantalla</string>
 		<string name="screen_to_slider">Tiempo de espera de pantalla en segundos:</string>
-		<string name="screen_to_slider_s">Tiempo de espera de pantalla en segundos (0=disabled): %tw_screen_timeout_secs%</string>
+		<string name="screen_to_slider_s">Tiempo de espera de pantalla en segundos (0=desactivado): %tw_screen_timeout_secs%</string>
 		<string name="screen_to_na">Ajustes de tiempo de espera de la pantalla no disponibles</string>
 		<string name="screen_bright_slider">Brillo: %tw_brightness_pct%%</string>
 		<string name="screen_bright_na">Configuración de brillo no diponible</string>
@@ -348,7 +349,7 @@
 		<string name="button_vibration_hdr">Vibración de los Botones</string>
 		<string name="kb_vibration_hdr">Vibración del Teclado</string>
 		<string name="act_vibration_hdr">Vibración de Acciones</string>
-		<string name="button_vibration">Vibración de Botón:</string>
+		<string name="button_vibration">Vibración de los Botones:</string>
 		<string name="kb_vibration">Vibración de Teclado:</string>
 		<string name="act_vibration">Vibración de Acciones:</string>
 		<string name="select_language">Selecciona Idioma:</string>
@@ -356,8 +357,8 @@
 		<string name="set_language_btn">Establecer Idioma</string>
 		<string name="advanced_hdr">Avanzado</string>
 		<string name="copy_log_confirm">Copiar Log a Tarjeta SD?</string>
-		<string name="copying_log">Copiando Log a Tarjeta SD...</string>
-		<string name="copy_log_complete">Copia del Log Completada</string>
+		<string name="copying_log" version="2">Copiando Logs a Tarjeta SD...</string>
+		<string name="copy_log_complete" version="2">Copia de los Logs Completada</string>
 		<string name="fix_context_btn">Reparar Contextos</string>
 		<string name="part_sd_btn">Particionar Tarjeta SD</string>
 		<string name="part_sd_s_btn">Tarjeta SD</string>
@@ -366,14 +367,14 @@
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Recargar Tema</string>
 		<string name="dumlock_btn">HTC Dumlock</string>
-		<string name="inject_twrp_btn">Injectar TWRP</string>
-		<string name="inject_twrp_confirm">Re-Injectar TWRP?</string>
-		<string name="injecting_twrp">Re-Injectando TWRP...</string>
-		<string name="inject_twrp_complete">TWRP Injección Completa</string>
+		<string name="inject_twrp_btn">Inyectar TWRP</string>
+		<string name="inject_twrp_confirm">Re-Inyectar TWRP?</string>
+		<string name="injecting_twrp">Re-Inyectando TWRP...</string>
+		<string name="inject_twrp_complete">TWRP Inyección Completa</string>
 		<string name="swipe_to_confirm">Desliza para Confirmar</string>
 		<string name="part_sd_hdr">Particionar Tarjeta SD</string>
 		<string name="invalid_partsd_sel">Debes seleccionar un dispositivo extraíble</string>
-		<string name="part_sd_lose">Perderá todos los archivos de la tarjeta SD!</string>
+		<string name="part_sd_lose">Se perderán todos los archivos de la tarjeta SD!</string>
 		<string name="part_sd_undo">Esta Acción no se puede Deshacer!</string>
 		<string name="part_sd_ext_sz">Tamaño de EXT:</string>
 		<string name="part_sd_swap_sz">Tamaño de Intercambio:</string>
@@ -382,12 +383,12 @@
 		<string name="file_system">Sistema de Archivos:</string>
 		<string name="swipe_part_sd">Desliza para Particionar</string>
 		<string name="swipe_part_sd_s">Particionar</string>
-		<string name="partitioning_sd">Particionando Tarjeta SD...</string>
-		<string name="partitioning_sd2">Esto puede tomar unos Minutos.</string>
-		<string name="part_sd_complete">Particionar Completado</string>
+		<string name="partitioning_sd">Particionando la Tarjeta SD...</string>
+		<string name="partitioning_sd2">Esto puede tardar unos Minutos.</string>
+		<string name="part_sd_complete">Particionado Completado</string>
 		<string name="dumlock_hdr">HTC Dumlock</string>
 		<string name="dumlock_restore_btn">Restaurar Boot Original</string>
-		<string name="dumlock_restore_confirm">¿Restaurar imagen de boot original?</string>
+		<string name="dumlock_restore_confirm">¿Restaurar la imagen de boot original?</string>
 		<string name="dumlock_restoring">Restaurando boot Original...</string>
 		<string name="dumlock_restore_complete">Restauración del Boot Original Completado</string>
 		<string name="dumlock_reflash_btn">Reflashear Recovery</string>
@@ -401,7 +402,7 @@
 		<string name="swipe_to_unlock">Desliza para Desbloquear</string>
 		<string name="swipe_unlock">   Desbloquear</string>
 		<string name="fm_hdr">Administrador de Archivos </string>
-		<string name="fm_sel_file">Selecciona un Archivo ó Carpeta</string>
+		<string name="fm_sel_file">Selecciona un Archivo o Carpeta</string>
 		<string name="fm_type_folder">Carpeta</string>
 		<string name="fm_type_file">Archivo</string>
 		<string name="fm_choose_act">Elija una Acción</string>
@@ -432,7 +433,7 @@
 		<string name="decrypt_data_failed">Contraseña incorrecta, intente de nuevo!</string>
 		<string name="decrypt_data_failed_pattern">Patrón incorrecto, intentelo de nuevo!</string>
 		<string name="decrypt_data_enter_pattern">Introduzca un patrón.</string>
-		<string name="decrypt_data_trying">Tratando de Desencriptar</string>
+		<string name="decrypt_data_trying">Intentando Desencriptar</string>
 		<string name="term_hdr">Comando de Terminal</string>
 		<string name="term_s_hdr">Terminal</string>
 		<string name="term_kill_btn">MATAR</string>
@@ -449,7 +450,7 @@
 		<string name="fix_contexts_note1">Nota: La fijación de los contextos rara vez es necesaria.</string>
 		<string name="fix_contexts_note2">La fijación de Contextos de SELinux puede causar</string>
 		<string name="fix_contexts_note3">que tú dispositivo no arranque correctamente.</string>
-		<string name="swipe_to_fix_contexts">Desliza para fijar Contextos</string>
+		<string name="swipe_to_fix_contexts">Desliza para fijar los Contextos</string>
 		<string name="swipe_fix_contexts">   Fijar Contextos</string>
 		<string name="fixing_contexts">Fijando Contextos...</string>
 		<string name="fix_contexts_complete">Fijar Contextos Completado</string>
@@ -457,12 +458,12 @@
 		<string name="install_cancel">No instalar</string>
 		<string name="sel_storage_list">Seleccionar Almacenamiento</string>
 		<string name="ok_btn">OK</string>
-		<string name="no_kernel_selinux">Kernel no tiene soporte para la lectura de los contextos de SELinux.</string>
+		<string name="no_kernel_selinux">El Kernel no tiene soporte para la lectura de los contextos de SELinux.</string>
 		<string name="full_selinux">Soporte completo de SELinux está presente.</string>
 		<string name="no_selinux">No hay soporte SELinux (no libselinux).</string>
 		<string name="mtp_enabled">MTP Activado</string>
 		<string name="mtp_crash">MTP falló, no se iniciará MTP en el arranque.</string>
-		<string name="decrypt_success">Datos descifrados exitosamente, nuevo dispositivo de bloque: \'{1}\'</string>
+		<string name="decrypt_success">Datos descifrados correctamente, nuevo dispositivo de bloque: \'{1}\'</string>
 		<string name="unable_to_decrypt">Incapaz de descifrar con la contraseña actual. Quizás necesites realizar un Formateo de Datos.</string>
 		<string name="generating_digest1" version="2">Generando Digest</string>
 		<string name="generating_digest2" version="2"> * Generando Digest...</string>
@@ -478,18 +479,18 @@
 		<string name="available_space"> * Espacio disponible: {1}MB</string>
 		<string name="unable_locate_storage">Incapaz de localizar el dispositivo de almacenamiento.</string>
 		<string name="no_space">No hay suficiente espacio en el almacenamiento.</string>
-		<string name="backup_started">[COPIA DE SEGURIDAD COMENZADA]</string>
+		<string name="backup_started">[COPIA DE SEGURIDAD INICIADA]</string>
 		<string name="backup_folder">Carpeta de copia seguridad establecida en \'{1}\'</string>
 		<string name="fail_backup_folder">Error al crear carpeta de copia de seguridad.</string>
 		<string name="avg_backup_fs">Tasa media de copia de seguridad para sistemas de archivo: {1} MB/seg</string>
 		<string name="avg_backup_img">Tasa media de copia de seguridad para imágenes de unidades: {1} MB/seg</string>
 		<string name="total_backed_size">[{1} MB TOTALES DE COPIA DE SEGURIDAD]</string>
 		<string name="backup_completed">[COPIA DE SEGURIDAD COMPLETADA EN {1} SEGUNDOS	]</string>
-		<string name="restore_started">[RESTAURACIÓN COMENZADA]</string>
+		<string name="restore_started">[RESTAURACIÓN INICIADA]</string>
 		<string name="restore_folder">Restaurar carpeta: \'{1}\'</string>
 		<string name="restore_part_done">[{1} completado ({2} segundos)]</string>
 		<string name="verifying_digest" version="2">Verificando Digest</string>
-		<string name="skip_digest" version="2">Saltando checkeo de Digest basado en ajustes del usuario.</string>
+		<string name="skip_digest" version="2">Saltando la verificación de Digest basado en ajustes del usuario.</string>
 		<string name="calc_restore">Calculando detalles de la restauración...</string>
 		<string name="restore_read_only">No se puede restaurar {1} -- montado en modo leer.</string>
 		<string name="restore_unable_locate">Incapaz de localizar la partición \'{1}\' para la restauración.</string>
@@ -499,7 +500,7 @@
 		<string name="updating_system_details">Actualizando Detalles de Sistema</string>
 		<string name="restore_completed">[RESTAURACIÓN COMPLETADA EN {1} SEGUNDOS]</string>
 		<string name="error_opening_strerr">Error abriendo: \'{1}\' ({2})</string>
-		<string name="unable_locate_part_backup_name">Incapaz de localizar partición con el nombre de copia de seguridad: \'{1}\'</string>
+		<string name="unable_locate_part_backup_name">Incapaz de localizar la partición con el nombre de copia de seguridad: \'{1}\'</string>
 		<string name="unable_find_part_path">Incapaz de encontrar la partición para la dirección \'{1}\'</string>
 		<string name="update_part_details">Actualizando detalles de la partición…</string>
 		<string name="update_part_details_done">…hecho</string>
@@ -514,13 +515,13 @@
 		<string name="unable_to_mount_storage">Incapaz de montar almacenamiento</string>
 		<string name="fail_decrypt">Error al descifrar datos.</string>
 		<string name="no_crypto_support">No hay ningún soporte de cifrado compilado en esta compilación.</string>
-		<string name="decrypt_success_dev">Datos desencriptados satisfactoriamente, nuevo bloque de dispositivo: '{1}'</string>
+		<string name="decrypt_success_dev">Datos desencriptados correctamente, nuevo bloque de dispositivo: '{1}'</string>
 		<string name="done">Hecho.</string>
 		<string name="start_partition_sd">Particionando tarjeta SD...</string>
 		<string name="partition_sd_locate">Incapaz de localizar el dispositivo a particionar.</string>
 		<string name="ext_swap_size">El tamaño de EXT + Swap es más grande que el tamaño de la tarjeta SD.</string>
-		<string name="remove_part_table">Eliminando tabla de partición...</string>
-		<string name="unable_rm_part">Incapaz de eliminar la tabla de partición.</string>
+		<string name="remove_part_table">Eliminando la tabla de particiones...</string>
+		<string name="unable_rm_part">Incapaz de eliminar la tabla de particiones.</string>
 		<string name="create_part">Creando partición {1}...</string>
 		<string name="unable_to_create_part">Incapaz de crear partición {1}.</string>
 		<string name="format_sdext_as">Formateando sd-ext como {1}...</string>
@@ -529,7 +530,7 @@
 		<string name="mtp_already_enabled">MTP ya está habilitado</string>
 		<string name="mtp_fail">Error al activar MTP</string>
 		<string name="no_mtp">Soporte a MTP no incluido</string>
-		<string name="image_flash_start">[FLASHEO DE IMAGEN EMPEZADA]</string>
+		<string name="image_flash_start">[FLASHEO DE IMAGEN EMPEZADO]</string>
 		<string name="img_to_flash">Imagen a flashear: \'{1}\'</string>
 		<string name="flash_unable_locate">Incapaz de localizar la partición \'{1}\' para flashear.</string>
 		<string name="no_part_flash">No se ha seleccionado partición para flashear.</string>
@@ -561,7 +562,7 @@
 		<string name="backing_up">Realizando copia de seguridad {1}...</string>
 		<string name="backing">Realizando copia de seguridad</string>
 		<string name="backup_size">El tamaño del archivo \'{1}\' de la copia seguridad es de 0 bytes.</string>
-		<string name="datamedia_fs_restore">CUIDADO: !Esta copia de seguridad de /data se hizo con el sistema de archivos {1}! La copia de seguridad puede no arrancar a no ser que cambies a {1}.</string>
+		<string name="datamedia_fs_restore">CUIDADO: !Esta copia de seguridad de /data se hizo con el sistema de archivos {1}! La copia de seguridad puede que no arranque a no ser que cambies a {1}.</string>
 		<string name="restoring">Restaurando {1}...</string>
 		<string name="restoring_hdr">Restaurando</string>
 		<string name="recreate_folder_err">Incapaz de recrear la carpeta {1}.</string>
@@ -581,9 +582,9 @@
 		<string name="making_dir1">Creando Directorio</string>
 		<string name="making_dir2">Creando directorio: \'{1}\'</string>
 		<string name="running_command">Corriendo Comando</string>
-		<string name="sideload">Carga lateral de ADB</string>
-		<string name="start_sideload">Empezando carga lateral de ADB...</string>
-		<string name="need_new_adb">Necesitas de adb 1.0.32 o más nuevo para poder realizar la carga lateral en este dispositivo.</string>
+		<string name="sideload">Carga de archivos por ADB</string>
+		<string name="start_sideload">Empezando la carga de archivos por ADB...</string>
+		<string name="need_new_adb">Necesitas de adb 1.0.32 o más nuevo para poder realizar la carga de archivos por ADB en este dispositivo.</string>
 		<string name="no_pwd">No se ha proporcionado contraseña.</string>
 		<string name="done_ors">Procesamiento de comando de archivos hecho</string>
 		<string name="injecttwrp">Inyectando TWRP en imagen boot...</string>
@@ -591,23 +592,23 @@
 		<string name="installing_zip">Instalando archivo zip '{1}'</string>
 		<string name="select_backup_opt">Ajustando opciones de copia de seguridad:</string>
 		<string name="compression_on">La compresión está activada</string>
-		<string name="digest_off" version="2">La generación de Digest está desactivada</string>
+		<string name="digest_off" version="2">La generación de el Digest está desactivada</string>
 		<string name="backup_fail">Copia de seguridad fallida</string>
 		<string name="backup_clean">La copia de seguridad falló. Limpiando carpeta de la copia de seguridad.</string>
-		<string name="running_recovery_commands">Corriendo Comandos de Recovery</string>
+		<string name="running_recovery_commands">Ejecutando Comandos de Recovery</string>
 		<string name="recovery_commands_complete">Comandos de Recovery Completos</string>
-		<string name="running_ors">Corriendo OpenRecoveryScript</string>
+		<string name="running_ors">Ejecutando OpenRecoveryScript</string>
 		<string name="ors_complete">OpenRecoveryScript Completo</string>
 		<string name="no_updater_binary">No fue posible encontrar \'{1}\' en el archivo zip.</string>
-		<string name="check_for_digest" version="2">Buscando archivo Digest...</string>
+		<string name="check_for_digest" version="2">Buscando el archivo Digest...</string>
 		<string name="fail_sysmap">Error al mapear archivo \'{1}\'</string>
 		<string name="verify_zip_sig">Verificando firma de zip…</string>
 		<string name="verify_zip_fail">¡Verificación de firma de Zip fallida!</string>
 		<string name="verify_zip_done">Firma de Zip verificada exitosamente.</string>
 		<string name="zip_corrupt">¡Este archivo Zip es corrupto!</string>
-		<string name="no_digest" version="2">Saltando verificación de Digest: no se ha encontrado archivo Digest</string>
-		<string name="digest_fail" version="2">Digest no coincide</string>
-		<string name="digest_match" version="2">Digest coincide</string>
+		<string name="no_digest" version="2">Saltando la verificación de el Digest: no se ha encontrado archivo Digest</string>
+		<string name="digest_fail" version="2">El Digest no coincide</string>
+		<string name="digest_match" version="2">El Digest coincide</string>
 		<string name="pid_signal">Proceso {1} terminó con señal: {2}</string>
 		<string name="pid_error">Proceso {1} terminó con ERROR: {2}</string>
 		<string name="install_dumlock">Instalando HTC Dumlock en el sistema…</string>
@@ -621,8 +622,8 @@
 		<string name="split_thread">Dividiendo hilo ID {1} en archivo {2}</string>
 		<string name="file_progress">%llu de %llu archivos, %i%%</string>
 		<string name="size_progress">%lluMB de %lluMB, %i%%</string>
-		<string name="decrypt_cmd">Intentando decriptar partición de datos via línea de comandos.</string>
-		<string name="base_pkg_err">Carga de paquetes básicos fallido.</string>
+		<string name="decrypt_cmd" version="2">Intentando desencriptar la partición de datos o los datos de el usuario via línea de comandos.</string>
+		<string name="base_pkg_err">Carga de paquetes básicos fallida.</string>
 		<string name="simulating">Simulando acciones...</string>
 		<string name="backup_cancel">Copia de seguridad cancelada.</string>
 		<string name="config_twrp">Configurando TWRP...</string>
@@ -640,10 +641,83 @@
 		<string name="backup_name_len">El nombre de esta copia de seguridad es demasiado largo.</string>
 		<string name="backup_name_invalid">El nombre de la copia de seguridad \'{1}\' contiene un carácter inválido: \'{1}\'</string>
 		<string name="no_real_sdcard">¡Este dispositivo no tiene una tarjeta SD real! ¡Abortando!</string>
-		<string name="cancel_sideload">Cancelando carga lateral ADB...</string>
+		<string name="cancel_sideload">Cancelando la Carga de Archivos por ADB...</string>
 		<string name="change_fs_err">Error cambiando sistema de archivos.</string>
 		<string name="theme_ver_err">Tema personalizado no coincide con la versión de TWRP. Usando tema stock.</string>
 		<string name="up_a_level">(Subir Un Nivel)</string>
-		<string name="install_reboot">Reiniciando en 5 segundos</string>
+		<string name="install_reboot" version="2">Reiniciando en %tw_sleep% segundos</string>
+		<string name="data_backup">Datos (excl. almacenamiento interno)</string>
+		<string name="autostorage">Almacenamiento Interno</string>
+		<string name="wipe_dalvik_btn">Limpiar Dalvik</string>
+		<string name="wipe_dalvik_confirm">Limpiar Dalvik?</string>
+		<string name="wipe_dalvik_complete">Limpieza de Dalvik Completada</string>
+		<string name="reboot_install_app_hdr">Instalar la Aplicación de TWRP?</string>
+		<string name="reboot_install_app1">Te gustaría instalar la aplicación oficial de TWRP?</string>
+		<string name="reboot_install_app2">La aplicación puede comprobar versiones nuevas de TWRP.</string>
+		<string name="reboot_install_app_prompt_install">Preguntar al usuario si quiere instalar la aplicación de TWRP si no está instalada</string>
+		<string name="reboot_install_app_system">Instalar como Aplicación del Sistema</string>
+		<string name="reboot_installing_app">Instalando la aplicación...</string>
+		<string name="swipe_to_install_app">Desliza para instalar la applicación de TWRP</string>
+		<string name="uninstall_twrp_system_app">Desinstalar la aplicación TWRP del Sistema</string>
+		<string name="uninstall_twrp_system_app_confirm">Desinstalar la aplicación TWRP del Sistema?</string>
+		<string name="uninstalling_twrp_system_app">Desinstalando la aplicación TWRP del Sistema...</string>
+		<string name="uninstall_twrp_system_app_complete">Desinstalación de la aplicación TWRP del Sistema Completada</string>
+		<string name="current_boot_slot">Slot Actual: %tw_active_slot%</string>
+		<string name="boot_slot_a">Slot A</string>
+		<string name="boot_slot_b">Slot B</string>
+		<string name="changing_boot_slot">Cambiando el Boot Slot</string>
+		<string name="changing_boot_slot_complete">Cambio de el Boot Slot Completado</string>
+		<string name="vibration_disabled">La Vibración está desactivada en este dispositivo</string>
+		<string name="decrypt_data_vold_os_missing">Archivos necesarios que faltan para descifrar vold: {1}</string>
+		<string name="install_twrp_ramdisk">Instalar Ramdisk del Recovery</string>
+		<string name="install_kernel">Instalar Kernel</string>
+		<string name="repack_kernel_confirm_hdr">Instalar Kernel</string>
+		<string name="repack_ramdisk_confirm_hdr">Instalar Recovery</string>
+		<string name="repack_kernel_confirm">Instalar Kernel?</string>
+		<string name="repack_ramdisk_confirm">Instalar Recovery?</string>
+		<string name="repack_backup_first">Crear una copia de seguridad de la imagen existente primero</string>
+		<string name="repack">Empaquetado</string>
+		<string name="repack_error">Error al empaquetar la imagen..</string>
+		<string name="repacking_image">Empaquetando {1}...</string>
+		<string name="repack_image_hdr">Selecciona una Imagen</string>
+		<string name="swipe_to_install">Desliza para instalar la applicación de TWRP</string>
+		<string name="installing">Instalando...</string>
+		<string name="install_complete">Instalación Completada</string>
+		<string name="unpack_error">Error al desempaquetar la imagen.</string>
+		<string name="fix_recovery_loop">Arrgelar el Bootlop a Recovery</string>
+		<string name="fix_recovery_loop_confirm">Arrgelar el Bootlop a Recovery?</string>
+		<string name="fixing_recovery_loop">Arrgelando el Bootlop a Recovery...</string>
+		<string name="fix_recovery_loop_complete">Arrgelar el Bootlop a Recovery Completado</string>
+		<string name="fixing_recovery_loop_patch">Parcheando la imagen de arranque...</string>
+		<string name="fix_recovery_loop_patch_error">Error parcheando la imagen de arranque.</string>
+		<string name="cache_dalvik_done">-- Limpieza de los directorios Dalvik Caché Completada!</string>
+		<string name="decrypt_success_nodev">Data successfully decrypted</string>
+		<string name="backup_storage_warning">Las copias de seguridad de {1} no incluyen ningún archivo en el almacenamiento interno, como imágenes o descargas.</string>
+		<string name="invalid_zip_format">Formato de archivo zip no válido!</string>
+		<string name="adbbackup_error">Error con la copia de seguridad de ADB. Cancelando..."</string>
+		<string name="adbbackup_control_error">CNo se puede escribir en el canal de control adb</string>
+		<string name="twrp_adbbu_option">La Opción --twrp es Necesaria para Habilitar los Backups por ADB</string>
+		<string name="partition_not_found">Directorio: {1} no encontrada en la lista de particiones</string>
+		<string name="copy_kernel_log">Se ha copiado el Log de Kernel a {1}</string>
+		<string name="include_kernel_log">Incluye el Log de el Kernel</string>
+		<string name="sha2_chk">Usar SHA2 para hacer hash</string>
+		<string name="unable_set_boot_slot">Error al cambiar el Slot de Arranque del Cargador de Arranque a {1}</string>
+		<string name="unmount_sys_install">Desmontar el Sistema antes de instalar un Zip</string>
+		<string name="unmount_system">Desmontando el Sistema...</string>
+		<string name="unmount_system_err">Fallo al desmontar el Sistema</string>
+		<string name="flash_ab_inactive">Instalando un zip A/B en el slot inactivo: {1}</string>
+		<string name="flash_ab_reboot">Para instalar Zips adicionales, por favor, reinicia al recovery para cambiar al slot actualizado.</string>
+		<string name="ozip_decrypt_decryption">Empezando la Desencriptación Ozip...</string>
+		<string name="ozip_decrypt_finish">Desencriptación Ozip  Completada!</string>
+		<string name="decrypt_users">Desencriptar Usuarios</string>
+		<string name="decrypt_users_selection">Selecciona un ID de usuario a desencriptar</string>
+		<string name="select_user">Seleccionar Usuario</string>
+		<string name="backup_storage_undecrypt_warning">La copia de seguridad no incluye algunos archivos del usuario {1}, porque el usuario no está desencriptado.</string>
+		<string name="decrypting_user_fbe">Intentando desencriptar FBE para el usuario {1}...</string>
+		<string name="decrypt_user_success_fbe">Usuario {1} desencriptado con éxito</string>
+		<string name="decrypt_user_fail_fbe">Error al desencriptar el usuario {1}</string>
+		<string name="decrypt_data_enter_pass_fbe">Ingrese la contraseña para el usuario [%tw_crypto_user_id%]</string>
+		<string name="decrypt_data_enter_pattern_fbe">EIngrese el patrón para el usuario [%tw_crypto_user_id%]</string>
+		<string name="unpacking_image">Desempaquetando {1}...</string>
 	</resources>
 </language>

From 25371a7e1f7f7d690755e3b12140b39567456a98 Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Mon, 15 Jun 2020 00:28:32 +0530
Subject: [PATCH 099/207] Fix up cache wipe issue in A-Only device

 * missed in https://github.com/TeamWin/android_bootable_recovery/commit/3754fabbea2eefeb7c1a0c5bc804f1e14a686855

Change-Id: I8fc3719e7f98c3d9b5fd96a9820b84773d4f5d7d
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 partition.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/partition.cpp b/partition.cpp
index 9c6a64dc81..6f61de32a8 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -1701,6 +1701,9 @@ bool TWPartition::Wipe(string New_File_System) {
 	}
 
 	if (wiped) {
+		if (Mount_Point == "/cache" && TWFunc::get_log_dir() != DATA_LOGS_DIR)
+			DataManager::Output_Version();
+
 		if (TWFunc::Path_Exists("/.layout_version") && Mount(false))
 			TWFunc::copy_file("/.layout_version", Layout_Filename, 0600);
 

From 13b07f8dbe27d85254e0a04f689a9ed6bde7673e Mon Sep 17 00:00:00 2001
From: DarthJabba9 <darthjabba9@gmail.com>
Date: Tue, 4 Aug 2020 10:31:27 +0100
Subject: [PATCH 100/207] Exclude the dumpsys dumps from backups, to avoid
 error 255 when restoring data backups

Change-Id: I7a83b3789828c1400e31007e868263c54d8eb38c
---
 partition.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/partition.cpp b/partition.cpp
index 6f61de32a8..82cb944cb2 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -1180,6 +1180,7 @@ void TWPartition::Setup_Data_Media() {
 		DataManager::SetValue("tw_has_data_media", 1);
 		backup_exclusions.add_absolute_dir("/data/data/com.google.android.music/files");
 		backup_exclusions.add_absolute_dir("/data/per_boot"); // DJ9,14Jan2020 - exclude this dir to prevent "error 255" on AOSP ROMs that create and lock it
+		backup_exclusions.add_absolute_dir("/data/vendor/dumpsys");
 		backup_exclusions.add_absolute_dir("/data/cache");
 		wipe_exclusions.add_absolute_dir(Mount_Point + "/misc/vold"); // adopted storage keys
 		ExcludeAll(Mount_Point + "/.layout_version");

From 6c70991a72820b390185b6de923a3694dce3cf44 Mon Sep 17 00:00:00 2001
From: 4ndyZ <andy@seidl.bayern>
Date: Tue, 11 Aug 2020 17:29:28 +0200
Subject: [PATCH 101/207] lang: Updated German language strings

* Added all missing strings
* Translated some English strings in the German language file
* Changed ZIP notation to "ZIP" to be consistent in the translation

Change-Id: I27812c7f79c95258363772481f71253b8b505e28
---
 gui/theme/common/languages/de.xml | 59 ++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/gui/theme/common/languages/de.xml b/gui/theme/common/languages/de.xml
index 56f7ebd92c..09b5c98c2a 100644
--- a/gui/theme/common/languages/de.xml
+++ b/gui/theme/common/languages/de.xml
@@ -30,6 +30,7 @@
 		<string name="sdext">SD-EXT</string>
 		<string name="adopted_data">Eingegliederte Daten-Partition</string>
 		<string name="adopted_storage">Eingegliederte Storage-Partition</string>
+		<string name="autostorage">Storage-Partition</string>
 
 		<!-- GUI XML strings -->
 		<string name="twrp_header">Team Win Recovery Project</string>
@@ -98,6 +99,7 @@
 		<string name="install_failed">Installation fehlgeschlagen</string>
 		<string name="install_successful">Installation erfolgreich</string>
 		<string name="wipe_cache_dalvik_btn">Cache/Dalvik löschen</string>
+		<string name="wipe_dalvik_btn">Dalvik löschen</string>
 		<string name="reboot_system_btn">System neustarten</string>
 		<string name="install_sel_target">Ziel-Partition auswählen</string>
 		<string name="flash_image_select">Partition wählen, um das Image zu einzuspielen:</string>
@@ -105,8 +107,10 @@
 		<string name="flashing_image">Spiele Image ein...</string>
 		<string name="image_flashed">Image eingespielt</string>
 		<string name="wipe_cache_dalvik_confirm">Cache &amp; Dalvik löschen?</string>
+		<string name="wipe_dalvik_confirm">Dalvik löschen?</string>
 		<string name="wiping_cache_dalvik">Lösche Cache &amp; Dalvik...</string>
 		<string name="wipe_cache_dalvik_complete">Cache &amp; Dalvik gelöscht</string>
+		<string name="wipe_dalvik_complete">Dalvik gelöscht</string>
 		<string name="swipe_wipe">Löschen bestätigen</string>
 		<string name="swipe_wipe_s">Löschen</string>
 		<string name="no_os1">Kein OS installiert! Sind Sie</string>
@@ -122,6 +126,10 @@
 		<string name="reboot_install_app_system">Als System-App installieren</string>
 		<string name="reboot_installing_app">Installiere App...</string>
 		<string name="swipe_to_install_app">TWRP App installieren</string>
+		<string name="uninstall_twrp_system_app">Deinstalliere TWRP App vom System</string>
+		<string name="uninstall_twrp_system_app_confirm">TWRP App vom System deinstallieren?</string>
+		<string name="uninstalling_twrp_system_app">Deinstalliere TWRP App vom System...</string>
+		<string name="uninstall_twrp_system_app_complete">Deinstallationder TWRP App vom System abgeschlossen</string>
 		<string name="swipe_flash">Installation bestätigen</string>
 		<string name="confirm_action">Aktion bestätigen</string>
 		<string name="back_cancel">Zurück-Taste drücken, um den Vorgang abzubrechen.</string>
@@ -133,13 +141,14 @@
 		<string name="factory_reset2">(ohne internen Speicher)</string>
 		<string name="factory_reset3">Diese Lösch-Aktion ist in der Regel</string>
 		<string name="factory_reset4">die einzige die benötigt wird.</string>
+		<string name="factory_reset5">(beinhaltet nicht die Benutzer und den Sperrbildschirm)</string>
 		<string name="factory_resetting">Werkseinstellungen herstellen...</string>
 		<string name="advanced_wipe_hdr">Erweitertes Löschen</string>
 		<string name="advanced_wipe_btn">Erweitertes Löschen</string>
 		<string name="wipe_enc_confirm">Verschlüsselung der Daten-Partition enfernen?</string>
 		<string name="formatting_data">Data wird formatiert...</string>
 		<string name="swipe_format_data">Daten-Partition formatieren</string>
-		<string name="swipe_format_data_s">Formatieren </string>
+		<string name="swipe_format_data_s">Formatieren</string>
 		<string name="factory_reset_complete">Werkseinstellungen wiederhergestellt</string>
 		<string name="sel_part_hdr">Partitionen auswählen</string>
 		<string name="wipe_sel_confirm">Ausgewählte Partition(en) löschen?</string>
@@ -318,6 +327,7 @@
 		<string name="settings_tz_btn">Zeitzone</string>
 		<string name="settings_screen_btn">Bildschirm</string>
 		<string name="settings_screen_bright_btn">Helligkeit</string>
+		<string name="vibration_disabled">Vibration ist auf diesen Gerät ausgeschalten</string>
 		<string name="settings_vibration_btn">Vibration</string>
 		<string name="settings_language_btn">Sprache</string>
 		<string name="time_zone_hdr">Zeitzone</string>
@@ -455,6 +465,7 @@
 		<string name="decrypt_data_failed_pattern">Muster falsch, bitte erneut versuchen!</string>
 		<string name="decrypt_data_enter_pattern">Muster eingeben.</string>
 		<string name="decrypt_data_trying">Versuche Entschlüsselung</string>
+		<string name="decrypt_data_vold_os_missing">Fehlende Dateien für vold Entschlüsselung werden benötigt: {1}</string>
 		<string name="term_hdr">Terminal</string>
 		<string name="term_s_hdr">Terminal</string>
 		<string name="term_kill_btn">BEENDEN</string>
@@ -479,6 +490,37 @@
 		<string name="install_cancel">Nicht installieren</string>
 		<string name="sel_storage_list">Speicher auswählen</string>
 		<string name="ok_btn">OK</string>
+		<string name="install_twrp_ramdisk">Installiere Recovery Ramdisk</string>
+		<string name="install_kernel">Kernel installieren</string>
+		<string name="repack_kernel_confirm_hdr">Kernel installieren</string>
+		<string name="repack_ramdisk_confirm_hdr">Recovery installieren</string>
+		<string name="repack_kernel_confirm">Kernel installieren?</string>
+		<string name="repack_ramdisk_confirm">Recovery installieren?</string>
+		<string name="repack_backup_first">Sichern des existierenden Images zu Beginn</string>
+		<string name="repack">Packen</string>
+		<string name="swipe_to_install">Installieren</string>
+		<string name="installing">Installiere...</string>
+		<string name="install_complete">Installation abgeschlossen</string>
+		<string name="unpack_error">Fehler beim Entpacken des Images.</string>
+		<string name="repack_error">Fehler beim Packen des Images.</string>
+		<string name="unpacking_image">Entpacke {1}...</string>
+		<string name="repacking_image">Packen {1}...</string>
+		<string name="repack_image_hdr">Wähle ein Image</string>
+		<string name="fix_recovery_loop">Recovery Bootloop reparieren</string>
+		<string name="fix_recovery_loop_confirm">Recovery Bootloop reparieren?</string>
+		<string name="fixing_recovery_loop">Recovery Bootloop wird repariert...</string>
+		<string name="fix_recovery_loop_complete">Recovery Bootloop Reparatur abgeschlossen</string>
+		<string name="fixing_recovery_loop_patch">Patche Kernel...</string>
+		<string name="fix_recovery_loop_patch_error">Fehler beim Patchen des Kernels.</string>
+		<string name="decrypt_users">Benutzer entschlüsseln</string>
+		<string name="decrypt_users_selection">Wähle eine Benutzer ID zum entschlüsseln</string>
+		<string name="select_user">Benutzer wählen</string>
+		<string name="backup_storage_undecrypt_warning">Das Backup enthält manche Dateien des Benutzers {1} nicht, da dieser nicht verschlüsselt ist</string>
+		<string name="decrypting_user_fbe">Entschlüsselung des FBE von Benutzer {1}...</string>
+		<string name="decrypt_user_success_fbe">Entschlüsselung des Benutzers {1} erfolgreich</string>
+		<string name="decrypt_user_fail_fbe">Entschlüsselung des Benutzers {1} fehlgeschlagen</string>
+		<string name="decrypt_data_enter_pass_fbe">Passwort für Benutzer [%tw_crypto_user_id%] eingeben</string>
+		<string name="decrypt_data_enter_pattern_fbe">Muster für Benutzer [%tw_crypto_user_id%] eingeben</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Dieser Kernel hat keine Leseunterstützung für SELinux-Kontexte.</string>
@@ -532,7 +574,8 @@
 		<string name="update_part_details_done">...Fertig</string>
 		<string name="wiping_dalvik">Dalvik Cache-Verzeichnisse bereinigen...</string>
 		<string name="cleaned">Bereinigt: {1}...</string>
-		<string name="dalvik_done">-- Dalvik Cache-Verzeichnisse bereinigt!</string>
+		<string name="cache_dalvik_done">-- Dalvik Cache-Verzeichnisse bereinigt!</string>
+		<string name="dalvik_done">-- Dalvik-Verzeichnis bereinigt!</string>
 		<string name="no_andsec">Keine "Android Secure"-Partitionen gefunden.</string>
 		<string name="unable_to_locate">{1} nicht gefunden.</string>
 		<string name="wiping_datamedia">Lösche internen Speicher -- /data/media...</string>
@@ -620,7 +663,7 @@
 		<string name="done_ors">Skript wurde verarbeitet</string>
 		<string name="injecttwrp">Injiziere TWRP in das Boot-Image...</string>
 		<string name="zip_err">Fehler beim Installieren von ZIP '{1}'</string>
-		<string name="installing_zip">Installiere Zip '{1}'</string>
+		<string name="installing_zip">Installiere ZIP '{1}'</string>
 		<string name="select_backup_opt">Setze Sicherungs-Optionen:</string>
 		<string name="compression_on">Komprimierung ist aktiviert</string>
 		<string name="digest_off" version="2">Digest-Generierung ist deaktiviert</string>
@@ -630,7 +673,7 @@
 		<string name="recovery_commands_complete">Recovery-Befehle ausgeführt</string>
 		<string name="running_ors">Führe OpenRecoveryScript aus</string>
 		<string name="ors_complete">OpenRecoveryScript ausgeführt</string>
-		<string name="invalid_zip_format">Invalid zip file format!</string>
+		<string name="invalid_zip_format">Invalides ZIP-Datei Format!</string>
 		<string name="check_for_digest" version="2">Suche nach Digest-Datei...</string>
 		<string name="fail_sysmap">'{1}' kann nicht zugeordnet werden</string>
 		<string name="verify_zip_sig">Überprüfe ZIP-Signatur...</string>
@@ -684,6 +727,14 @@
 		<string name="partition_not_found">Pfad: {1} wurde nicht in Partitionsliste gefunden</string>
 		<string name="copy_kernel_log">Kernel-Log wurde nach {1} kopiert</string>
 		<string name="include_kernel_log">Zusätzlich Kernel-Log kopieren</string>
+		<string name="sha2_chk">SHA2 als Hash-Algorithmus verwenden</string>
 		<string name="unable_set_boot_slot">Fehler während Wechsel zu Slot {1}</string>
+		<string name="unmount_sys_install">Aushängen der System-Partition vor der Installation einer ZIP-Datei.</string>
+		<string name="unmount_system">Aushängen der System-Partiton...</string>
+		<string name="unmount_system_err">Aushängen der System-Partition fehlgeschlagen</string>
+		<string name="flash_ab_inactive">Einspielen des A/B ZIPs auf den inaktiven Slot: {1}</string>
+		<string name="flash_ab_reboot">Um weitere ZIP-Dateien einzuspielen bitte das Recovery neustartet um auf den geänderten Slot zu wechseln.</string>
+		<string name="ozip_decrypt_decryption">Starte Ozip Entschlüsselung...</string>
+		<string name="ozip_decrypt_finish">Ozip Entschlüsselung abgeschlossen!</string>
 	</resources>
 </language>

From ace7eecd09aa78c3be19ae9b2d276bdbcc35d198 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sun, 30 Aug 2020 11:18:39 -0400
Subject: [PATCH 102/207] persist logs: remove persist from available log
 directories in partitions.

Too many problems have been reported for TWRP attempting to store
logs in the persist partition. Selinux denials have caused issues
booting Android, and filling up persist has caused IMEI issues.

This patchset will remove persist from the list of available log
directories by default in order to avoid these and other possible
issues.

Change-Id: I9f5347875a6cab24ab83ad48476b17a174e65c43
---
 data.cpp           | 47 ----------------------------------------------
 data.hpp           |  2 --
 partition.cpp      |  1 -
 twrp-functions.cpp |  9 +++------
 twrp-functions.hpp |  1 -
 5 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/data.cpp b/data.cpp
index bf6e33bc30..e6f1ac0ce0 100755
--- a/data.cpp
+++ b/data.cpp
@@ -273,44 +273,6 @@ int DataManager::LoadValues(const string& filename)
 	return 0;
 }
 
-int DataManager::LoadPersistValues(void)
-{
-	static bool loaded = false;
-	string dev_id;
-
-	// Only run this function once, and make sure normal settings file has not yet been read
-	if (loaded || !mBackingFile.empty() || !TWFunc::Path_Exists(PERSIST_SETTINGS_FILE))
-		return -1;
-
-	LOGINFO("Attempt to load settings from /persist settings file...\n");
-
-	if (!mInitialized)
-		SetDefaultValues();
-
-	GetValue("device_id", dev_id);
-	mPersist.SetFile(PERSIST_SETTINGS_FILE);
-	mPersist.SetFileVersion(FILE_VERSION);
-
-	// Read in the file, if possible
-	pthread_mutex_lock(&m_valuesLock);
-	mPersist.LoadValues();
-
-#ifndef TW_NO_SCREEN_TIMEOUT
-	blankTimer.setTime(mPersist.GetIntValue("tw_screen_timeout_secs"));
-#endif
-
-	update_tz_environment_variables();
-	TWFunc::Set_Brightness(GetStrValue("tw_brightness"));
-
-	pthread_mutex_unlock(&m_valuesLock);
-
-	/* Don't set storage nor backup paths this early */
-
-	loaded = true;
-
-	return 0;
-}
-
 int DataManager::Flush()
 {
 	return SaveValues();
@@ -319,15 +281,6 @@ int DataManager::Flush()
 int DataManager::SaveValues()
 {
 #ifndef TW_OEM_BUILD
-	if (PartitionManager.Mount_By_Path("/persist", false)) {
-		mPersist.SetFile(PERSIST_SETTINGS_FILE);
-		mPersist.SetFileVersion(FILE_VERSION);
-		pthread_mutex_lock(&m_valuesLock);
-		mPersist.SaveValues();
-		pthread_mutex_unlock(&m_valuesLock);
-		LOGINFO("Saved settings file values to %s\n", PERSIST_SETTINGS_FILE);
-	}
-
 	if (mBackingFile.empty())
 		return -1;
 
diff --git a/data.hpp b/data.hpp
index 4770ed5839..bb73c415c4 100755
--- a/data.hpp
+++ b/data.hpp
@@ -23,8 +23,6 @@
 #include <pthread.h>
 #include "infomanager.hpp"
 
-#define PERSIST_SETTINGS_FILE  "/persist/.twrps"
-
 using namespace std;
 
 class DataManager
diff --git a/partition.cpp b/partition.cpp
index 82cb944cb2..f753fdb19a 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -605,7 +605,6 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 		bool mounted = Is_Mounted();
 		if (mounted || Mount(false)) {
 			// Read the backup settings file
-			DataManager::LoadPersistValues();
 			TWFunc::Fixup_Time_On_Boot("/persist/time/");
 			if (!mounted)
 				UnMount(false);
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index ae1d133416..2ac4c956b2 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -761,7 +761,7 @@ int TWFunc::copy_file(string src, string dst, int mode) {
 	PartitionManager.Mount_By_Path(src, false);
 	PartitionManager.Mount_By_Path(dst, false);
 	if (!Path_Exists(src)) {
-		LOGINFO("Unable to find source file %s\n", src.c_str());
+		LOGINFO("Path %s does not exist. Unable to copy %s\n", src.c_str(), dst.c_str());
 		return -1;
 	}
 	std::ifstream srcfile(src.c_str(), ios::binary);
@@ -1250,11 +1250,8 @@ int TWFunc::stream_adb_backup(string &Restore_Name) {
 std::string TWFunc::get_log_dir() {
 	if (PartitionManager.Find_Partition_By_Path(CACHE_LOGS_DIR) == NULL) {
 		if (PartitionManager.Find_Partition_By_Path(DATA_LOGS_DIR) == NULL) {
-			if (PartitionManager.Find_Partition_By_Path(PERSIST_LOGS_DIR) == NULL) {
-				LOGINFO("Unable to find a directory to store TWRP logs.");
-				return "";
-			}
-			return PERSIST_LOGS_DIR;
+			LOGINFO("Unable to find a directory to store TWRP logs.");
+			return "";
 		} else {
 			return DATA_LOGS_DIR;
 		}
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 9715d780e7..d18539885f 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -38,7 +38,6 @@ using namespace std;
 
 #define CACHE_LOGS_DIR "/cache/"		// For devices with a dedicated cache partition
 #define DATA_LOGS_DIR "/data/"			// For devices that do not have a dedicated cache partition
-#define PERSIST_LOGS_DIR "/persist/"	// For devices with neither cache or dedicated data partition
 
 typedef enum
 {

From 35475b1dd571d1c01acb78949add932b1694458d Mon Sep 17 00:00:00 2001
From: Aaron Kling <webgeek1234@gmail.com>
Date: Sun, 30 Jun 2019 12:20:09 -0500
Subject: [PATCH 103/207] Choose hwrotation at runtime

If the prop persist.twrp.rotation is set to 0, 90, 180, or 270,
that will be used. If the prop is not set, the existing rotation
board config flags will be honored.

Note: This flag will only rotate graphics. If a set of devices
needs differing touch rotation, that support will need added
separately.

Change-Id: I6996c07bc0ae7bb8555b3d480b2917a17a365eb3
---
 minuitwrp/graphics.cpp         | 104 +++++++++++++++++++--------------
 minuitwrp/graphics_overlay.cpp |   6 +-
 minuitwrp/graphics_utils.cpp   |  19 +++++-
 minuitwrp/minui.h              |  13 +----
 minuitwrp/truetype.cpp         |  53 ++++++++---------
 5 files changed, 109 insertions(+), 86 deletions(-)

diff --git a/minuitwrp/graphics.cpp b/minuitwrp/graphics.cpp
index c3d6ca5af4..b387b703bf 100644
--- a/minuitwrp/graphics.cpp
+++ b/minuitwrp/graphics.cpp
@@ -31,6 +31,7 @@
 
 #include <time.h>
 
+#include <cutils/properties.h>
 #include <pixelflinger/pixelflinger.h>
 #include "../gui/placement.h"
 #include "minui.h"
@@ -60,6 +61,8 @@ static GGLContext *gr_context = 0;
 GGLSurface gr_mem_surface;
 static int gr_is_curr_clr_opaque = 0;
 
+unsigned int gr_rotation = 0;
+
 int gr_textEx_scaleW(int x, int y, const char *s, void* pFont, int max_width, int placement, int scale)
 {
     GGLContext *gl = gr_context;
@@ -114,17 +117,20 @@ void gr_clip(int x, int y, int w, int h)
 {
     GGLContext *gl = gr_context;
 
-#if TW_ROTATION == 0
-    gl->scissor(gl, x, y, w, h);
-#elif TW_ROTATION == 90
-    gl->scissor(gl, gr_draw->width - y - h, x, h, w);
-#elif TW_ROTATION == 270
-    gl->scissor(gl, y, gr_draw->height - x - w, h, w);
-#else
-    int t_disp = gr_draw->height - y - h;
-    int l_disp = gr_draw->width - x - w;
-    gl->scissor(gl, l_disp, t_disp, w, h);
-#endif
+    switch (gr_rotation) {
+        case 90:
+            gl->scissor(gl, gr_draw->width - y - h, x, h, w);
+            break;
+        case 180:
+            gl->scissor(gl, gr_draw->width - x - w, gr_draw->height - y - h, w, h);
+            break;
+        case 270:
+            gl->scissor(gl, y, gr_draw->height - x - w, h, w);
+            break;
+        default:
+            gl->scissor(gl, x, y, w, h);
+            break;
+    }
     gl->enable(gl, GGL_SCISSOR_TEST);
 }
 
@@ -142,10 +148,10 @@ void gr_line(int x0, int y0, int x1, int y1, int width)
     GGLContext *gl = gr_context;
     int x0_disp, y0_disp, x1_disp, y1_disp;
 
-    x0_disp = ROTATION_X_DISP(x0, y0, gr_draw);
-    y0_disp = ROTATION_Y_DISP(x0, y0, gr_draw);
-    x1_disp = ROTATION_X_DISP(x1, y1, gr_draw);
-    y1_disp = ROTATION_Y_DISP(x1, y1, gr_draw);
+    x0_disp = ROTATION_X_DISP(x0, y0, gr_draw->width);
+    y0_disp = ROTATION_Y_DISP(x0, y0, gr_draw->height);
+    x1_disp = ROTATION_X_DISP(x1, y1, gr_draw->width);
+    y1_disp = ROTATION_Y_DISP(x1, y1, gr_draw->height);
 
     if(gr_is_curr_clr_opaque)
         gl->disable(gl, GGL_BLEND);
@@ -245,10 +251,10 @@ void gr_fill(int x, int y, int w, int h)
     if(gr_is_curr_clr_opaque)
         gl->disable(gl, GGL_BLEND);
 
-    x0_disp = ROTATION_X_DISP(x, y, gr_draw);
-    y0_disp = ROTATION_Y_DISP(x, y, gr_draw);
-    x1_disp = ROTATION_X_DISP(x + w, y + h, gr_draw);
-    y1_disp = ROTATION_Y_DISP(x + w, y + h, gr_draw);
+    x0_disp = ROTATION_X_DISP(x, y, gr_draw->width);
+    y0_disp = ROTATION_Y_DISP(x, y, gr_draw->height);
+    x1_disp = ROTATION_X_DISP(x + w, y + h, gr_draw->width);
+    y1_disp = ROTATION_Y_DISP(x + w, y + h, gr_draw->height);
     l_disp = std::min(x0_disp, x1_disp);
     r_disp = std::max(x0_disp, x1_disp);
     t_disp = std::min(y0_disp, y1_disp);
@@ -275,35 +281,36 @@ void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy)
     int dx0_disp, dy0_disp, dx1_disp, dy1_disp;
     int l_disp, r_disp, t_disp, b_disp;
 
-    // Figuring out display coordinates works for TW_ROTATION == 0 too,
+    // Figuring out display coordinates works for gr_rotation == 0 too,
     // and isn't as expensive as allocating and rotating another surface,
     // so we do this anyway.
-    dx0_disp = ROTATION_X_DISP(dx, dy, gr_draw);
-    dy0_disp = ROTATION_Y_DISP(dx, dy, gr_draw);
-    dx1_disp = ROTATION_X_DISP(dx + w, dy + h, gr_draw);
-    dy1_disp = ROTATION_Y_DISP(dx + w, dy + h, gr_draw);
+    dx0_disp = ROTATION_X_DISP(dx, dy, gr_draw->width);
+    dy0_disp = ROTATION_Y_DISP(dx, dy, gr_draw->height);
+    dx1_disp = ROTATION_X_DISP(dx + w, dy + h, gr_draw->width);
+    dy1_disp = ROTATION_Y_DISP(dx + w, dy + h, gr_draw->height);
     l_disp = std::min(dx0_disp, dx1_disp);
     r_disp = std::max(dx0_disp, dx1_disp);
     t_disp = std::min(dy0_disp, dy1_disp);
     b_disp = std::max(dy0_disp, dy1_disp);
 
-#if TW_ROTATION != 0
-    // Do not perform relatively expensive operation if not needed
     GGLSurface surface_rotated;
-    surface_rotated.version = sizeof(surface_rotated);
-    // Skip the **(TW_ROTATION == 0)** || (TW_ROTATION == 180) check
-    // because we are under a TW_ROTATION != 0 conditional compilation statement
-    surface_rotated.width   = (TW_ROTATION == 180) ? surface->width  : surface->height;
-    surface_rotated.height  = (TW_ROTATION == 180) ? surface->height : surface->width;
-    surface_rotated.stride  = surface_rotated.width;
-    surface_rotated.format  = surface->format;
-    surface_rotated.data    = (GGLubyte*) malloc(surface_rotated.stride * surface_rotated.height * 4);
-    surface_ROTATION_transform((gr_surface) &surface_rotated, (const gr_surface) surface, 4);
-
-    gl->bindTexture(gl, &surface_rotated);
-#else
-    gl->bindTexture(gl, surface);
-#endif
+    if (gr_rotation != 0) {
+        // Do not perform relatively expensive operation if not needed
+        surface_rotated.version = sizeof(surface_rotated);
+        // Skip the **(gr_rotation == 0)** || (gr_rotation == 180) check
+        // because we are under a gr_rotation != 0 conditional compilation statement
+        surface_rotated.width   = (gr_rotation == 180) ? surface->width  : surface->height;
+        surface_rotated.height  = (gr_rotation == 180) ? surface->height : surface->width;
+        surface_rotated.stride  = surface_rotated.width;
+        surface_rotated.format  = surface->format;
+        surface_rotated.data    = (GGLubyte*) malloc(surface_rotated.stride * surface_rotated.height * 4);
+        surface_ROTATION_transform((gr_surface) &surface_rotated, (const gr_surface) surface, 4);
+
+        gl->bindTexture(gl, &surface_rotated);
+    } else {
+        gl->bindTexture(gl, surface);
+    }
+
     gl->texEnvi(gl, GGL_TEXTURE_ENV, GGL_TEXTURE_ENV_MODE, GGL_REPLACE);
     gl->texGeni(gl, GGL_S, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE);
     gl->texGeni(gl, GGL_T, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE);
@@ -312,9 +319,8 @@ void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy)
     gl->recti(gl, l_disp, t_disp, r_disp, b_disp);
     gl->disable(gl, GGL_TEXTURE_2D);
 
-#if TW_ROTATION != 0
-    free(surface_rotated.data);
-#endif
+    if (gr_rotation != 0)
+        free(surface_rotated.data);
 
     if(surface->format == GGL_PIXEL_FORMAT_RGBX_8888)
         gl->enable(gl, GGL_BLEND);
@@ -355,6 +361,14 @@ int gr_init(void)
 {
     gr_draw = NULL;
 
+    char gr_rotation_string[PROPERTY_VALUE_MAX];
+    char default_rotation[4];
+    snprintf(default_rotation, 4, "%d", TW_ROTATION);
+    property_get("persist.twrp.rotation", gr_rotation_string, default_rotation);
+    gr_rotation = atoi(gr_rotation_string);
+    if (!(gr_rotation == 90 || gr_rotation == 180 || gr_rotation == 270))
+        gr_rotation = 0;
+
 #ifdef MSM_BSP
     gr_backend = open_overlay();
     if (gr_backend) {
@@ -431,14 +445,14 @@ void gr_exit(void)
 
 int gr_fb_width(void)
 {
-    return (TW_ROTATION == 0 || TW_ROTATION == 180) ?
+    return (gr_rotation == 0 || gr_rotation == 180) ?
             gr_draw->width  - 2 * overscan_offset_x :
             gr_draw->height - 2 * overscan_offset_y;
 }
 
 int gr_fb_height(void)
 {
-    return (TW_ROTATION == 0 || TW_ROTATION == 180) ?
+    return (gr_rotation == 0 || gr_rotation == 180) ?
             gr_draw->height - 2 * overscan_offset_y :
             gr_draw->width  - 2 * overscan_offset_x;
 }
diff --git a/minuitwrp/graphics_overlay.cpp b/minuitwrp/graphics_overlay.cpp
index 4dff7f4a69..a53faa865e 100644
--- a/minuitwrp/graphics_overlay.cpp
+++ b/minuitwrp/graphics_overlay.cpp
@@ -324,7 +324,7 @@ int allocate_overlay(int fd, GRSurface gr_fb)
             overlayL.dst_rect.h = gr_fb.height;
             overlayL.alpha = 0xFF;
             // If this worked, life would have been so much easier
-            //switch (TW_ROTATION) {
+            //switch (gr_rotation) {
                 //case   0:  overlayL.flags = MDP_ROT_NOP; break;
                 //case  90:  overlayL.flags = MDP_ROT_90;  break;
                 //case 180:  overlayL.flags = MDP_ROT_180; break;
@@ -368,7 +368,7 @@ int allocate_overlay(int fd, GRSurface gr_fb)
             overlayL.dst_rect.h = height;
             overlayL.alpha = 0xFF;
             // If this worked, life would have been so much easier
-            //switch (TW_ROTATION) {
+            //switch (gr_rotation) {
                 //case   0:  overlayL.flags = MDP_ROT_NOP; break;
                 //case  90:  overlayL.flags = MDP_ROT_90;  break;
                 //case 180:  overlayL.flags = MDP_ROT_180; break;
@@ -403,7 +403,7 @@ int allocate_overlay(int fd, GRSurface gr_fb)
             overlayR.alpha = 0xFF;
             overlayR.flags = MDSS_MDP_RIGHT_MIXER;
             // If this worked, life would have been so much easier
-            //switch (TW_ROTATION) {
+            //switch (gr_rotation) {
                 //case   0:  overlayR.flags |= MDP_ROT_NOP; break;
                 //case  90:  overlayR.flags |= MDP_ROT_90;  break;
                 //case 180:  overlayR.flags |= MDP_ROT_180; break;
diff --git a/minuitwrp/graphics_utils.cpp b/minuitwrp/graphics_utils.cpp
index c591e5398f..0bc86828d1 100644
--- a/minuitwrp/graphics_utils.cpp
+++ b/minuitwrp/graphics_utils.cpp
@@ -26,6 +26,7 @@
 struct fb_var_screeninfo vi;
 extern GGLSurface gr_mem_surface;
 extern GRSurface* gr_draw;
+extern unsigned int gr_rotation;
 
 int gr_save_screenshot(const char *dest)
 {
@@ -123,6 +124,20 @@ int gr_save_screenshot(const char *dest)
     return res;
 }
 
+int ROTATION_X_DISP(int x, int y, int w) {
+    return ((gr_rotation ==   0) ? (x) :
+            (gr_rotation ==  90) ? (w - (y) - 1) :
+            (gr_rotation == 180) ? (w - (x) - 1) :
+            (gr_rotation == 270) ? (y) : -1);
+}
+
+int ROTATION_Y_DISP(int x, int y, int h) {
+    return ((gr_rotation ==   0) ? (y) :
+            (gr_rotation ==  90) ? (x) :
+            (gr_rotation == 180) ? (h - (y) - 1) :
+            (gr_rotation == 270) ? (h - (x) - 1) : -1);
+}
+
 #define MATRIX_ELEMENT(matrix, row, col, row_size, elem_size) \
     (((uint8_t*) (matrix)) + (((row) * (elem_size)) * (row_size)) + ((col) * (elem_size)))
 
@@ -135,8 +150,8 @@ int gr_save_screenshot(const char *dest)
             /* input pointer from src->data */                                \
             const uint##bits_per_pixel##_t *ip;                               \
             /* Display coordinates (in dst) corresponding to (x, y) in src */ \
-            size_t x_disp = ROTATION_X_DISP(x, y, dst);                     \
-            size_t y_disp = ROTATION_Y_DISP(x, y, dst);                     \
+            size_t x_disp = ROTATION_X_DISP(x, y, dst->width);                \
+            size_t y_disp = ROTATION_Y_DISP(x, y, dst->height);               \
                                                                               \
             ip = (const uint##bits_per_pixel##_t*)                            \
                  MATRIX_ELEMENT(src->data, y, x,                              \
diff --git a/minuitwrp/minui.h b/minuitwrp/minui.h
index 2c462e75f7..a6c2a712ce 100644
--- a/minuitwrp/minui.h
+++ b/minuitwrp/minui.h
@@ -76,16 +76,9 @@ int gr_save_screenshot(const char *dest);
 
 // Transform minuitwrp API coordinates into display coordinates,
 // for panels that are hardware-mounted in a rotated manner.
-#define ROTATION_X_DISP(x, y, surface) \
-    ((TW_ROTATION ==   0) ? (x) : \
-     (TW_ROTATION ==  90) ? ((surface)->width - (y) - 1) : \
-     (TW_ROTATION == 180) ? ((surface)->width - (x) - 1) : \
-     (TW_ROTATION == 270) ? (y) : -1)
-#define ROTATION_Y_DISP(x, y, surface) \
-    ((TW_ROTATION ==   0) ? (y) : \
-     (TW_ROTATION ==  90) ? (x) : \
-     (TW_ROTATION == 180) ? ((surface)->height - (y) - 1) : \
-     (TW_ROTATION == 270) ? ((surface)->height - (x) - 1) : -1)
+int ROTATION_X_DISP(int x, int y, int w);
+
+int ROTATION_Y_DISP(int x, int y, int h);
 
 void surface_ROTATION_transform(gr_surface dst_ptr, const gr_surface src_ptr, size_t num_bytes_per_pixel);
 
diff --git a/minuitwrp/truetype.cpp b/minuitwrp/truetype.cpp
index 0416b0e9f7..9c7c79b07c 100644
--- a/minuitwrp/truetype.cpp
+++ b/minuitwrp/truetype.cpp
@@ -20,6 +20,8 @@
 #define STRING_CACHE_MAX_ENTRIES 400
 #define STRING_CACHE_TRUNCATE_ENTRIES 150
 
+extern unsigned int gr_rotation;
+
 typedef struct
 {
     int size;
@@ -725,20 +727,20 @@ int gr_ttf_textExWH(void *context, int x, int y,
         return -1;
     }
 
-#if TW_ROTATION != 0
-    // Do not perform relatively expensive operation if not needed
     GGLSurface string_surface_rotated;
-    string_surface_rotated.version = sizeof(string_surface_rotated);
-    // Skip the **(TW_ROTATION == 0)** || (TW_ROTATION == 180) check
-    // because we are under a TW_ROTATION != 0 conditional compilation statement
-    string_surface_rotated.width   = (TW_ROTATION == 180) ? e->surface.width  : e->surface.height;
-    string_surface_rotated.height  = (TW_ROTATION == 180) ? e->surface.height : e->surface.width;
-    string_surface_rotated.stride  = string_surface_rotated.width;
-    string_surface_rotated.format  = e->surface.format;
-    // e->surface.format is GGL_PIXEL_FORMAT_A_8 (grayscale)
-    string_surface_rotated.data    = (GGLubyte*) malloc(string_surface_rotated.stride * string_surface_rotated.height * 1);
-    surface_ROTATION_transform((gr_surface) &string_surface_rotated, (const gr_surface) &e->surface, 1);
-#endif
+    if (gr_rotation != 0) {
+        // Do not perform relatively expensive operation if not needed
+        string_surface_rotated.version = sizeof(string_surface_rotated);
+        // Skip the **(gr_rotation == 0)** || (gr_rotation == 180) check
+        // because we are under a gr_rotation != 0 conditional compilation statement
+        string_surface_rotated.width   = (gr_rotation == 180) ? e->surface.width  : e->surface.height;
+        string_surface_rotated.height  = (gr_rotation == 180) ? e->surface.height : e->surface.width;
+        string_surface_rotated.stride  = string_surface_rotated.width;
+        string_surface_rotated.format  = e->surface.format;
+        // e->surface.format is GGL_PIXEL_FORMAT_A_8 (grayscale)
+        string_surface_rotated.data    = (GGLubyte*) malloc(string_surface_rotated.stride * string_surface_rotated.height * 1);
+        surface_ROTATION_transform((gr_surface) &string_surface_rotated, (const gr_surface) &e->surface, 1);
+    }
 
     int y_bottom = y + e->surface.height;
     int res = e->rendered_bytes;
@@ -753,26 +755,26 @@ int gr_ttf_textExWH(void *context, int x, int y,
         }
     }
 
-    // Figuring out display coordinates works for TW_ROTATION == 0 too,
+    // Figuring out display coordinates works for gr_rotation == 0 too,
     // and isn't as expensive as allocating and rotating another surface,
     // so we do this anyway.
     int x0_disp, y0_disp, x1_disp, y1_disp;
     int l_disp, r_disp, t_disp, b_disp;
 
-    x0_disp = ROTATION_X_DISP(x, y, gr_draw);
-    y0_disp = ROTATION_Y_DISP(x, y, gr_draw);
-    x1_disp = ROTATION_X_DISP(x + e->surface.width, y_bottom, gr_draw);
-    y1_disp = ROTATION_Y_DISP(x + e->surface.width, y_bottom, gr_draw);
+    x0_disp = ROTATION_X_DISP(x, y, gr_draw->width);
+    y0_disp = ROTATION_Y_DISP(x, y, gr_draw->height);
+    x1_disp = ROTATION_X_DISP(x + e->surface.width, y_bottom, gr_draw->width);
+    y1_disp = ROTATION_Y_DISP(x + e->surface.width, y_bottom, gr_draw->height);
     l_disp = std::min(x0_disp, x1_disp);
     r_disp = std::max(x0_disp, x1_disp);
     t_disp = std::min(y0_disp, y1_disp);
     b_disp = std::max(y0_disp, y1_disp);
 
-#if TW_ROTATION != 0
-    gl->bindTexture(gl, &string_surface_rotated);
-#else
-    gl->bindTexture(gl, &e->surface);
-#endif
+    if (gr_rotation != 0) {
+        gl->bindTexture(gl, &string_surface_rotated);
+    } else {
+        gl->bindTexture(gl, &e->surface);
+    }
     gl->texEnvi(gl, GGL_TEXTURE_ENV, GGL_TEXTURE_ENV_MODE, GGL_REPLACE);
     gl->texGeni(gl, GGL_S, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE);
     gl->texGeni(gl, GGL_T, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE);
@@ -782,9 +784,8 @@ int gr_ttf_textExWH(void *context, int x, int y,
     gl->recti(gl, l_disp, t_disp, r_disp, b_disp);
     gl->disable(gl, GGL_TEXTURE_2D);
 
-#if TW_ROTATION != 0
-    free(string_surface_rotated.data);
-#endif
+    if (gr_rotation != 0)
+        free(string_surface_rotated.data);
 
     pthread_mutex_unlock(&font->mutex);
     return res;

From e8f7ea353b6eaf3930aa6429465ffc527c92bd2e Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Fri, 12 Jun 2020 20:38:58 +0530
Subject: [PATCH 104/207] fix compile in api 24

 * Fixes the following error
   bootable/recovery/twrp.cpp:173:18: error: use of undeclared identifier 'android'

                                other_prop = android::base::Trim(other_prop);

                                             ^

   bootable/recovery/twrp.cpp:174:20: error: use of undeclared identifier 'android'

                                current_prop = android::base::Trim(current_prop);

Change-Id: I1d82cc68d99e5b42cd32a6fb96e9331681f56ba2
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
---
 Android.mk | 1 +
 twrp.cpp   | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index af49367f48..2725a0bbed 100755
--- a/Android.mk
+++ b/Android.mk
@@ -143,6 +143,7 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
     LOCAL_SHARED_LIBRARIES += libstlport
     LOCAL_CFLAGS += -DTW_NO_SHA2_LIBRARY
 endif
+LOCAL_CFLAGS += -DSDK_VERSION=$(PLATFORM_SDK_VERSION)
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 25; echo $$?),0)
     LOCAL_CFLAGS += -DUSE_OLD_BASE_INCLUDE
 endif
diff --git a/twrp.cpp b/twrp.cpp
index f7ad7cb15a..6df37d95fe 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -44,10 +44,12 @@ extern "C" {
 #include "data.hpp"
 #include "partitions.hpp"
 
-#ifdef USE_OLD_BASE_INCLUDE
-#include <strings.h>
-#else
+#if SDK_VERSION >= 24
 #include <android-base/strings.h>
+#elif SDK_VERSION == 23
+#include <base/strings.h>
+#else
+#include <strings.h>
 #endif
 #include "openrecoveryscript.hpp"
 #include "variables.h"

From 9d0781836518243781141b5a0d5e1ee2f6738bbf Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 23 Oct 2020 12:10:31 -0400
Subject: [PATCH 105/207] vold_decrypt: don't show error if unmount fails

Since partition gets lazy unmounted anyway, and a warning
gets written to the log, there's no need to display an error

Change-Id: I1b34d647412dc36f63191e91c4dbcee255d2db16
---
 crypto/vold_decrypt/vold_decrypt.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/vold_decrypt/vold_decrypt.cpp b/crypto/vold_decrypt/vold_decrypt.cpp
index 078cd5fa8e..c718dda60f 100755
--- a/crypto/vold_decrypt/vold_decrypt.cpp
+++ b/crypto/vold_decrypt/vold_decrypt.cpp
@@ -1372,7 +1372,7 @@ int Vold_Decrypt_Core(const string& Password) {
 	if (is_fstab_symlinked)
 		Restore_Recovery_Fstab();
 
-	if (!PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), true)) {
+	if (!PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), false)) {
 		// PartitionManager failed to unmount ANDROID_ROOT, this should not happen,
 		// but in case it does, do a lazy unmount
 		LOGINFO("WARNING: '%s' could not be unmounted normally!\n", PartitionManager.Get_Android_Root_Path().c_str());
@@ -1383,7 +1383,7 @@ int Vold_Decrypt_Core(const string& Password) {
 	for (size_t i = 0; i < partitions.size(); ++i) {
 		string mnt_point = "/" + partitions[i];
 		if(PartitionManager.Is_Mounted_By_Path(mnt_point)) {
-			if (!PartitionManager.UnMount_By_Path(mnt_point, true)) {
+			if (!PartitionManager.UnMount_By_Path(mnt_point, false)) {
 				LOGINFO("WARNING: %s partition could not be unmounted normally!\n", partitions[i].c_str());
 				umount2(mnt_point.c_str(), MNT_DETACH);
 			}

From 3ad80f4f05b63eaacaf7fca692c2fe6a7f2ee635 Mon Sep 17 00:00:00 2001
From: Noah Jacobson <noah@noahjacobson.com>
Date: Tue, 21 Jul 2020 01:28:22 -0400
Subject: [PATCH 106/207] multiuser: Warn when not all users are decrypted

Change-Id: Id4d213ca9bb190b090ba660f06df60163ee7321a
---
 gui/theme/common/landscape.xml    | 69 +++++++++++++++++++++++++++++++
 gui/theme/common/languages/en.xml |  4 ++
 gui/theme/common/portrait.xml     | 69 +++++++++++++++++++++++++++++++
 gui/theme/common/watch.xml        | 69 +++++++++++++++++++++++++++++++
 4 files changed, 211 insertions(+)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 3d8646c65a..daee7f3379 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -760,6 +760,8 @@
 				<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>
@@ -1631,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>
@@ -1767,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)}"/>
@@ -2077,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>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index e1e36f2d86..f3a31ce14c 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -521,6 +521,10 @@
 		<string name="decrypt_user_fail_fbe">Failed to decrypt user {1}</string>
 		<string name="decrypt_data_enter_pass_fbe">Enter Password for User [%tw_crypto_user_id%]</string>
 		<string name="decrypt_data_enter_pattern_fbe">Enter Pattern for User [%tw_crypto_user_id%]</string>
+		<string name="multiuser_warning1">Not all users decrypted!</string>
+		<string name="multiuser_warning2">Backup/restore operations may fail!</string>
+		<string name="multiuser_warning_accept">Continue Anyway</string>
+		<string name="multiuser_warning_hdr">Multiuser Warning</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Kernel does not have support for reading SELinux contexts.</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 4b8cd4ad14..bead7e619e 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -711,6 +711,8 @@
 				<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>
@@ -1587,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>
@@ -1699,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"/>
 
@@ -2238,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>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 7b474ddd3b..74212030d0 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -976,6 +976,8 @@
 				<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>
@@ -1932,6 +1934,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>
+
 			<template name="statusbar"/>
 
 			<text style="text_m">
@@ -2055,6 +2069,49 @@
 			</action>
 		</page>
 
+		<page name="multiuser_warning">
+			<template name="page"/>
+
+			<text style="text_m">
+				<placement x="%col1_x_left%" y="%row1_header_y%"/>
+				<text>{@multiuser_warning_hdr=Multiuser Warning}</text>
+			</text>
+
+			<text style="text_m_fail">
+				<placement x="%center_x%" y="%row6_y%" placement="5"/>
+				<text>{@multiuser_warning1=Not all users decrypted!}</text>
+			</text>
+
+			<text style="text_m_fail">
+				<placement x="%center_x%" y="%row7_y%" placement="5"/>
+				<text>{@multiuser_warning2=Backup/restore operations may fail!}</text>
+			</text>
+
+			<button style="main_button_full_width">
+				<placement x="%col1_x_left%" y="%row6_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"/>
 
@@ -2585,6 +2642,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>
+
 			<template name="statusbar"/>
 
 			<text style="text_m">

From 6e80600cb5c13d39a3e2077a29ec7fcbd136de3c Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sat, 24 Oct 2020 17:17:09 -0400
Subject: [PATCH 107/207] fde: set ro.crypto.type to block

Since we set ro.crypto.type to "file" for FBE, we should also set
this prop for FDE.

Change-Id: Id3a581da5d4b58c41c2c361593ad7266898a6f54
---
 partitionmanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index e4f84967f8..8814cd9abf 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1796,6 +1796,7 @@ int TWPartitionManager::Decrypt_Device(string Password, int user_id) {
 	property_get("ro.crypto.state", crypto_state, "error");
 	if (strcmp(crypto_state, "error") == 0) {
 		property_set("ro.crypto.state", "encrypted");
+		property_set("ro.crypto.type", "block");
 		// Sleep for a bit so that services can start if needed
 		sleep(1);
 	}

From 07b8e05245ab461269e0f4abdedffc3e70d0a917 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 29 Oct 2020 12:43:17 -0400
Subject: [PATCH 108/207] fde: move crypto state & type setting to function

In order to make sure the crypto state and type is set
properly if the device is encrypted, move this check to
a function and call it in cases where the default password
is being used and in cases where it isn't. This will ensure that
an unencrypted device isn't set as encrypted by mistake.

Change-Id: I736f9cbee0e95d7390a09c8235b9914feddaceaf
---
 partitionmanager.cpp | 14 ++++++++++----
 partitions.hpp       |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 8814cd9abf..d4b2028ed8 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -112,6 +112,14 @@ TWPartitionManager::TWPartitionManager(void) {
 #endif
 }
 
+int TWPartitionManager::Set_FDE_Encrypt_Status(void) {
+	property_set("ro.crypto.state", "encrypted");
+	property_set("ro.crypto.type", "block");
+	// Sleep for a bit so that services can start if needed
+	sleep(1);
+	return 0;
+}
+
 int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error, bool Sar_Detect) {
 	FILE *fstabFile;
 	char fstab_line[MAX_FSTAB_LINE_LENGTH];
@@ -339,6 +347,7 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error,
 				}
 			}
 		} else {
+			Set_FDE_Encrypt_Status();
 			int password_type = cryptfs_get_password_type();
 			if (password_type == CRYPT_TYPE_DEFAULT) {
 				LOGINFO("Device is encrypted with the default password, attempting to decrypt.\n");
@@ -1795,10 +1804,7 @@ int TWPartitionManager::Decrypt_Device(string Password, int user_id) {
 
 	property_get("ro.crypto.state", crypto_state, "error");
 	if (strcmp(crypto_state, "error") == 0) {
-		property_set("ro.crypto.state", "encrypted");
-		property_set("ro.crypto.type", "block");
-		// Sleep for a bit so that services can start if needed
-		sleep(1);
+		Set_FDE_Encrypt_Status();
 	}
 
 	if (DataManager::GetIntValue(TW_IS_FBE)) {
diff --git a/partitions.hpp b/partitions.hpp
index 6b9f37531c..564004e753 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -391,6 +391,7 @@ class TWPartitionManager
 	bool Prepare_Repack(const std::string& Source_Path, const std::string& Temp_Folder_Destination, const bool Copy_Source, const bool Create_Destination = true); // Prepares an image for repacking by unpacking it to the temp folder destination
 	bool Repack_Images(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options); // Repacks the boot image with a new kernel or a new ramdisk
 	std::vector<users_struct>* Get_Users_List();                              // Returns pointer to list of users
+	int Set_FDE_Encrypt_Status();                                             // Sets encryption state for FDE devices (ro.crypto.state and ro.crypto.type)
 
 private:
 	void Setup_Settings_Storage_Partition(TWPartition* Part);                 // Sets up settings storage

From 674bb0c8556e3e7cb9e8c1cc42bb76699be9b6c2 Mon Sep 17 00:00:00 2001
From: nebrassy <nebras30@gmail.com>
Date: Sat, 24 Oct 2020 21:08:20 +0200
Subject: [PATCH 109/207] set crypto state/type when detected

Change-Id: I4506d3ef11052dbebf974b5c387a3c7d5055f2ea
---
 partition.cpp        | 1 +
 partitionmanager.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/partition.cpp b/partition.cpp
index f753fdb19a..f169bd0ac6 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -723,6 +723,7 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 bool TWPartition::Decrypt_FBE_DE() {
 if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 		DataManager::SetValue(TW_IS_FBE, 1);
+		property_set("ro.crypto.type", "file");
 		LOGINFO("File Based Encryption is present\n");
 #ifdef TW_INCLUDE_FBE
 	Is_FBE = true;
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index d4b2028ed8..30bdf3efda 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -302,11 +302,12 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error,
 #ifdef TW_INCLUDE_CRYPTO
 	TWPartition* Decrypt_Data = Find_Partition_By_Path("/data");
 	if (Decrypt_Data && Decrypt_Data->Is_Encrypted && !Decrypt_Data->Is_Decrypted) {
+		property_set("ro.crypto.state", "encrypted");
 		if (!Decrypt_Data->Key_Directory.empty() && Mount_By_Path(Decrypt_Data->Key_Directory, false)) {
+		property_set("ro.crypto.type", "file");
 #ifdef TW_INCLUDE_FBE_METADATA_DECRYPT
 			if (e4crypt_mount_metadata_encrypted(Decrypt_Data->Mount_Point, false, Decrypt_Data->Key_Directory, Decrypt_Data->Actual_Block_Device, &Decrypt_Data->Decrypted_Block_Device)) {
 				LOGINFO("Successfully decrypted metadata encrypted data partition with new block device: '%s'\n", Decrypt_Data->Decrypted_Block_Device.c_str());
-				property_set("ro.crypto.state", "encrypted");
 				Decrypt_Data->Is_Decrypted = true; // Needed to make the mount function work correctly
 				int retry_count = 10;
 				while (!Decrypt_Data->Mount(false) && --retry_count)

From 9c5a5f63aa36757193b22be10248896606c9cd00 Mon Sep 17 00:00:00 2001
From: whyle <yihao.zhuo.2001@gmail.com>
Date: Sun, 8 Nov 2020 16:41:37 +0100
Subject: [PATCH 110/207] Add missing Chinese tanslate

Change-Id: Ifca9c7a8b5a62d913002a3b1d1bb77f432d0a303
(cherry picked from commit 0234cab3a1538d07225567822e8eaba0c94c0ff5)
---
 gui/theme/extra-languages/languages/zh_CN.xml | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/gui/theme/extra-languages/languages/zh_CN.xml b/gui/theme/extra-languages/languages/zh_CN.xml
index 6b0c022e70..2337e8332d 100644
--- a/gui/theme/extra-languages/languages/zh_CN.xml
+++ b/gui/theme/extra-languages/languages/zh_CN.xml
@@ -108,7 +108,7 @@
 		<string name="image_flashed">镜像已刷入。</string>
 		<string name="wipe_cache_dalvik_confirm">是否清除 Cache 和 Dalvik？</string>
 		<string name="wipe_dalvik_confirm">是否清除 Dalvik？</string>
-		<string name="wiping_cache_dalvik">正在清除 Cache 和 Dalvik…</string>
+		<string name="wiping_cache_dalvik">正在清除 Cache 和 Dalvik...</string>
 		<string name="wipe_cache_dalvik_complete">Cache 和 Dalvik 清除完成</string>
 		<string name="wipe_dalvik_complete">Dalvik 清除完成</string>
 		<string name="swipe_wipe">滑动按钮确认清除</string>
@@ -126,6 +126,10 @@
 		<string name="reboot_install_app_system">安装为系统应用</string>
 		<string name="reboot_installing_app">正在安装应用…</string>
 		<string name="swipe_to_install_app">滑动按钮确认安装</string>
+        <string name="uninstall_twrp_system_app">卸载 TWRP 应用</string>
+		<string name="uninstall_twrp_system_app_confirm">确认卸载 TWRP 应用？</string>
+		<string name="uninstalling_twrp_system_app">正在卸载 TWRP 应用...</string>
+		<string name="uninstall_twrp_system_app_complete">卸载 TWRP 应用完成</string>
 		<string name="swipe_flash">滑动按钮确认刷入</string>
 		<string name="confirm_action">确认操作</string>
 		<string name="back_cancel">按返回按钮取消。</string>
@@ -137,6 +141,7 @@
 		<string name="factory_reset2">（不会清除内置存储/sdcard）</string>
 		<string name="factory_reset3">在大多数情况下，您只需要</string>
 		<string name="factory_reset4">执行此操作即可。</string>
+        <string name="factory_reset5">(不包括用户/锁屏)</string>
 		<string name="factory_resetting">正在恢复出厂设置…</string>
 		<string name="advanced_wipe_hdr">高级清除选项</string>
 		<string name="advanced_wipe_btn">高级清除</string>
@@ -507,6 +512,19 @@
 		<string name="fix_recovery_loop_complete">Recovery 无限重启修复完成</string>
 		<string name="fixing_recovery_loop_patch">正在对内核打补丁…</string>
 		<string name="fix_recovery_loop_patch_error">对内核打补丁时出错。</string>
+        <string name="decrypt_users">解密用户</string>
+		<string name="decrypt_users_selection">选择一个要解密的用户ID</string>
+		<string name="select_user">选择用户</string>
+		<string name="backup_storage_undecrypt_warning">备份不包括一些{1}用户的文件，因为此用户没有解密</string>
+		<string name="decrypting_user_fbe">尝试解密用户{1}的FBE...</string>
+		<string name="decrypt_user_success_fbe">用户 {1} 解密成功</string>
+		<string name="decrypt_user_fail_fbe">用户 {1} 解密失败</string>
+		<string name="decrypt_data_enter_pass_fbe">请输入 [%tw_crypto_user_id%] 用户的密码</string>
+		<string name="decrypt_data_enter_pattern_fbe">请画出 [%tw_crypto_user_id%] 用户的密码</string>
+		<string name="multiuser_warning1">有用户没有被解密！</string>
+		<string name="multiuser_warning2">备份/还原操作有可能会失败！</string>
+		<string name="multiuser_warning_accept">仍然继续</string>
+		<string name="multiuser_warning_hdr">多用户警告</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">内核不支持读取 SELinux Context。</string>
@@ -522,8 +540,8 @@
 		<string name="digest_created" version="2"> * Digest 已生成。</string>
 		<string name="digest_error" version="2"> * Digest 错误！</string>
 		<string name="digest_compute_error" version="2"> * 计算 Digest 错误。</string>
-		<string name="current_date">(Current Date)</string>
-		<string name="auto_generate">(Auto Generate)</string>
+		<string name="current_date">(当前日期)</string>
+		<string name="auto_generate">(自动生成)</string>
 		<string name="unable_to_locate_partition">未找到 '{1}' 分区。</string>
 		<string name="no_partition_selected">未选择备份分区。</string>
 		<string name="total_partitions_backup"> * 备份分区总数：{1}</string>
@@ -683,7 +701,7 @@
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">已完成 %llu 个，共 %llu 个文件，进度 %i%%</string>
 		<string name="size_progress">已完成 %lluMB，共 %lluMB，进度 %i%%</string>
-		<string name="decrypt_cmd">尝试通过命令行解密 Data 分区。</string>
+		<string name="decrypt_cmd" version="2">尝试通过命令行解密 Data 分区 / 用户。</string>
 		<string name="base_pkg_err">无法加载基本包。</string>
 		<string name="simulating">正在模拟操作…</string>
 		<string name="backup_cancel">备份已取消。</string>
@@ -715,5 +733,23 @@
 		<string name="include_kernel_log">包含内核日志</string>
 		<string name="sha2_chk">使用 SHA2 进行散列校验</string>
 		<string name="unable_set_boot_slot">更改 bootloader 启动分区至 {1} 错误</string>
+        <string name="unmount_sys_install">在安装 ZIP 之前先卸载系统(挂载)</string>
+		<string name="unmount_system">卸载系统中...</string>
+		<string name="unmount_system_err">卸载系统失败</string>
+		<string name="flash_ab_inactive">正在刷入 A/B zip 到未选择slot: {1}</string>
+		<string name="flash_ab_reboot">要刷入其他zip文件，请重新进入Recovery以切换到更新后的插槽。</string>
+		<string name="ozip_decrypt_decryption">正在解密Ozip...</string>
+		<string name="ozip_decrypt_finish">Ozip解密完成！</string>
+		<string name="fbe_wipe_msg">注意: {1} 已清除. FBE设备应启动至Android，而不是Recovery，才能在擦除后设置启动FBE策略。</string>
+		<string name="fastboot_button">Fastboot</string>
+		<string name="enable_adb">开启 ADB</string>
+		<string name="enable_fastboot">开启 Fastboot</string>
+		<string name="fastboot_console_msg">进入 Fastboot 模式...</string>
+		<!-- Android Rescue Party trigger -->
+		<string name="rescue_party0">Android 抢救模式被触发! 可能的解决方案? 要么:</string>
+		<string name="rescue_party1"> 1. 清除缓存, 和/或</string>
+		<string name="rescue_party2"> 2. 双清, 和/或</string>
+		<string name="rescue_party3"> 3. 重新刷入Rom.</string>
+		<string name="rescue_party4">报告的问题是：</string>
 	</resources>
 </language>

From 5318039124d0c45ada4a92cb7c3fffafb9958c56 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sun, 29 Nov 2020 12:38:20 -0500
Subject: [PATCH 111/207] variables: add branch to TWRP version number

Since the 9.0 and 10.0 TWRP branches have diverged due to adding
dynamic partition support, this will make it easier to understand
which branch of TWRP is being used for the build.

Change-Id: I2712c9498c9230e9a6d2eac718bda9e82a6d14f7
---
 variables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.h b/variables.h
index 32a7b99385..b41f38ef50 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.4.0"
+#define TW_MAIN_VERSION_STR       "3.4.0_9"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 
 #define TW_USE_COMPRESSION_VAR      "tw_use_compression"

From 81acef17466d505a8c852b3c4dd87fe3f824926d Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <asulfrian@zedat.fu-berlin.de>
Date: Tue, 15 Dec 2020 01:58:55 +0100
Subject: [PATCH 112/207] Update lock pattern types for android 11

The stored id for the different types of the lock pattern was chnaged
with Android 11. You can find the updated list in the LockPatternUtils:

    https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-11.0.0_r25/core/java/com/android/internal/widget/LockPatternUtils.java#113

It was changed in 5e891bcc04556a3595ab349381acc2a2e36a69d1:

    https://android.googlesource.com/platform/frameworks/base/+/5e891bcc04556a3595ab349381acc2a2e36a69d1

The old CREDENTIAL_TYPE_PASSWORD_OR_PIN was essentialy split in
CREDENTIAL_TYPE_PASSWORD and CREDENTIAL_TYPE_PASSWORD_OR_PIN.

This code updates the matching in twrp, so that the correct unlocking
method for file base decryption can be found. Without these changes twrp
always try to use the default password and obviously fails. With these
changes the usual password dialog is shown and the decryption is
successfully.

Change-Id: Ia8d47223b30a5301d4b9d2230241039612055ebb
Signed-off-by: Alexander Sulfrian <asulfrian@zedat.fu-berlin.de>
Co-authored-by: althafvly <althafvly@gmail.com>
---
 crypto/ext4crypt/Decrypt.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/ext4crypt/Decrypt.cpp b/crypto/ext4crypt/Decrypt.cpp
index 468601fc8b..fb162404d0 100644
--- a/crypto/ext4crypt/Decrypt.cpp
+++ b/crypto/ext4crypt/Decrypt.cpp
@@ -1197,7 +1197,9 @@ int Get_Password_Type(const userid_t user_id, std::string& filename) {
 		}
 		if (pwd.password_type == 1) // In Android this means pattern
 			return 2; // In TWRP this means pattern
-		else if (pwd.password_type == 2) // In Android this means PIN or password
+                // In Android <11 type 2 is PIN or password
+                // In Android 11 type 3 is PIN and type 4 is password
+                else if (pwd.password_type > 1)
 			return 1; // In TWRP this means PIN or password
 		return 0; // We'll try the default password
 #else

From 3eee31a1c0170ccfa48de57245e8cb9621f007d3 Mon Sep 17 00:00:00 2001
From: nebrassy <nebras30@gmail.com>
Date: Wed, 16 Dec 2020 10:35:25 +0100
Subject: [PATCH 113/207] also set crypto state for non-metadata FBE

Change-Id: I586878cc6134d798b1d087415cb694d6738f279a
---
 partition.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/partition.cpp b/partition.cpp
index f169bd0ac6..a34d854c14 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -723,6 +723,7 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 bool TWPartition::Decrypt_FBE_DE() {
 if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 		DataManager::SetValue(TW_IS_FBE, 1);
+                property_set("ro.crypto.state", "encrypted");
 		property_set("ro.crypto.type", "file");
 		LOGINFO("File Based Encryption is present\n");
 #ifdef TW_INCLUDE_FBE

From 97829df410dde567c74a60ca2e8b2beb111c7e63 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sun, 20 Dec 2020 12:26:15 -0500
Subject: [PATCH 114/207] gui: update reboot page to listbox

Aligns relevant theme changes to android-10.0 branch updates

Change-Id: I40bbb5d61fb021a959bafddb0c3816a39884f442
---
 gui/theme/common/landscape.xml | 204 +++++++++++++++++++--------------
 gui/theme/common/portrait.xml  | 196 +++++++++++++++----------------
 2 files changed, 211 insertions(+), 189 deletions(-)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index daee7f3379..44452b6fa4 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2720,108 +2720,138 @@
 				<text>{@reboot_hdr=Reboot}</text>
 			</text>
 
-			<button style="main_button">
-				<condition var1="tw_reboot_system" var2="1"/>
-				<placement x="%col1_x_left%" y="%row2_y%"/>
-				<text>{@rb_system_btn=System}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="page">reboot_system_routine</action>
-				</actions>
-			</button>
+			<listbox style="advanced_listbox">
+				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%listbox_advanced_height%"/>
 
-			<button style="main_button">
-				<condition var1="tw_reboot_poweroff" var2="1"/>
-				<placement x="%center_x%" y="%row2_y%"/>
-				<text>{@rb_poweroff_btn=Power Off}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=poweroff</action>
-					<action function="set">tw_reboot_param=poweroff</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_ospo=sure you wish to power off?}</action>
-					<action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
-					<action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
-					<action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
-					<action function="page">rebootcheck</action>
-				</actions>
-			</button>
+				<listitem name="{@rb_system_btn=System}">
+					<condition var1="tw_reboot_system" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="page">reboot_system_routine</action>
+					</actions>
+				</listitem>
 
-			<button style="main_button">
-				<condition var1="tw_reboot_recovery" var2="1"/>
-				<placement x="%col1_x_left%" y="%row6a_y%"/>
-				<text>{@rb_recovery_btn=Recovery}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=recovery</action>
-					<action function="set">tw_reboot_param=recovery</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
-					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
-					<action function="page">rebootcheck</action>
-				</actions>
-			</button>
+				<listitem name="{@rb_poweroff_btn=Power Off}">
+					<condition var1="tw_reboot_poweroff" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=poweroff</action>
+						<action function="set">tw_reboot_param=poweroff</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_ospo=sure you wish to power off?}</action>
+						<action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
+						<action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
+						<action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</listitem>
 
-			<button style="main_button">
-				<condition var1="tw_reboot_bootloader" var2="1"/>
-				<placement x="%center_x%" y="%row6a_y%"/>
-				<text>{@rb_bootloader_btn=Bootloader}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=bootloader</action>
-					<action function="set">tw_reboot_param=bootloader</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
-					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
-					<action function="page">rebootcheck</action>
-				</actions>
-			</button>
+				<listitem name="{@rb_recovery_btn=Recovery}">
+					<condition var1="tw_reboot_recovery" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=recovery</action>
+						<action function="set">tw_reboot_param=recovery</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+						<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</listitem>
+
+				<listitem name="{@rb_bootloader_btn=Bootloader}">
+					<condition var1="tw_reboot_bootloader" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=bootloader</action>
+						<action function="set">tw_reboot_param=bootloader</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+						<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</listitem>
+
+				<listitem name="{@rb_download_btn=Download}">
+					<condition var1="tw_download_mode" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=download</action>
+						<action function="set">tw_reboot_param=download</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+						<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</listitem>
+
+				<listitem name="{@rb_edl_btn=Edl}">
+					<condition var1="tw_edl_mode" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=edl</action>
+						<action function="set">tw_reboot_param=edl</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+						<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</button>
+			</listbox>
+
+			<text style="text_m">
+				<condition var1="tw_has_boot_slots" var2="1"/>
+				<placement x="%center_x%" y="%row14_y%" placement="5"/>
+				<text>{@current_boot_slot=Current Slot: %tw_active_slot%}</text>
+			</text>
 
 			<button style="main_button">
-				<condition var1="tw_download_mode" var2="1"/>
-				<placement x="%col1_x_left%" y="%row11_y%"/>
-				<text>{@rb_download_btn=Download}</text>
+				<condition var1="tw_has_boot_slots" var2="1"/>
+				<placement x="%indent%" y="%row16_y%"/>
+				<text>{@boot_slot_a=Slot A}</text>
 				<actions>
 					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=download</action>
-					<action function="set">tw_reboot_param=download</action>
+					<action function="set">tw_action=setbootslot</action>
+					<action function="set">tw_action_param=A</action>
 					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
-					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
-					<action function="page">rebootcheck</action>
+					<action function="set">tw_action_text1={@changing_boot_slot=Changing Boot Slot}</action>
+					<action function="set">tw_action_text2=</action>
+					<action function="set">tw_complete_text1={@changing_boot_slot_complete=Change Boot Slot Complete}</action>
+					<action function="page">action_page</action>
 				</actions>
 			</button>
 
 			<button style="main_button">
-				<condition var1="tw_edl_mode" var2="1"/>
-				<placement x="%center_x%" y="%row11_y%"/>
-				<text>{@rb_edl_btn=Edl}</text>
+				<condition var1="tw_has_boot_slots" var2="1"/>
+				<placement x="%center_x%" y="%row16_y%"/>
+				<text>{@boot_slot_b=Slot B}</text>
 				<actions>
 					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=edl</action>
-					<action function="set">tw_reboot_param=edl</action>
+					<action function="set">tw_action=setbootslot</action>
+					<action function="set">tw_action_param=B</action>
 					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
-					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
-					<action function="page">rebootcheck</action>
+					<action function="set">tw_action_text1={@changing_boot_slot=Changing Boot Slot}</action>
+					<action function="set">tw_action_text2=</action>
+					<action function="set">tw_complete_text1={@changing_boot_slot_complete=Change Boot Slot Complete}</action>
+					<action function="page">action_page</action>
 				</actions>
 			</button>
 
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index bead7e619e..f24edbaea0 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2876,118 +2876,110 @@
 				<text>{@reboot_hdr=Reboot}</text>
 			</text>
 
-			<button style="main_button">
-				<condition var1="tw_reboot_system" var2="1"/>
-				<placement x="%indent%" y="%row2a_y%"/>
-				<text>{@rb_system_btn=System}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="page">reboot_system_routine</action>
-				</actions>
-			</button>
+			<listbox style="advanced_listbox">
+				<placement x="%indent%" y="%row2a_y%" w="%content_width%" h="%listbox_advanced_height%"/>
 
-			<button style="main_button">
-				<condition var1="tw_reboot_poweroff" var2="1"/>
-				<placement x="%center_x%" y="%row2a_y%"/>
-				<text>{@rb_poweroff_btn=Power Off}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=poweroff</action>
-					<action function="set">tw_reboot_param=poweroff</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_ospo=sure you wish to power off?}</action>
-					<action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
-					<action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
-					<action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
-					<action function="page">rebootcheck</action>
-				</actions>
-			</button>
+				<listitem name="{@rb_system_btn=System}">
+					<condition var1="tw_reboot_system" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="page">reboot_system_routine</action>
+					</actions>
+				</listitem>
 
-			<button style="main_button">
-				<condition var1="tw_reboot_recovery" var2="1"/>
-				<placement x="%indent%" y="%row8_y%"/>
-				<text>{@rb_recovery_btn=Recovery}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=recovery</action>
-					<action function="set">tw_reboot_param=recovery</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
-					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
-					<action function="page">rebootcheck</action>
-				</actions>
-			</button>
+				<listitem name="{@rb_poweroff_btn=Power Off}">
+					<condition var1="tw_reboot_poweroff" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=poweroff</action>
+						<action function="set">tw_reboot_param=poweroff</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_ospo=sure you wish to power off?}</action>
+						<action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
+						<action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
+						<action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</listitem>
 
-			<button style="main_button">
-				<condition var1="tw_reboot_bootloader" var2="1"/>
-				<placement x="%center_x%" y="%row8_y%"/>
-				<text>{@rb_bootloader_btn=Bootloader}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=bootloader</action>
-					<action function="set">tw_reboot_param=bootloader</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
-					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
-					<action function="page">rebootcheck</action>
-				</actions>
-			</button>
+				<listitem name="{@rb_recovery_btn=Recovery}">
+					<condition var1="tw_reboot_recovery" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=recovery</action>
+						<action function="set">tw_reboot_param=recovery</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+						<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</listitem>
 
-			<button style="main_button">
-				<condition var1="tw_download_mode" var2="1"/>
-				<placement x="%indent%" y="%row13a_y%"/>
-				<text>{@rb_download_btn=Download}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=download</action>
-					<action function="set">tw_reboot_param=download</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
-					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
-					<action function="page">rebootcheck</action>
-				</actions>
-			</button>
+				<listitem name="{@rb_bootloader_btn=Bootloader}">
+					<condition var1="tw_reboot_bootloader" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=bootloader</action>
+						<action function="set">tw_reboot_param=bootloader</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+						<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</listitem>
 
-			<button style="main_button">
-				<condition var1="tw_edl_mode" var2="1"/>
-				<placement x="%center_x%" y="%row13a_y%"/>
-				<text>{@rb_edl_btn=Edl}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=edl</action>
-					<action function="set">tw_reboot_param=edl</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
-					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
-					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
-					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
-					<action function="page">rebootcheck</action>
-				</actions>
-			</button>
+				<listitem name="{@rb_download_btn=Download}">
+					<condition var1="tw_download_mode" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=download</action>
+						<action function="set">tw_reboot_param=download</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+						<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</listitem>
+
+				<listitem name="{@rb_edl_btn=Edl}">
+					<condition var1="tw_edl_mode" var2="1"/>
+					<actions>
+						<action function="set">tw_back=reboot</action>
+						<action function="set">tw_action=reboot</action>
+						<action function="set">tw_action_param=edl</action>
+						<action function="set">tw_reboot_param=edl</action>
+						<action function="set">tw_has_action2=0</action>
+						<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+						<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
+						<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
+						<action function="page">rebootcheck</action>
+					</actions>
+				</button>
+			</listbox>
 
 			<text style="text_m">
 				<condition var1="tw_has_boot_slots" var2="1"/>
-				<placement x="%center_x%" y="%row18_y%" placement="5"/>
+				<placement x="%center_x%" y="%row15_y%" placement="5"/>
 				<text>{@current_boot_slot=Current Slot: %tw_active_slot%}</text>
 			</text>
 
-			<button style="main_button">
+			<button style="main_button_half_height">
 				<condition var1="tw_has_boot_slots" var2="1"/>
 				<placement x="%indent%" y="%row19_y%"/>
 				<text>{@boot_slot_a=Slot A}</text>
@@ -3003,7 +2995,7 @@
 				</actions>
 			</button>
 
-			<button style="main_button">
+			<button style="main_button_half_height">
 				<condition var1="tw_has_boot_slots" var2="1"/>
 				<placement x="%center_x%" y="%row19_y%"/>
 				<text>{@boot_slot_b=Slot B}</text>

From 268091de56e073c2799d5c825ba78cc7822240d6 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 22 Oct 2020 09:33:29 -0400
Subject: [PATCH 115/207] gui: bump theme version to 4

updates to reboot page (change to listbox)

Change-Id: I02331693ca9a407e0bd30c633f2b799ece7b3636
---
 gui/pages.cpp                       | 3 ++-
 gui/theme/landscape_hdpi/splash.xml | 2 +-
 gui/theme/landscape_hdpi/ui.xml     | 2 +-
 gui/theme/landscape_mdpi/splash.xml | 2 +-
 gui/theme/landscape_mdpi/ui.xml     | 2 +-
 gui/theme/portrait_hdpi/splash.xml  | 2 +-
 gui/theme/portrait_hdpi/ui.xml      | 2 +-
 gui/theme/portrait_mdpi/splash.xml  | 2 +-
 gui/theme/portrait_mdpi/ui.xml      | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/gui/pages.cpp b/gui/pages.cpp
index fd0ad9bf38..366bc39363 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -57,7 +57,8 @@ extern "C" {
 #include "blanktimer.hpp"
 
 // version 2 requires theme to handle power button as action togglebacklight
-#define TW_THEME_VERSION 3
+// version 4 adds listbox support to reboot page
+#define TW_THEME_VERSION 4
 
 #define TW_THEME_VER_ERR -2
 
diff --git a/gui/theme/landscape_hdpi/splash.xml b/gui/theme/landscape_hdpi/splash.xml
index d01c66aadc..b9d785362e 100644
--- a/gui/theme/landscape_hdpi/splash.xml
+++ b/gui/theme/landscape_hdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>3</themeversion>
+		<themeversion>4</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index 6e746a0dd6..5357f5bf70 100755
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -6,7 +6,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>3</themeversion>
+		<themeversion>4</themeversion>
 	</details>
 
 	<include>
diff --git a/gui/theme/landscape_mdpi/splash.xml b/gui/theme/landscape_mdpi/splash.xml
index 74b6d177a6..a2098fbba0 100644
--- a/gui/theme/landscape_mdpi/splash.xml
+++ b/gui/theme/landscape_mdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>3</themeversion>
+		<themeversion>4</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index 24458ec616..3a4126258c 100755
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -6,7 +6,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>3</themeversion>
+		<themeversion>4</themeversion>
 	</details>
 
 	<include>
diff --git a/gui/theme/portrait_hdpi/splash.xml b/gui/theme/portrait_hdpi/splash.xml
index b04baa47ef..f0b0756840 100644
--- a/gui/theme/portrait_hdpi/splash.xml
+++ b/gui/theme/portrait_hdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>3</themeversion>
+		<themeversion>4</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index f9ce5b09dc..abb1960c5a 100644
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -6,7 +6,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>3</themeversion>
+		<themeversion>4</themeversion>
 	</details>
 
 	<include>
diff --git a/gui/theme/portrait_mdpi/splash.xml b/gui/theme/portrait_mdpi/splash.xml
index f8c695fdf9..4ce64b3577 100644
--- a/gui/theme/portrait_mdpi/splash.xml
+++ b/gui/theme/portrait_mdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>3</themeversion>
+		<themeversion>4</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index 8b91641ec8..3de99ceea2 100755
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -6,7 +6,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>3</themeversion>
+		<themeversion>4</themeversion>
 	</details>
 
 	<include>

From cbd4e0c383edfcc5451534a2f736e9cb031f58d8 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Thu, 17 Dec 2020 14:51:50 -0600
Subject: [PATCH 116/207] Remove TWRP app prompt from reboot flow

Add option to install TWRP app as a list menu item on the
advanced page and as a button on the reboot page (except for
watch theme). Now when a user reboots the device, they no longer
will be prompted to install the TWRP app, which interrupts the
flow of rebooting the device.

Change-Id: I00559d0be6e7d0b00d469a5960e4b14e32a3fc5f
---
 gui/theme/common/landscape.xml    | 84 +++++++++++++++----------------
 gui/theme/common/languages/en.xml |  2 +-
 gui/theme/common/portrait.xml     | 82 +++++++++++++++---------------
 gui/theme/common/watch.xml        | 75 ++++++++++++++-------------
 4 files changed, 121 insertions(+), 122 deletions(-)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 44452b6fa4..62a1191a3b 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -1015,7 +1015,7 @@
 		<page name="rebootcheck">
 			<action>
 				<condition var1="tw_backup_system_size" op="&gt;=" var2="%tw_min_system%"/>
-				<action function="page">appcheck</action>
+				<action function="reboot">%tw_reboot_param%</action>
 			</action>
 
 			<action>
@@ -1024,28 +1024,6 @@
 			</action>
 		</page>
 
-		<page name="appcheck">
-			<action>
-				<condition var1="tw_app_prompt" var2="1"/>
-				<action function="checkforapp"></action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_prompt" op="!=" var2="1"/>
-				<action function="reboot">%tw_reboot_param%</action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_install_status" var2="1"/>
-				<action function="page">rebootapp</action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_install_status" var2="2"/>
-				<action function="reboot">%tw_reboot_param%</action>
-			</action>
-		</page>
-
 		<page name="wipe">
 			<template name="page"/>
 
@@ -2713,6 +2691,13 @@
 		</page>
 
 		<page name="reboot">
+			<action>
+				<action function="checkforapp"></action>
+				<action function="page">reboot2</action>
+			</action>
+		</page>
+
+		<page name="reboot2">
 			<template name="page"/>
 
 			<text style="text_l">
@@ -2817,9 +2802,20 @@
 				</button>
 			</listbox>
 
+			<button style="main_button">
+				<condition var1="tw_app_install_status" var2="1"/>
+				<placement x="%center_x%" y="%row12_y%"/>
+				<text>{@reboot_install_app_hdr=Install TWRP App}</text>
+				<actions>
+					<action function="set">tw_back=reboot</action>
+					<action function="set">tw_appinstall_title={@reboot_hdr=Reboot}</action>
+					<action function="page">installapp</action>
+				</actions>
+			</button>
+
 			<text style="text_m">
 				<condition var1="tw_has_boot_slots" var2="1"/>
-				<placement x="%center_x%" y="%row14_y%" placement="5"/>
+				<placement x="%col1_x_header%" y="%row14_y%"/>
 				<text>{@current_boot_slot=Current Slot: %tw_active_slot%}</text>
 			</text>
 
@@ -2866,17 +2862,17 @@
 			</action>
 		</page>
 
-		<page name="rebootapp">
+		<page name="installapp">
 			<template name="page"/>
 
 			<text style="text_l">
 				<placement x="%col1_x_header%" y="%row3_header_y%"/>
-				<text>{@reboot_hdr=Reboot}</text>
+				<text>%tw_appinstall_title%</text>
 			</text>
 
 			<text style="text_m">
 				<placement x="%col1_x_header%" y="%row4_header_y%"/>
-				<text>{@reboot_install_app_hdr=Install TWRP App?}</text>
+				<text>{@reboot_install_app_hdr=Install TWRP App}</text>
 			</text>
 
 			<text style="text_m_accent">
@@ -2889,12 +2885,6 @@
 				<text>{@reboot_install_app2=The app can check for new TWRP versions.}</text>
 			</text>
 
-			<checkbox>
-				<placement x="%indent%" y="%row5_y%"/>
-				<text>{@reboot_install_app_prompt_install=Prompt to install TWRP app if not installed}</text>
-				<data variable="tw_app_prompt"/>
-			</checkbox>
-
 			<checkbox>
 				<condition var1="tw_mount_system_ro" var2="0"/>
 				<placement x="%indent%" y="%row7_y%"/>
@@ -2905,20 +2895,16 @@
 			<button style="main_button_half_width">
 				<placement x="%col2_x_left%" y="%row15a_y%"/>
 				<text>{@install_cancel=Do not Install}</text>
-				<action function="reboot">%tw_reboot_param%</action>
+				<action function="page">%tw_back%</action>
 			</button>
 
 			<slider>
 				<text>{@swipe_to_install_app=Swipe to Install TWRP App}</text>
 				<actions>
-					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=installapp</action>
 					<action function="set">tw_action_text1={@reboot_installing_app=Installing App...}</action>
 					<action function="set">tw_action_text2=</action>
-					<action function="set">tw_has_action2=1</action>
-					<action function="set">tw_action2=reboot</action>
-					<action function="set">tw_action2_param=%tw_reboot_param%</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+					<action function="set">tw_complete_text1={@successful=Successful}</action>
 					<action function="page">action_page</action>
 				</actions>
 			</slider>
@@ -2935,7 +2921,7 @@
 				<touch key="back"/>
 				<actions>
 					<action function="set">tw_app_install_status=0</action>
-					<action function="page">reboot</action>
+					<action function="page">%tw_back%</action>
 				</actions>
 			</action>
 		</page>
@@ -3044,9 +3030,6 @@
 				<listitem name="{@use24clock_chk=Use 24-hour clock}">
 					<data variable="tw_military_time"/>
 				</listitem>
-				<listitem name="{@reboot_install_app_prompt_install=Prompt to install TWRP app on every reboot}">
-					<data variable="tw_app_prompt"/>
-				</listitem>
 				<listitem name="{@simact_chk=Simulate actions for theme testing}">
 					<data variable="tw_simulate_actions"/>
 				</listitem>
@@ -3459,6 +3442,13 @@
 		</page>
 
 		<page name="advanced">
+			<action>
+				<action function="checkforapp"></action>
+				<action function="page">advanced1</action>
+			</action>
+		</page>
+
+		<page name="advanced1">
 			<template name="page"/>
 
 			<text style="text_l">
@@ -3567,6 +3557,14 @@
 						<action function="page">confirm_action</action>
 					</actions>
 				</listitem>
+				<listitem name="{@reboot_install_app_hdr=Install TWRP App}">
+					<condition var1="tw_app_install_status" var2="1"/>
+					<actions>
+						<action function="set">tw_back=advanced</action>
+						<action function="set">tw_appinstall_title={@advanced_hdr=Advanced}</action>
+						<action function="page">installapp</action>
+					</actions>
+				</listitem>
 				<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
 					<condition var1="tw_app_installed_in_system" var2="1"/>
 					<actions>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index f3a31ce14c..6432524133 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -119,7 +119,7 @@
 		<string name="rebooting">Rebooting...</string>
 		<string name="swipe_reboot">Swipe to Reboot</string>
 		<string name="swipe_reboot_s">   Reboot</string>
-		<string name="reboot_install_app_hdr">Install TWRP App?</string>
+		<string name="reboot_install_app_hdr">Install TWRP App</string>
 		<string name="reboot_install_app1">Would you like to install the Official TWRP App?</string>
 		<string name="reboot_install_app2">The app can check for new TWRP versions.</string>
 		<string name="reboot_install_app_prompt_install">Prompt to install TWRP app if not installed</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index f24edbaea0..711139f410 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -966,7 +966,7 @@
 		<page name="rebootcheck">
 			<action>
 				<condition var1="tw_backup_system_size" op="&gt;=" var2="%tw_min_system%"/>
-				<action function="page">appcheck</action>
+				<action function="reboot">%tw_reboot_param%</action>
 			</action>
 
 			<action>
@@ -975,28 +975,6 @@
 			</action>
 		</page>
 
-		<page name="appcheck">
-			<action>
-				<condition var1="tw_app_prompt" var2="1"/>
-				<action function="checkforapp"></action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_prompt" op="!=" var2="1"/>
-				<action function="reboot">%tw_reboot_param%</action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_install_status" var2="1"/>
-				<action function="page">rebootapp</action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_install_status" var2="2"/>
-				<action function="reboot">%tw_reboot_param%</action>
-			</action>
-		</page>
-
 		<page name="wipe">
 			<template name="page"/>
 
@@ -2869,6 +2847,13 @@
 		</page>
 
 		<page name="reboot">
+			<action>
+				<action function="checkforapp"></action>
+				<action function="page">reboot2</action>
+			</action>
+		</page>
+
+		<page name="reboot2">
 			<template name="page"/>
 
 			<text style="text_l">
@@ -3011,6 +2996,17 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_height">
+				<condition var1="tw_app_install_status" var2="1"/>
+				<placement x="%indent%" y="%row22_y%"/>
+				<text>{@reboot_install_app_hdr=Install TWRP App}</text>
+				<actions>
+					<action function="set">tw_back=reboot</action>
+					<action function="set">tw_appinstall_title={@reboot_hdr=Reboot}</action>
+					<action function="page">installapp</action>
+				</actions>
+			</button>
+
 			<action>
 				<touch key="home"/>
 				<action function="page">main</action>
@@ -3022,17 +3018,17 @@
 			</action>
 		</page>
 
-		<page name="rebootapp">
+		<page name="installapp">
 			<template name="page"/>
 
 			<text style="text_l">
 				<placement x="%col1_x_header%" y="%row3_header_y%"/>
-				<text>{@reboot_hdr=Reboot}</text>
+				<text>%tw_appinstall_title%</text>
 			</text>
 
 			<text style="text_m">
 				<placement x="%col1_x_header%" y="%row4_header_y%"/>
-				<text>{@reboot_install_app_hdr=Install TWRP App?}</text>
+				<text>{@reboot_install_app_hdr=Install TWRP App}</text>
 			</text>
 
 			<text style="text_m_accent">
@@ -3045,12 +3041,6 @@
 				<text>{@reboot_install_app2=The app can check for new TWRP versions.}</text>
 			</text>
 
-			<checkbox>
-				<placement x="%indent%" y="%row5_y%"/>
-				<text>{@reboot_install_app_prompt_install=Prompt to install TWRP app if not installed}</text>
-				<data variable="tw_app_prompt"/>
-			</checkbox>
-
 			<checkbox>
 				<condition var1="tw_mount_system_ro" var2="0"/>
 				<placement x="%indent%" y="%row7_y%"/>
@@ -3061,20 +3051,16 @@
 			<button style="main_button_half_height">
 				<placement x="%indent%" y="%row16_y%"/>
 				<text>{@install_cancel=Do not Install}</text>
-				<action function="reboot">%tw_reboot_param%</action>
+				<action function="page">%tw_back%</action>
 			</button>
 
 			<slider>
 				<text>{@swipe_to_install_app=Swipe to Install TWRP App}</text>
 				<actions>
-					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=installapp</action>
 					<action function="set">tw_action_text1={@reboot_installing_app=Installing App...}</action>
 					<action function="set">tw_action_text2=</action>
-					<action function="set">tw_has_action2=1</action>
-					<action function="set">tw_action2=reboot</action>
-					<action function="set">tw_action2_param=%tw_reboot_param%</action>
-					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+					<action function="set">tw_complete_text1={@successful=Successful}</action>
 					<action function="page">action_page</action>
 				</actions>
 			</slider>
@@ -3091,7 +3077,7 @@
 				<touch key="back"/>
 				<actions>
 					<action function="set">tw_app_install_status=0</action>
-					<action function="page">reboot</action>
+					<action function="page">%tw_back%</action>
 				</actions>
 			</action>
 		</page>
@@ -3218,9 +3204,6 @@
 				<listitem name="{@rev_navbar_chk=Reversed navbar layout}">
 					<data variable="tw_samsung_navbar"/>
 				</listitem>
-				<listitem name="{@reboot_install_app_prompt_install=Prompt to install TWRP app on every reboot}">
-					<data variable="tw_app_prompt"/>
-				</listitem>
 				<listitem name="{@simact_chk=Simulate actions for theme testing}">
 					<data variable="tw_simulate_actions"/>
 				</listitem>
@@ -3580,6 +3563,13 @@
 		</page>
 
 		<page name="advanced">
+			<action>
+				<action function="checkforapp"></action>
+				<action function="page">advanced1</action>
+			</action>
+		</page>
+
+		<page name="advanced1">
 			<template name="page"/>
 
 			<text style="text_l">
@@ -3689,6 +3679,14 @@
 						<action function="page">confirm_action</action>
 					</actions>
 				</listitem>
+				<listitem name="{@reboot_install_app_hdr=Install TWRP App}">
+					<condition var1="tw_app_install_status" var2="1"/>
+					<actions>
+						<action function="set">tw_back=advanced</action>
+						<action function="set">tw_appinstall_title={@advanced_hdr=Advanced}</action>
+						<action function="page">installapp</action>
+					</actions>
+				</listitem>
 				<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
 					<condition var1="tw_app_installed_in_system" var2="1"/>
 					<actions>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 74212030d0..d76a1d3fac 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -1234,7 +1234,7 @@
 		<page name="rebootcheck">
 			<action>
 				<condition var1="tw_backup_system_size" op="&gt;=" var2="%tw_min_system%"/>
-				<action function="page">appcheck</action>
+				<action function="reboot">%tw_reboot_param%</action>
 			</action>
 
 			<action>
@@ -1243,28 +1243,6 @@
 			</action>
 		</page>
 
-		<page name="appcheck">
-			<action>
-				<condition var1="tw_app_prompt" var2="1"/>
-				<action function="checkforapp"></action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_prompt" op="!=" var2="1"/>
-				<action function="reboot">%tw_reboot_param%</action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_install_status" var2="1"/>
-				<action function="page">rebootapp</action>
-			</action>
-
-			<action>
-				<condition var1="tw_app_install_status" var2="2"/>
-				<action function="reboot">%tw_reboot_param%</action>
-			</action>
-		</page>
-
 		<page name="wipe_type1">
 			<template name="page"/>
 
@@ -3365,6 +3343,13 @@
 		</page>
 
 		<page name="reboot">
+			<action>
+				<action function="checkforapp"></action>
+				<action function="page">reboot2</action>
+			</action>
+		</page>
+
+		<page name="reboot2">
 			<template name="page"/>
 
 			<template name="statusbar"/>
@@ -3459,6 +3444,7 @@
 					<action function="page">rebootcheck</action>
 				</actions>
 			</button>
+
 			<button style="main_button">
 				<condition var1="tw_edl_mode" var2="1"/>
 				<placement x="%col1_x_right%" y="%row11_y%"/>
@@ -3489,14 +3475,14 @@
 			</action>
 		</page>
 
-		<page name="rebootapp">
+		<page name="installapp">
 			<template name="page"/>
 
 			<template name="statusbar"/>
 
 			<text style="text_m">
 				<placement x="%col1_x_left%" y="%row1_header_y%"/>
-				<text>{@reboot_hdr=Reboot} &gt; {@reboot_install_app_hdr=Install TWRP App?}</text>
+				<text>%tw_appinstall_title% &gt; {@reboot_install_app_hdr=Install TWRP App}</text>
 			</text>
 
 			<text style="text_m_accent">
@@ -3509,12 +3495,6 @@
 				<text>{@reboot_install_app2=The app can check for new TWRP versions.}</text>
 			</text>
 
-			<checkbox>
-				<placement x="%indent%" y="%row3_y%"/>
-				<text>{@reboot_install_app_prompt_install=Prompt to install TWRP app if not installed}</text>
-				<data variable="tw_app_prompt"/>
-			</checkbox>
-
 			<checkbox>
 				<condition var1="tw_mount_system_ro" var2="0"/>
 				<placement x="%indent%" y="%row5_y%"/>
@@ -3525,9 +3505,20 @@
 			<button style="main_button_half_height">
 				<placement x="%indent%" y="%row7_y%"/>
 				<text>{@install_cancel=Do not Install}</text>
-				<action function="reboot">%tw_reboot_param%</action>
+				<action function="page">%tw_back%</action>
 			</button>
 
+			<slider>
+				<text>{@swipe_confirm=   Confirm}</text>
+				<actions>
+					<action function="set">tw_action=installapp</action>
+					<action function="set">tw_action_text1={@reboot_installing_app=Installing App...}</action>
+					<action function="set">tw_action_text2=</action>
+					<action function="set">tw_complete_text1={@successful=Successful}</action>
+					<action function="page">action_page</action>
+				</actions>
+			</slider>
+
 			<action>
 				<touch key="home"/>
 				<actions>
@@ -3540,7 +3531,7 @@
 				<touch key="back"/>
 				<actions>
 					<action function="set">tw_app_install_status=0</action>
-					<action function="page">reboot</action>
+					<action function="page">%tw_back%</action>
 				</actions>
 			</action>
 		</page>
@@ -3716,9 +3707,6 @@
 				<listitem name="{@use24clock_chk=Use 24-hour clock}">
 					<data variable="tw_military_time"/>
 				</listitem>
-				<listitem name="{@reboot_install_app_prompt_install=Prompt to install TWRP app on every reboot}">
-					<data variable="tw_app_prompt"/>
-				</listitem>
 				<listitem name="{@simact_chk=Simulate actions for theme testing}">
 					<data variable="tw_simulate_actions"/>
 				</listitem>
@@ -4226,6 +4214,13 @@
 		</page>
 
 		<page name="advanced2">
+			<action>
+				<action function="checkforapp"></action>
+				<action function="page">advanced3</action>
+			</action>
+		</page>
+
+		<page name="advanced3">
 			<template name="page"/>
 
 			<template name="statusbar"/>
@@ -4308,6 +4303,14 @@
 						<action function="page">confirm_action</action>
 					</actions>
 				</listitem>
+				<listitem name="{@reboot_install_app_hdr=Install TWRP App}">
+					<condition var1="tw_app_install_status" var2="1"/>
+					<actions>
+						<action function="set">tw_back=advanced2</action>
+						<action function="set">tw_appinstall_title={@advanced_hdr=Advanced}</action>
+						<action function="page">installapp</action>
+					</actions>
+				</listitem>
 				<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
 					<condition var1="tw_app_installed_in_system" var2="1"/>
 					<actions>

From cc9746b35751e42e208927004e6ed406f5a84d1c Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Mon, 21 Dec 2020 11:28:34 -0500
Subject: [PATCH 117/207] twrpapp: restore system mount to previous state

The current function to check for the existence of the TWRP app
in system unconditionally unmounts system once the check is
complete. Since the TWRP app check now occurs more frequently since
change 70e0a397e00c605cf7b01a5f5ce027dea84f1a14, system is now
getting unmounted every time the Advanced menu is entered, which
is undesirable if it was mounted in order to perform tasks from that
menu.

This patch first checks the state of the system mount point, and
once the check is complete, either unmounts system or leaves it
mounted, based on the initial state.

Change-Id: I7ad1f3e4e6cf3579134f1a9c5468ad90a142feae
---
 twrp-functions.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 2ac4c956b2..82af082bf3 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1304,22 +1304,26 @@ 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;
-		}
+	bool is_system_mounted = true;
+	if(!PartitionManager.Is_Mounted_By_Path(PartitionManager.Get_Android_Root_Path())) {
+		is_system_mounted = false;
+		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;
 	}
+	if (!is_system_mounted)
+		PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), false);
 	DataManager::SetValue("tw_app_installed_in_system", 0);
-	PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), false);
 	return false;
 }
 

From 4165cc6623f8938f0957f0c440fa9197bb9d20a9 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 5 Nov 2020 13:44:56 -0500
Subject: [PATCH 118/207] logd: add event-log-tags and include in build

Change-Id: I5e440f7c95ff6ef8a8ce70dd31867a9c49630ac6
---
 Android.mk | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 2725a0bbed..57c3003328 100755
--- a/Android.mk
+++ b/Android.mk
@@ -455,7 +455,7 @@ else
 endif
 ifneq ($(TW_USE_TOOLBOX), true)
     ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0)
-        LOCAL_POST_INSTALL_CMD := \
+        LOCAL_POST_INSTALL_CMD += \
             $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin && \
             ln -sf /sbin/busybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh
     endif
@@ -510,7 +510,16 @@ endif
 ifeq ($(TWRP_INCLUDE_LOGCAT), true)
     TWRP_REQUIRED_MODULES += logcat
     ifeq ($(TARGET_USES_LOGD), true)
-        TWRP_REQUIRED_MODULES += logd libsysutils libnl init.recovery.logd.rc
+        TWRP_REQUIRED_MODULES += logd libsysutils libnl event-log-tags init.recovery.logd.rc
+        ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+            LOCAL_POST_INSTALL_CMD += \
+                $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc; \
+                cp $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/;
+        else
+            LOCAL_POST_INSTALL_CMD += \
+                $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc; \
+                cp $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
+        endif
     endif
 endif
 # Allow devices to specify device-specific recovery dependencies
@@ -579,7 +588,7 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
 else
     LOCAL_ADDITIONAL_DEPENDENCIES := file_contexts.bin
 endif
-LOCAL_POST_INSTALL_CMD := \
+LOCAL_POST_INSTALL_CMD += \
     $(hide) cp -f $(PRODUCT_OUT)/obj/ETC/file_contexts.bin_intermediates/file_contexts.concat.tmp $(TARGET_RECOVERY_ROOT_OUT)/file_contexts
 
 include $(BUILD_PHONY_PACKAGE)

From e931e74a9dd6e24c5c243d545d2fcf3731c6d6f5 Mon Sep 17 00:00:00 2001
From: f2065 <f2065@gerrit.twrp.me>
Date: Wed, 23 Dec 2020 20:10:09 +0000
Subject: [PATCH 119/207] Updated Russian localization

Change-Id: I803c6b90f5e011ab2c3ebf906736b9914f488a55
---
 gui/theme/common/languages/ru.xml | 86 ++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 31 deletions(-)

diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index 284e45fab6..6e46b5e515 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -62,10 +62,10 @@
 		<string name="files_btn">Файлы</string>
 		<string name="copy_log_btn">Копировать лог</string>
 		<string name="select_type_hdr">Выбор типа</string>
-		<string name="install_zip_hdr">Установка Zip</string>
-		<string name="install_zip_btn">Установка Zip</string>
-		<string name="install_image_hdr">Установка Img-образа</string>
-		<string name="install_image_btn">Установка Img</string>
+		<string name="install_zip_hdr">Установка ZIP</string>
+		<string name="install_zip_btn">Установка ZIP</string>
+		<string name="install_image_hdr">Установка IMG-образа</string>
+		<string name="install_image_btn">Установка IMG</string>
 		<string name="install_select_file_hdr">Выбор файла</string>
 		<string name="file_selector_folders_hdr">Папки</string>
 		<string name="select_file_from_storage">Текущий накопитель: %tw_storage_display_name% (%tw_storage_free_size% МБ)</string>
@@ -78,11 +78,11 @@
 		<string name="zip_queue_count_s">Файл %tw_zip_queue_count% из 10:</string>
 		<string name="zip_warn1">Эта операция может установить несовместимое ПО на</string>
 		<string name="zip_warn2">ваше устройство и сделать загрузку системы невозможной.</string>
-		<string name="zip_back_cancel">Нажмите назад для отмены установки этого zip.</string>
+		<string name="zip_back_cancel">Нажмите назад для отмены установки этого ZIP.</string>
 		<string name="zip_back_clear">Нажмите назад для очистки очереди.</string>
 		<string name="folder">Папка:</string>
 		<string name="file">Файл:</string>
-		<string name="zip_sig_chk">Проверка подписи Zip</string>
+		<string name="zip_sig_chk">Проверка подписи ZIP</string>
 		<string name="inject_twrp_chk">Интегрировать TWRP после установки</string>
 		<string name="install_reboot_chk">Автоматическая перезагрузка после установки</string>
 		<string name="options_hdr">Опции</string>
@@ -90,10 +90,10 @@
 		<string name="zip_queue">Очередь:</string>
 		<string name="options">Опции:</string>
 		<string name="swipe_confirm">   Подтвердить</string>
-		<string name="zip_add_btn">Добавить ещё Zip</string>
-		<string name="zip_clear_btn">Очистить очередь Zip</string>
-		<string name="install_zip_count_hdr">Установка Zip %tw_zip_index% из %tw_zip_queue_count%</string>
-		<string name="installing_zip_xml">Установка Zip: %tw_file%</string>
+		<string name="zip_add_btn">Добавить ещё ZIP</string>
+		<string name="zip_clear_btn">Очистить очередь ZIP</string>
+		<string name="install_zip_count_hdr">Установка ZIP %tw_zip_index% из %tw_zip_queue_count%</string>
+		<string name="installing_zip_xml">Установка ZIP: %tw_file%</string>
 		<string name="failed">Неудача</string>
 		<string name="successful">Успешно</string>
 		<string name="install_failed">Установка не удалась</string>
@@ -109,7 +109,6 @@
 		<string name="wipe_cache_dalvik_confirm">Очистить Cache &amp; Dalvik?</string>
 		<string name="wipe_dalvik_confirm">Очистить Dalvik?</string>
 		<string name="wiping_cache_dalvik">Очистка Cache &amp; Dalvik...</string>
-		<string name="wiping_dalvik">Очистка Dalvik...</string>
 		<string name="wipe_cache_dalvik_complete">Очистка Cache &amp; Dalvik завершена</string>
 		<string name="wipe_dalvik_complete">Очистка Dalvik завершена</string>
 		<string name="swipe_wipe">Свайп для очистки</string>
@@ -120,13 +119,17 @@
 		<string name="rebooting">Перезагрузка...</string>
 		<string name="swipe_reboot">Свайп для перезагрузки</string>
 		<string name="swipe_reboot_s">   Перезагрузка</string>
-		<string name="reboot_install_app_hdr">Установить TWRP App?</string>
+		<string name="reboot_install_app_hdr">Установить TWRP App</string>
 		<string name="reboot_install_app1">Вы хотите установить официальное приложение TWRP?</string>
 		<string name="reboot_install_app2">Оно позволит вам проверять наличие новой версии TWRP.</string>
 		<string name="reboot_install_app_prompt_install">Предлагать установку TWRP App при его отсутствии</string>
 		<string name="reboot_install_app_system">Установить как системное приложение</string>
 		<string name="reboot_installing_app">Установка TWRP приложения...</string>
 		<string name="swipe_to_install_app">Свайп для установки TWRP App</string>
+		<string name="uninstall_twrp_system_app">Удаление TWRP App из системы</string>
+		<string name="uninstall_twrp_system_app_confirm">Удалить TWRP App из системы?</string>
+		<string name="uninstalling_twrp_system_app">Удаление TWRP App из системы...</string>
+		<string name="uninstall_twrp_system_app_complete">Удаление TWRP App из системы завершено</string>
 		<string name="swipe_flash">Свайп для прошивки</string>
 		<string name="confirm_action">Подтвердить действие</string>
 		<string name="back_cancel">Нажмите назад для отмены.</string>
@@ -138,6 +141,7 @@
 		<string name="factory_reset2">(исключая внутреннее хранилище)</string>
 		<string name="factory_reset3">В большинстве случаев очистка</string>
 		<string name="factory_reset4">этих разделов достаточна.</string>
+		<string name="factory_reset5">(исключая аккаунты и экран блокировки)</string>
 		<string name="factory_resetting">Сброс до заводского состояния...</string>
 		<string name="advanced_wipe_hdr">Выборочная очистка</string>
 		<string name="advanced_wipe_btn">Выборочная очистка</string>
@@ -298,11 +302,11 @@
 		<string name="sys_rop2">чтобы сохранить возможность официальных обновлений.</string>
 		<string name="sys_rop3">При этом система сможет вернуть обратно стоковый</string>
 		<string name="sys_rop4">рекавери, а TWRP не будет предлагать установку root.</string>
-		<string name="sys_rop5">Установка zip или работа adb всё равно смогут изменять</string>
+		<string name="sys_rop5">Установка ZIP или работа ADB всё равно смогут изменять</string>
 		<string name="sys_rop6">системный раздел.</string>
 		<string name="sys_rol1">TWRP может оставить системный раздел неизменным, чтобы сохранить возможность официальных обновлений.</string>
 		<string name="sys_rol2">При этом система сможет вернуть обратно стоковый рекавери, а TWRP не будет предлагать установку root.</string>
-		<string name="sys_rol3">Установка zip или работа adb всё равно смогут изменять системный раздел.</string>
+		<string name="sys_rol3">Установка ZIP или работа ADB всё равно смогут изменять системный раздел.</string>
 		<string name="sys_ro_never_show_chk">Больше не показывать это при загрузке</string>
 		<string name="sys_ro_keep_ro_btn">Только для чтения</string>
 		<string name="swipe_allow_mod">Разрешить изменения</string>
@@ -461,7 +465,7 @@
 		<string name="decrypt_data_failed_pattern">Шаблон неверный, попробуйте снова!</string>
 		<string name="decrypt_data_enter_pattern">Введите шаблон.</string>
 		<string name="decrypt_data_trying">Попытка расшифровки</string>
-		<string name="decrypt_data_vold_os_missing">Missing files needed for vold decrypt: {1}</string>
+		<string name="decrypt_data_vold_os_missing">Отсутствуют файлы необходимые для расшифровки vold: {1}</string>
 		<string name="term_hdr">Команда терминала</string>
 		<string name="term_s_hdr">Терминал</string>
 		<string name="term_kill_btn">УБИТЬ</string>
@@ -508,6 +512,19 @@
 		<string name="fix_recovery_loop_complete">Исправление циклической перезагрузки рекавери завершено</string>
 		<string name="fixing_recovery_loop_patch">Патчинг ядра...</string>
 		<string name="fix_recovery_loop_patch_error">Ошибка патчинга ядра.</string>
+		<string name="decrypt_users">Расшифровка пользователей</string>
+		<string name="decrypt_users_selection">Выберите ID пользователя для расшифровки</string>
+		<string name="select_user">Выбор пользователя</string>
+        <string name="backup_storage_undecrypt_warning">В резервную копию не включены некоторые файлы пользователя {1}, потому что пользователь не расшифрован.</string>
+        <string name="decrypting_user_fbe">Попытка расшифровать FBE пользователя {1}...</string>
+		<string name="decrypt_user_success_fbe">Пользователь {1} расшифрован успешно</string>
+		<string name="decrypt_user_fail_fbe">Ошибка расшифровки пользователя {1}</string>
+		<string name="decrypt_data_enter_pass_fbe">Введите пароль пользователя [%tw_crypto_user_id%]</string>
+		<string name="decrypt_data_enter_pattern_fbe">Введите шаблон пользователя [%tw_crypto_user_id%]</string>
+		<string name="multiuser_warning1">Не все пользователи расшифрованы!</string>
+        <string name="multiuser_warning2">Резервное копирование или восстановление могут завершиться неудачно!</string>
+		<string name="multiuser_warning_accept">Всё равно продолжить</string>
+        <string name="multiuser_warning_hdr">Предупреждение о нескольких пользователях</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Чтение SELinux-контекста не поддерживается ядром.</string>
@@ -515,8 +532,8 @@
 		<string name="no_selinux">Отсутствует поддержка SELinux (нет libselinux).</string>
 		<string name="mtp_enabled">MTP Включено</string>
 		<string name="mtp_crash">Сбой MTP: MTP не запущен при загрузке.</string>
-		<string name="decrypt_success">Расшифровка выполнена успешно с паролем по умолчанию.</string>
-		<string name="unable_to_decrypt">Невозможно расшифровать с паролем по умолчанию. Возможно потребуется выполнить форматирование Data.</string>
+		<string name="decrypt_success">Расшифровка выполнена успешно с паролём по умолчанию.</string>
+		<string name="unable_to_decrypt">Невозможно расшифровать с паролём по умолчанию. Возможно потребуется выполнить форматирование Data.</string>
 		<string name="generating_digest1" version="2">Вычисление контрольной суммы</string>
 		<!-- Message displayed during a backup if we are generating an Digest, ideally, leave the leading " * " to help align and separate this text from other console text -->
 		<string name="generating_digest2" version="2"> * Вычисление контрольной суммы...</string>
@@ -559,7 +576,7 @@
 		<string name="unable_find_part_path">Не удаётся найти раздел по пути '{1}'</string>
 		<string name="update_part_details">Обновление информации о разделах...</string>
 		<string name="update_part_details_done">...готово</string>
-
+		<string name="wiping_dalvik">Очистка Dalvik...</string>
 		<string name="cleaned">Очищены: {1}...</string>
 		<string name="cache_dalvik_done">-- Очистка директорий Dalvik Cache завершена!</string>
 		<string name="dalvik_done">-- Очистка директорий Dalvik завершена!</string>
@@ -645,12 +662,12 @@
 		<string name="running_command">Запуск команды</string>
 		<string name="sideload">ADB Sideload</string>
 		<string name="start_sideload">Запуск ADB Sideload...</string>
-		<string name="need_new_adb">Вам необходим adb 1.0.32 или новее для выполнения sideload на этом устр-ве.</string>
+		<string name="need_new_adb">Вам необходим ADB 1.0.32 или новее для выполнения sideload на этом устр-ве.</string>
 		<string name="no_pwd">Не предоставлен пароль.</string>
 		<string name="done_ors">Завершено выполнение файла сценария</string>
 		<string name="injecttwrp">Введение TWRP в образ boot...</string>
-		<string name="zip_err">Ошибка при установке zip файла '{1}'</string>
-		<string name="installing_zip">Установка zip файла '{1}'</string>
+		<string name="zip_err">Ошибка при установке ZIP-файла '{1}'</string>
+		<string name="installing_zip">Установка ZIP-файла '{1}'</string>
 		<string name="select_backup_opt">Установка опций резервного копирования:</string>
 		<string name="compression_on">Сжатие включено</string>
 		<string name="digest_off" version="2">Вычисление контрольных сумм выключено</string>
@@ -661,12 +678,12 @@
 		<string name="running_ors">Выполнение OpenRecoveryScript</string>
 		<string name="ors_complete">OpenRecoveryScript выполнен</string>
 		<string name="check_for_digest" version="2">Проверка файлов контрольных сумм...</string>
-		<string name="invalid_zip_format">Неверный формат zip файла!</string>
+		<string name="invalid_zip_format">Неверный формат ZIP-файла!</string>
 		<string name="fail_sysmap">Не удалось отобразить в память файл '{1}'</string>
-		<string name="verify_zip_sig">Проверка подписи zip...</string>
-		<string name="verify_zip_fail">Подпись Zip не прошла проверку!</string>
-		<string name="verify_zip_done">Подпись Zip проверена успешно.</string>
-		<string name="zip_corrupt">Zip-файл повреждён!</string>
+		<string name="verify_zip_sig">Проверка подписи ZIP...</string>
+		<string name="verify_zip_fail">Подпись ZIP не прошла проверку!</string>
+		<string name="verify_zip_done">Подпись ZIP проверена успешно.</string>
+		<string name="zip_corrupt">ZIP-файл повреждён!</string>
 		<string name="no_digest" version="2">Пропуск проверки контрольной суммы: не найден файл контрольной суммы</string>
 		<string name="digest_fail" version="2">Контрольная сумма не соответствует</string>
 		<string name="digest_match" version="2">Контрольная сумма соответствует</string>
@@ -684,18 +701,18 @@
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">%llu из %llu файлов, %i%%</string>
 		<string name="size_progress">%llu МБ из %llu МБ, %i%%</string>
-		<string name="decrypt_cmd">Попытка расшифровать раздел данных с помощью командной строки.</string>
+		<string name="decrypt_cmd" version="2">Попытка расшифровать раздел данных или пользовательских данных с помощью командной строки.</string>
 		<string name="base_pkg_err">Неудача при загрузке базовых пакетов.</string>
 		<string name="simulating">Имитация действий...</string>
 		<string name="backup_cancel">Резервное копирование отменено</string>
 		<string name="config_twrp">Конфигурирование TWRP...</string>
 		<string name="config_twrp_err">Невозможно сконфигурировать TWRP с этим ядром.</string>
 		<string name="copy_log">recovery.log скопирован в {1}.</string>
-		<string name="max_queue">Максимум zip в очереди достигнут!</string>
-		<string name="min_queue">Минимум zip в очереди достигнут!</string>
+		<string name="max_queue">Максимум ZIP в очереди достигнут!</string>
+		<string name="min_queue">Минимум ZIP в очереди достигнут!</string>
 		<string name="screenshot_saved">Скриншот сохранён в {1}</string>
 		<string name="screenshot_err">Не удалось сделать скриншот!</string>
-		<string name="zip_wipe_cache">Один или более zip запрашивают очистку cache -- Очистка cache...</string>
+		<string name="zip_wipe_cache">Один или более ZIP запрашивают очистку cache -- Очистка cache...</string>
 		<string name="and_sec_wipe_err">Невозможно очистить android secure</string>
 		<string name="dalvik_wipe_err">Не удалось очистить dalvik</string>
 		<string name="auto_gen">(Создать автоматически)</string>
@@ -710,11 +727,18 @@
 		<string name="install_reboot" version="2">Устройство будет перезагружено через %tw_sleep% сек.</string>
 		<string name="adbbackup_error">Ошибка резервного копирования по ADB. Выход...</string>
 		<string name="adbbackup_control_error">Невозможно записать в канал управления ADB.</string>
-		<string name="twrp_adbbu_option">-- эта опция позволяет делать резервное копирование по adb</string>
+		<string name="twrp_adbbu_option">-- эта опция позволяет делать резервное копирование по ADB</string>
 		<string name="partition_not_found">путь: {1} отсутствует в списке разделов.</string>
 		<string name="copy_kernel_log">Kernel Log скопирован в {1}</string>
 		<string name="include_kernel_log">Добавить Kernel Log</string>
 		<string name="sha2_chk">Использовать SHA2 для контрольных сумм (иначе - MD5)</string>
 		<string name="unable_set_boot_slot">Ошибка смены слота загрузки bootloader на {1}</string>
+		<string name="unmount_sys_install">Размонтировать System перед установкой ZIP</string>
+		<string name="unmount_system">Размонтирование System...</string>
+		<string name="unmount_system_err">Ошибка размонтирования System</string>
+		<string name="flash_ab_inactive">Прошивка A/B ZIP в неактивный слот: {1}</string>
+        <string name="flash_ab_reboot">Для прошивки дополнительных ZIP перезагрузите рекавери для переключения на обновлённый слот.</string>
+		<string name="ozip_decrypt_decryption">Начало расшифровки Ozip...</string>
+		<string name="ozip_decrypt_finish">Расшифровка Ozip завершена!</string>
 	</resources>
 </language>

From 4a78bda87dab147b95d381336c50d503c820be49 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 25 Dec 2020 22:46:59 -0500
Subject: [PATCH 120/207] gui: fix listbox on reboot page in landscape theme

Change-Id: I111c5124c7b002a0fe5ab257289195f9117d9a83
---
 gui/theme/common/landscape.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 62a1191a3b..9315720138 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2706,7 +2706,7 @@
 			</text>
 
 			<listbox style="advanced_listbox">
-				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%listbox_advanced_height%"/>
+				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%fileselector_install_height%"/>
 
 				<listitem name="{@rb_system_btn=System}">
 					<condition var1="tw_reboot_system" var2="1"/>

From 8f58a29d75e677ae91858d0369108df065655c62 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Fri, 25 Dec 2020 18:40:52 -0500
Subject: [PATCH 121/207] twrp release: 3.5.0 Android 9 release

Change-Id: I02f1ca7e27ff00910f24ea12d8bab60375dcbc84
---
 variables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.h b/variables.h
index b41f38ef50..8ef82886ee 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.4.0_9"
+#define TW_MAIN_VERSION_STR       "3.5.0_9"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 
 #define TW_USE_COMPRESSION_VAR      "tw_use_compression"

From 83c22343bf55e4edaf0555928b13a34476037592 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Tue, 29 Dec 2020 15:54:33 -0500
Subject: [PATCH 122/207] wrappedkey: only run check on FBE devices

Change-Id: I3713fc4619279d8ee2de924df2bc4fbde944d834
---
 partition.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/partition.cpp b/partition.cpp
index a34d854c14..17614ffe7e 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -693,7 +693,9 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 			Primary_Block_Device.c_str(), Mount_Point.c_str());
 		}
 	} else {
-		if (!Decrypt_FBE_DE()) {
+		int is_device_fbe;
+		DataManager::GetValue(TW_IS_FBE, is_device_fbe);
+		if (!Decrypt_FBE_DE() && is_device_fbe == 1) {
 			char wrappedvalue[PROPERTY_VALUE_MAX];
 			property_get("fbe.data.wrappedkey", wrappedvalue, "");
 			std::string wrappedkeyvalue(wrappedvalue);
@@ -723,7 +725,7 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 bool TWPartition::Decrypt_FBE_DE() {
 if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 		DataManager::SetValue(TW_IS_FBE, 1);
-                property_set("ro.crypto.state", "encrypted");
+		property_set("ro.crypto.state", "encrypted");
 		property_set("ro.crypto.type", "file");
 		LOGINFO("File Based Encryption is present\n");
 #ifdef TW_INCLUDE_FBE

From 9d930a2015d49671176a7b65503a359d9c22a8ce Mon Sep 17 00:00:00 2001
From: epicX <souravgain605@gmail.com>
Date: Tue, 29 Dec 2020 00:39:36 +0530
Subject: [PATCH 123/207] reduced the checkforapp function call to reduce
 unwanted log info

Change-Id: I5a665969b3fcd6c444307685eaf4800e32cb435f
---
 gui/action.cpp                 | 44 +++----------------------------
 gui/theme/common/landscape.xml |  7 -----
 gui/theme/common/portrait.xml  |  7 -----
 gui/theme/common/watch.xml     |  7 -----
 twrp-functions.cpp             | 47 ++++++++++++++++++++++++++++++++++
 twrp-functions.hpp             |  1 +
 twrp.cpp                       |  2 ++
 7 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/gui/action.cpp b/gui/action.cpp
index bccf269a26..06de41ef28 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1958,48 +1958,10 @@ int GUIAction::checkforapp(std::string arg __unused)
 	operation_start("Check for TWRP App");
 	if (!simulate)
 	{
-		string sdkverstr = TWFunc::System_Property_Get("ro.build.version.sdk");
-		int sdkver = 0;
-		if (!sdkverstr.empty()) {
-			sdkver = atoi(sdkverstr.c_str());
-		}
-		if (sdkver <= 13) {
-			if (sdkver == 0)
-				LOGINFO("Unable to read sdk version from build prop\n");
-			else
-				LOGINFO("SDK version too low for TWRP app (%i < 14)\n", sdkver);
-			DataManager::SetValue("tw_app_install_status", 1); // 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";
-			const char app_prefix[] = "me.twrp.twrpapp-";
-			DIR *d = opendir(parent_path);
-			if (d) {
-				struct dirent *p;
-				while ((p = readdir(d))) {
-					if (p->d_type != DT_DIR || strlen(p->d_name) < strlen(app_prefix) || strncmp(p->d_name, app_prefix, strlen(app_prefix)))
-						continue;
-					closedir(d);
-					LOGINFO("App found at '%s/%s'\n", parent_path, p->d_name);
-					DataManager::SetValue("tw_app_install_status", 2); // 0 = no status, 1 = not installed, 2 = already installed or do not install
-					goto exit;
-				}
-				closedir(d);
-			}
-		} else {
-			LOGINFO("Data partition cannot be mounted during app check\n");
-			DataManager::SetValue("tw_app_install_status", 2); // 0 = no status, 1 = not installed, 2 = already installed or do not install
-		}
+		TWFunc::checkforapp();
 	} else
 		simulate_progress_bar();
-	LOGINFO("App not installed\n");
-	DataManager::SetValue("tw_app_install_status", 1); // 0 = no status, 1 = not installed, 2 = already installed
-exit:
+
 	operation_end(0);
 	return 0;
 }
@@ -2112,6 +2074,7 @@ int GUIAction::installapp(std::string arg __unused)
 	} else
 		simulate_progress_bar();
 exit:
+	TWFunc::checkforapp();
 	operation_end(0);
 	return 0;
 }
@@ -2165,6 +2128,7 @@ int GUIAction::uninstalltwrpsystemapp(std::string arg __unused)
 	} else
 		simulate_progress_bar();
 exit:
+	TWFunc::checkforapp();
 	operation_end(0);
 	return 0;
 }
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 9315720138..010e08e969 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -3442,13 +3442,6 @@
 		</page>
 
 		<page name="advanced">
-			<action>
-				<action function="checkforapp"></action>
-				<action function="page">advanced1</action>
-			</action>
-		</page>
-
-		<page name="advanced1">
 			<template name="page"/>
 
 			<text style="text_l">
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 711139f410..b78191d531 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3563,13 +3563,6 @@
 		</page>
 
 		<page name="advanced">
-			<action>
-				<action function="checkforapp"></action>
-				<action function="page">advanced1</action>
-			</action>
-		</page>
-
-		<page name="advanced1">
 			<template name="page"/>
 
 			<text style="text_l">
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index d76a1d3fac..7debf3aa0a 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -4214,13 +4214,6 @@
 		</page>
 
 		<page name="advanced2">
-			<action>
-				<action function="checkforapp"></action>
-				<action function="page">advanced3</action>
-			</action>
-		</page>
-
-		<page name="advanced3">
 			<template name="page"/>
 
 			<template name="statusbar"/>
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 82af082bf3..cefaf918b8 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1327,6 +1327,53 @@ bool TWFunc::Is_TWRP_App_In_System() {
 	return false;
 }
 
+void TWFunc::checkforapp(){
+
+	string sdkverstr = System_Property_Get("ro.build.version.sdk");
+	int sdkver = 0;
+	if (!sdkverstr.empty()) {
+		sdkver = atoi(sdkverstr.c_str());
+	}
+	if (sdkver <= 13) {
+		if (sdkver == 0)
+			LOGINFO("Unable to read sdk version from build prop\n");
+		else
+			LOGINFO("SDK version too low for TWRP app (%i < 14)\n", sdkver);
+		DataManager::SetValue("tw_app_install_status", 1); // 0 = no status, 1 = not installed, 2 = already installed or do not install
+		goto exit;
+	}
+	if (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";
+		const char app_prefix[] = "me.twrp.twrpapp-";
+		DIR *d = opendir(parent_path);
+		if (d) {
+			struct dirent *p;
+			while ((p = readdir(d))) {
+				if (p->d_type != DT_DIR || strlen(p->d_name) < strlen(app_prefix) || strncmp(p->d_name, app_prefix, strlen(app_prefix)))
+					continue;
+				closedir(d);
+				LOGINFO("App found at '%s/%s'\n", parent_path, p->d_name);
+				DataManager::SetValue("tw_app_install_status", 2); // 0 = no status, 1 = not installed, 2 = already installed or do not install
+				goto exit;
+			}
+			closedir(d);
+		}
+	} else {
+		LOGINFO("Data partition cannot be mounted during app check\n");
+		DataManager::SetValue("tw_app_install_status", 2); // 0 = no status, 1 = not installed, 2 = already installed or do not install
+	}
+
+	LOGINFO("App not installed\n");
+	DataManager::SetValue("tw_app_install_status", 1); // 0 = no status, 1 = not installed, 2 = already installed
+exit:
+	return;
+
+}
+
 int TWFunc::Property_Override(string Prop_Name, string Prop_Value) {
 #ifdef TW_INCLUDE_LIBRESETPROP
     return setprop(Prop_Name.c_str(), Prop_Value.c_str(), false);
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index d18539885f..3e013c3854 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -118,6 +118,7 @@ class TWFunc
 	static std::string get_log_dir(); // return recovery log storage directory
 	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
+	static void checkforapp();
 	static int Property_Override(string Prop_Name, string Prop_Value); // Override properties (including ro. properties)
 	static bool Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path); // return encryption policy for path
 	static bool Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy); // set encryption policy for path
diff --git a/twrp.cpp b/twrp.cpp
index 6df37d95fe..eb05b2d27f 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -397,6 +397,8 @@ int main(int argc, char **argv) {
 	twrpAdbBuFifo *adb_bu_fifo = new twrpAdbBuFifo();
 	adb_bu_fifo->threadAdbBuFifo();
 
+	TWFunc::checkforapp(); //Checking compatibility for TWRP app
+
 	// Launch the main GUI
 	gui_start();
 

From d3cdfc940637453e1a9048c25e38ebc36d13851f Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sun, 27 Dec 2020 20:23:04 -0500
Subject: [PATCH 124/207] logd: only copy event-log-tags on sdk < 28

File not present in 9.0 tree

Change-Id: I54c5321813ddabbf11082fffc093efd4a829c185
---
 Android.mk                                    | 21 +++++-----
 etc/Android.mk                                | 40 +++++++++++++------
 ...covery.logd.rc => init.recovery.logd27.rc} |  9 +++++
 etc/init.recovery.logd28.rc                   | 31 ++++++++++++++
 4 files changed, 79 insertions(+), 22 deletions(-)
 rename etc/{init.recovery.logd.rc => init.recovery.logd27.rc} (60%)
 create mode 100644 etc/init.recovery.logd28.rc

diff --git a/Android.mk b/Android.mk
index 57c3003328..08080ae40a 100755
--- a/Android.mk
+++ b/Android.mk
@@ -510,15 +510,18 @@ endif
 ifeq ($(TWRP_INCLUDE_LOGCAT), true)
     TWRP_REQUIRED_MODULES += logcat
     ifeq ($(TARGET_USES_LOGD), true)
-        TWRP_REQUIRED_MODULES += logd libsysutils libnl event-log-tags init.recovery.logd.rc
-        ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
-            LOCAL_POST_INSTALL_CMD += \
-                $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc; \
-                cp $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/;
-        else
-            LOCAL_POST_INSTALL_CMD += \
-                $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc; \
-                cp $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
+        TWRP_REQUIRED_MODULES += logd libsysutils libnl init.recovery.logd.rc
+        ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 28; echo $$?),0)
+            TWRP_REQUIRED_MODULES += event-log-tags
+            ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+                LOCAL_POST_INSTALL_CMD += \
+                    $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc; \
+                    cp $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/;
+            else
+                LOCAL_POST_INSTALL_CMD += \
+                    $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc; \
+                    cp $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
+            endif
         endif
     endif
 endif
diff --git a/etc/Android.mk b/etc/Android.mk
index ca549ea296..f7bb3d87ad 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -82,19 +82,33 @@ endif
 
 ifeq ($(TWRP_INCLUDE_LOGCAT), true)
     ifeq ($(TARGET_USES_LOGD), true)
-
-        include $(CLEAR_VARS)
-        LOCAL_MODULE := init.recovery.logd.rc
-        LOCAL_MODULE_TAGS := eng
-        LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-
-        # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc
-        # during ramdisk creation and only allows init.recovery.*.rc files to be copied
-        # from TARGET_ROOT_OUT thereafter
-        LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
-
-        LOCAL_SRC_FILES := $(LOCAL_MODULE)
-        include $(BUILD_PREBUILT)
+        ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 28; echo $$?),0)
+            include $(CLEAR_VARS)
+            LOCAL_MODULE := init.recovery.logd.rc
+            LOCAL_MODULE_TAGS := eng
+            LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+
+            # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc
+            # during ramdisk creation and only allows init.recovery.*.rc files to be copied
+            # from TARGET_ROOT_OUT thereafter
+            LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+
+            LOCAL_SRC_FILES := init.recovery.logd27.rc
+            include $(BUILD_PREBUILT)
+        else
+            include $(CLEAR_VARS)
+            LOCAL_MODULE := init.recovery.logd.rc
+            LOCAL_MODULE_TAGS := eng
+            LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+
+            # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc
+            # during ramdisk creation and only allows init.recovery.*.rc files to be copied
+            # from TARGET_ROOT_OUT thereafter
+            LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+
+            LOCAL_SRC_FILES := init.recovery.logd28.rc
+            include $(BUILD_PREBUILT)
+        endif
     endif
 endif
 
diff --git a/etc/init.recovery.logd.rc b/etc/init.recovery.logd27.rc
similarity index 60%
rename from etc/init.recovery.logd.rc
rename to etc/init.recovery.logd27.rc
index 423039cf02..0454a7a2a8 100644
--- a/etc/init.recovery.logd.rc
+++ b/etc/init.recovery.logd27.rc
@@ -3,6 +3,7 @@ on load_all_props_action
 
 on load_persist_props_action
     start logd
+    start logd-reinit
 
 service logd /sbin/logd
     class core
@@ -11,3 +12,11 @@ service logd /sbin/logd
     socket logdw dgram 0222 logd logd
     group root system
     seclabel u:r:logd:s0
+
+service logd-reinit /sbin/logd --reinit
+    oneshot
+    disabled
+    user logd
+    group logd
+    writepid /dev/cpuset/system-background/tasks
+    seclabel u:r:logd:s0
diff --git a/etc/init.recovery.logd28.rc b/etc/init.recovery.logd28.rc
new file mode 100644
index 0000000000..673df77c2b
--- /dev/null
+++ b/etc/init.recovery.logd28.rc
@@ -0,0 +1,31 @@
+on init
+    start logd
+
+on fs
+    write /dev/event-log-tags "# content owned by logd
+"
+    chown logd logd /dev/event-log-tags
+    chmod 0644 /dev/event-log-tags
+
+on load_persist_props_action
+    start logd
+    start logd-reinit
+
+service logd /sbin/logd
+    socket logd stream 0666 logd logd
+    socket logdr seqpacket 0666 logd logd
+    socket logdw dgram+passcred 0222 logd logd
+    file /proc/kmsg r
+    file /dev/kmsg w
+    user logd
+    group logd system package_info readproc
+    writepid /dev/cpuset/system-background/tasks
+    seclabel u:r:logd:s0
+
+service logd-reinit /sbin/logd --reinit
+    oneshot
+    disabled
+    user logd
+    group logd
+    writepid /dev/cpuset/system-background/tasks
+    seclabel u:r:logd:s0

From ccdf45c975959cda2fd36c49364a97ac94bf3e4d Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 1 Jan 2021 17:07:49 -0500
Subject: [PATCH 125/207] (2/2) zip: fix build in 7.1 tree with TW_USE_TOOLBOX

Zip repo in 7.1 tree already outputs to recovery ramdisk sbin folder,
and linker is set in the external/zip Android.mk file.
android_external_zip patch adjusts linker for both 32-bit
and 64-bit builds.

Change-Id: I5d6c6dac4cdd8ee4b4affd4b74305fbcb72d785e
---
 prebuilt/Android.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index a4f6f2e4bf..e27f6cdafe 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -30,9 +30,6 @@ else
         ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0)
             RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/dd
         endif
-        ifneq ($(wildcard external/zip/Android.mk),)
-            RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/zip
-        endif
         ifneq ($(wildcard external/unzip/Android.mk),)
             RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/unzip
         endif

From 0c6a6266fba8960f1b96a08c837ac61f2b7f9310 Mon Sep 17 00:00:00 2001
From: Adrian DC <radian.dc@gmail.com>
Date: Tue, 5 Jan 2021 23:54:18 +0100
Subject: [PATCH 126/207] ors: Refresh the system details after sideload and
 wipe system

 * Thus resolve the 'No OS installed' warnings upon system reboot
   if only adb shell twrp actions were used on the device

Change-Id: Id4fd915ce25cef8a2fdef6fda1750ca1b3ed13b7
---
 openrecoveryscript.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index 5712538569..7a211ac9e4 100755
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -156,6 +156,7 @@ int OpenRecoveryScript::run_script_file(void) {
 					PartitionManager.Wipe_By_Path("/cache");
 				} else if (strcmp(value, "system") == 0 || strcmp(value, "/system") == 0 || strcmp(value, PartitionManager.Get_Android_Root_Path().c_str()) == 0) {
 					PartitionManager.Wipe_By_Path("/system");
+					PartitionManager.Update_System_Details();
 				} else if (strcmp(value, "dalvik") == 0 || strcmp(value, "dalvick") == 0 || strcmp(value, "dalvikcache") == 0 || strcmp(value, "dalvickcache") == 0) {
 					PartitionManager.Wipe_Dalvik_Cache();
 				} else if (strcmp(value, "data") == 0 || strcmp(value, "/data") == 0 || strcmp(value, "factory") == 0 || strcmp(value, "factoryreset") == 0) {
@@ -387,6 +388,7 @@ int OpenRecoveryScript::run_script_file(void) {
 				} else {
 					ret_val = 1; // failure
 				}
+				PartitionManager.Update_System_Details();
 				sideload = 1; // Causes device to go to the home screen afterwards
 				if (sideload_child_pid != 0) {
 					LOGINFO("Signaling child sideload process to exit.\n");

From 11a26ffe835fb5e984fe014604435b433aa47697 Mon Sep 17 00:00:00 2001
From: Beta Soft <betaxab@gmail.com>
Date: Wed, 2 Dec 2020 22:43:49 +0800
Subject: [PATCH 127/207] extra-languages: update Chinese translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To other Chinese translators:
Do not replace "…" to "...", it is incorrect in zh-CN, should be use Half-width ellipsis.
Use "槽位" instand of "分区" to translate "slot".

Change-Id: I753d9bfe9d172a64373c8809a78b667b9d75d0e3
(cherry picked from commit dff12eb2300ac9b90f97c6e9b139799189dd98ef)
---
 gui/theme/extra-languages/languages/zh_CN.xml | 243 +++++++++---------
 gui/theme/extra-languages/languages/zh_TW.xml | 223 +++++++++-------
 2 files changed, 240 insertions(+), 226 deletions(-)

diff --git a/gui/theme/extra-languages/languages/zh_CN.xml b/gui/theme/extra-languages/languages/zh_CN.xml
index 2337e8332d..43bb3ffafc 100644
--- a/gui/theme/extra-languages/languages/zh_CN.xml
+++ b/gui/theme/extra-languages/languages/zh_CN.xml
@@ -35,8 +35,8 @@
 		<!-- GUI XML strings -->
 		<string name="twrp_header">Team Win Recovery Project</string>
 		<string name="twrp_watch_header">TWRP %tw_version%</string>
-		<string name="cpu_temp">温度：%tw_cpu_temp% &#xB0;C</string>
-		<string name="battery_pct">电量：%tw_battery%</string>
+		<string name="cpu_temp">温度: %tw_cpu_temp% &#xB0;C</string>
+		<string name="battery_pct">电量: %tw_battery%</string>
 		<string name="sort_by_name">按名称排序</string>
 		<string name="sort_by_date">按日期排序</string>
 		<string name="sort_by_size">按大小排序</string>
@@ -93,7 +93,7 @@
 		<string name="zip_add_btn">添加更多刷机包</string>
 		<string name="zip_clear_btn">清除刷机队列</string>
 		<string name="install_zip_count_hdr">正在刷入第 %tw_zip_index% 个，共 %tw_zip_queue_count% 个</string>
-		<string name="installing_zip_xml">正在安装：%tw_file%</string>
+		<string name="installing_zip_xml">正在安装: %tw_file%</string>
 		<string name="failed">失败</string>
 		<string name="successful">成功</string>
 		<string name="install_failed">安装失败</string>
@@ -108,16 +108,16 @@
 		<string name="image_flashed">镜像已刷入。</string>
 		<string name="wipe_cache_dalvik_confirm">是否清除 Cache 和 Dalvik？</string>
 		<string name="wipe_dalvik_confirm">是否清除 Dalvik？</string>
-		<string name="wiping_cache_dalvik">正在清除 Cache 和 Dalvik...</string>
+		<string name="wiping_cache_dalvik">正在清除 Cache 和 Dalvik…</string>
 		<string name="wipe_cache_dalvik_complete">Cache 和 Dalvik 清除完成</string>
 		<string name="wipe_dalvik_complete">Dalvik 清除完成</string>
-		<string name="swipe_wipe">滑动按钮确认清除</string>
+		<string name="swipe_wipe">滑动滑块确认清除</string>
 		<string name="swipe_wipe_s">   清除</string>
 		<string name="no_os1">没有安装任何系统！</string>
 		<string name="no_osrb">您确定要重启？</string>
 		<string name="no_ospo">您确定要关机？</string>
 		<string name="rebooting">正在重启…</string>
-		<string name="swipe_reboot">滑动按钮确认重启</string>
+		<string name="swipe_reboot">滑动滑块确认重启</string>
 		<string name="swipe_reboot_s">   重启</string>
 		<string name="reboot_install_app_hdr">安装 TWRP 应用？</string>
 		<string name="reboot_install_app1">您希望安装官方 TWRP 应用吗？</string>
@@ -125,12 +125,12 @@
 		<string name="reboot_install_app_prompt_install">如果 TWRP 应用未安装时提示我</string>
 		<string name="reboot_install_app_system">安装为系统应用</string>
 		<string name="reboot_installing_app">正在安装应用…</string>
-		<string name="swipe_to_install_app">滑动按钮确认安装</string>
-        <string name="uninstall_twrp_system_app">卸载 TWRP 应用</string>
+		<string name="swipe_to_install_app">滑动滑块确认安装</string>
+		<string name="uninstall_twrp_system_app">卸载 TWRP 应用</string>
 		<string name="uninstall_twrp_system_app_confirm">确认卸载 TWRP 应用？</string>
-		<string name="uninstalling_twrp_system_app">正在卸载 TWRP 应用...</string>
+		<string name="uninstalling_twrp_system_app">正在卸载 TWRP 应用…</string>
 		<string name="uninstall_twrp_system_app_complete">卸载 TWRP 应用完成</string>
-		<string name="swipe_flash">滑动按钮确认刷入</string>
+		<string name="swipe_flash">滑动滑块确认刷入</string>
 		<string name="confirm_action">确认操作</string>
 		<string name="back_cancel">按返回按钮取消。</string>
 		<string name="cancel_btn">取消</string>
@@ -141,13 +141,13 @@
 		<string name="factory_reset2">（不会清除内置存储/sdcard）</string>
 		<string name="factory_reset3">在大多数情况下，您只需要</string>
 		<string name="factory_reset4">执行此操作即可。</string>
-        <string name="factory_reset5">(不包括用户/锁屏)</string>
+		<string name="factory_reset5">（不包括用户/锁屏）</string>
 		<string name="factory_resetting">正在恢复出厂设置…</string>
 		<string name="advanced_wipe_hdr">高级清除选项</string>
 		<string name="advanced_wipe_btn">高级清除</string>
 		<string name="wipe_enc_confirm">是否清除 Data 分区加密？</string>
 		<string name="formatting_data">正在格式化 Data 分区…</string>
-		<string name="swipe_format_data">滑动按钮确认格式化</string>
+		<string name="swipe_format_data">滑动滑块确认格式化</string>
 		<string name="swipe_format_data_s">   格式化 Data 分区</string>
 		<string name="factory_reset_complete">恢复出厂完成</string>
 		<string name="sel_part_hdr">选择分区</string>
@@ -170,50 +170,50 @@
 		<string name="format_data_complete">格式化 Data 分区完成</string>
 		<!-- Translator note: the word "yes" must remain English! -->
 		<string name="yes_continue">输入 yes 继续，按返回按钮取消。</string>
-		<string name="part_opt_hdr">分区名：%tw_partition_name%</string>
+		<string name="part_opt_hdr">分区名: %tw_partition_name%</string>
 		<string name="sel_act_hdr">选择操作</string>
 		<string name="file_sys_opt">文件系统选项</string>
-		<string name="partition">分区：%tw_partition_name%</string>
-		<string name="part_mount_point">挂载位置：%tw_partition_mount_point%</string>
-		<string name="part_curr_fs">文件系统：%tw_partition_file_system%</string>
+		<string name="partition">分区: %tw_partition_name%</string>
+		<string name="part_mount_point">挂载位置: %tw_partition_mount_point%</string>
+		<string name="part_curr_fs">文件系统: %tw_partition_file_system%</string>
 		<string name="part_present_yes">当前：是</string>
 		<string name="part_present_no">当前：否</string>
 		<string name="part_removable_yes">可移除：是</string>
 		<string name="part_removable_no">可移除：否</string>
-		<string name="part_size">大小：%tw_partition_size%MB</string>
-		<string name="part_used">已用：%tw_partition_used%MB</string>
-		<string name="part_free">空闲：%tw_partition_free%MB</string>
-		<string name="part_backup_size">备份大小：%tw_partition_backup_size%MB</string>
+		<string name="part_size">大小: %tw_partition_size%MB</string>
+		<string name="part_used">已用: %tw_partition_used%MB</string>
+		<string name="part_free">空闲: %tw_partition_free%MB</string>
+		<string name="part_backup_size">备份大小: %tw_partition_backup_size%MB</string>
 		<string name="resize_btn">调整文件系统</string>
 		<string name="resize_btn_s">调整</string>
 		<string name="resize_confirm">是否调整 %tw_partition_name%？</string>
 		<string name="resizing">正在调整…</string>
 		<string name="resize_complete">调整完成</string>
-		<string name="swipe_resize">滑动按钮确认调整</string>
+		<string name="swipe_resize">滑动滑块确认调整</string>
 		<string name="swipe_resize_s">   调整</string>
 		<string name="repair_btn">修复文件系统</string>
 		<string name="repair_btn_s">修复</string>
 		<string name="repair_confirm">是否修复 %tw_partition_name%？</string>
 		<string name="repairing">正在修复…</string>
 		<string name="repair_complete">修复完成</string>
-		<string name="swipe_repair">滑动按钮确认修复</string>
+		<string name="swipe_repair">滑动滑块确认修复</string>
 		<string name="swipe_repair_s">   修复</string>
 		<string name="change_fs_btn">更改文件系统</string>
 		<string name="change_fs_btn_s">更改</string>
-		<string name="change_fs_for_hdr">要更改的分区：%tw_partition_name%</string>
-		<string name="change_fs_for_hdr_s">分区：%tw_partition_name%&gt;选择文件系统</string>
+		<string name="change_fs_for_hdr">要更改的分区: %tw_partition_name%</string>
+		<string name="change_fs_for_hdr_s">分区: %tw_partition_name%&gt;选择文件系统</string>
 		<string name="change_fs_warn1">一些固件或内核可能不支持</string>
 		<string name="change_fs_warn2">某些文件系统，请谨慎！</string>
 		<string name="change_fs_confirm">是否更改 %tw_partition_name% 为：</string>
 		<string name="formatting">正在格式化…</string>
 		<string name="format_complete">格式化完成</string>
-		<string name="swipe_change_fs">滑动按钮确认更改</string>
+		<string name="swipe_change_fs">滑动滑块确认更改</string>
 		<string name="swipe_change_s">   更改</string>
 		<string name="back_btn">返回</string>
 		<string name="wipe_enc_btn">清除加密</string>
-		<string name="swipe_factory_reset">滑动按钮确认恢复出厂</string>
+		<string name="swipe_factory_reset">滑动滑块确认恢复出厂</string>
 		<string name="repair_change_btn">修复或更改文件系统</string>
-		<string name="storage_hdr">存储位置：%tw_storage_display_name% (%tw_storage_free_size% MB)</string>
+		<string name="storage_hdr">存储位置: %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
 		<string name="backup_hdr">备份</string>
 		<string name="backup_confirm_hdr">确认备份</string>
 		<string name="encryption_tab">加密</string>
@@ -226,13 +226,13 @@
 		<string name="enable_backup_comp_chk">启用压缩</string>
 		<string name="skip_digest_backup_chk" version="2">当备份时跳过生成 Digest</string>
 		<string name="disable_backup_space_chk" version="2">在备份之前禁用剩余空间检查</string>
-		<string name="current_boot_slot">当前分区：%tw_active_slot%</string>
-		<string name="boot_slot_a">分区 A</string>
-		<string name="boot_slot_b">分区 B</string>
-		<string name="changing_boot_slot">更改启动分区</string>
-		<string name="changing_boot_slot_complete">更改启动分区完成</string>
+		<string name="current_boot_slot">当前槽位: %tw_active_slot%</string>
+		<string name="boot_slot_a">槽位 A</string>
+		<string name="boot_slot_b">槽位 B</string>
+		<string name="changing_boot_slot">更改启动槽位</string>
+		<string name="changing_boot_slot_complete">更改启动槽位完成</string>
 		<string name="refresh_sizes_btn">刷新大小</string>
-		<string name="swipe_backup">滑动按钮确认备份</string>
+		<string name="swipe_backup">滑动滑块确认备份</string>
 		<string name="append_date_btn">附加日期</string>
 		<string name="backup_name_exists">使用该名称的备份已经存在！</string>
 		<string name="encrypt_backup">是否加密备份？</string>
@@ -256,7 +256,7 @@
 		<string name="del_backup_confirm2">此操作无法恢复！</string>
 		<string name="deleting_backup">正在删除备份…</string>
 		<string name="backup_deleted">备份删除完成</string>
-		<string name="swipe_delete">滑动按钮确认删除</string>
+		<string name="swipe_delete">滑动滑块确认删除</string>
 		<string name="swipe_delete_s">   删除</string>
 		<string name="restore_try_decrypt">加密的备份 - 尝试解密</string>
 		<string name="restore_try_decrypt_s">正在尝试解密</string>
@@ -264,14 +264,14 @@
 		<string name="restore_sel_part">选择要恢复的分区：</string>
 		<string name="restore_enable_digest_chk" version="2">启用 Digest 校验备份文件</string>
 		<string name="restore_complete">恢复完成</string>
-		<string name="swipe_restore">滑动按钮确认恢复</string>
+		<string name="swipe_restore">滑动滑块确认恢复</string>
 		<string name="swipe_restore_s">   恢复</string>
 		<string name="rename_backup_hdr">重命名备份</string>
 		<string name="rename_backup_confirm">是否重命名备份文件？</string>
 		<string name="rename_backup_confirm2">此操作无法恢复！</string>
 		<string name="renaming_backup">正在重命名…</string>
 		<string name="rename_backup_complete">重命名完成</string>
-		<string name="swipe_to_rename">滑动按钮确认重命名</string>
+		<string name="swipe_to_rename">滑动滑块确认重命名</string>
 		<string name="swipe_rename">   重命名</string>
 		<string name="confirm_hdr">确认</string>
 		<string name="mount_hdr">挂载</string>
@@ -294,7 +294,7 @@
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">正在关机…</string>
-		<string name="swipe_power_off">滑动按钮确认关机</string>
+		<string name="swipe_power_off">滑动滑块确认关机</string>
 		<string name="swipe_power_off_s">关机</string>
 		<string name="sys_ro_hdr">未修改的 System 分区</string>
 		<string name="sys_ro_keep">是否保持系统分区为只读？</string>
@@ -309,7 +309,7 @@
 		<string name="sys_rol3">安装刷机包或者通过 adb 操作依然可以修改系统分区。</string>
 		<string name="sys_ro_never_show_chk">下次启动时不再显示此界面</string>
 		<string name="sys_ro_keep_ro_btn">保持只读</string>
-		<string name="swipe_allow_mod">滑动按钮允许修改</string>
+		<string name="swipe_allow_mod">滑动滑块允许修改</string>
 		<string name="swipe_allow_mod_s">允许修改</string>
 		<string name="settings_hdr">设置</string>
 		<string name="settings_gen_hdr">常规</string>
@@ -358,23 +358,23 @@
 		<string name="utcp10">(UTC +10) 澳大利亚东部、关岛</string>
 		<string name="utcp11">(UTC +11) 符拉迪沃斯托克、索罗门群岛</string>
 		<string name="utcp12">(UTC +12) 奥克兰、惠灵顿、斐济</string>
-		<string name="sel_tz_offset">时间偏差（通常为 0）：%tw_time_zone_guioffset%</string>
+		<string name="sel_tz_offset">时间偏差（通常为 0）: %tw_time_zone_guioffset%</string>
 		<string name="tz_offset_none">无</string>
 		<string name="tz_offset_0">0 分钟</string>
 		<string name="tz_offset_15">15 分钟</string>
 		<string name="tz_offset_30">30 分钟</string>
 		<string name="tz_offset_45">45 分钟</string>
 		<string name="use_dst_chk">使用夏令时 (DST)</string>
-		<string name="curr_tz">当前时区：%tw_time_zone%</string>
+		<string name="curr_tz">当前时区: %tw_time_zone%</string>
 		<string name="curr_tz_s">当前时区：</string>
 		<string name="set_tz_btn">设置时区</string>
 		<string name="settings_screen_hdr">屏幕</string>
 		<string name="settings_screen_timeout_hdr">屏幕超时</string>
 		<string name="enable_timeout_chk">启用屏幕超时</string>
 		<string name="screen_to_slider">屏幕超时时间（秒）：</string>
-		<string name="screen_to_slider_s">屏幕超时（0=禁用）：%tw_screen_timeout_secs%</string>
+		<string name="screen_to_slider_s">屏幕超时（0=禁用）: %tw_screen_timeout_secs%</string>
 		<string name="screen_to_na">屏幕超时设置不可用</string>
-		<string name="screen_bright_slider">屏幕亮度：%tw_brightness_pct%%</string>
+		<string name="screen_bright_slider">屏幕亮度: %tw_brightness_pct%%</string>
 		<string name="screen_bright_na">屏幕亮度设置不可用</string>
 		<string name="vibration_hdr">振动</string>
 		<string name="button_vibration_hdr">按钮振动</string>
@@ -402,7 +402,7 @@
 		<string name="inject_twrp_confirm">是否重新注入 TWRP？</string>
 		<string name="injecting_twrp">正在重新注入 TWRP…</string>
 		<string name="inject_twrp_complete">TWRP 注入完成</string>
-		<string name="swipe_to_confirm">滑动按钮确认</string>
+		<string name="swipe_to_confirm">滑动滑块确认</string>
 		<string name="part_sd_hdr">SD 卡分区</string>
 		<string name="invalid_partsd_sel">您必须选择一个可移动设备</string>
 		<string name="part_sd_lose">您将会丢失 SD 卡上的所有文件！</string>
@@ -412,7 +412,7 @@
 		<string name="part_sd_m">-</string>
 		<string name="part_sd_p">+</string>
 		<string name="file_system">文件系统：</string>
-		<string name="swipe_part_sd">滑动按钮确认分区</string>
+		<string name="swipe_part_sd">滑动滑块确认分区</string>
 		<string name="swipe_part_sd_s">分区</string>
 		<string name="partitioning_sd">正在对 SD 卡分区…</string>
 		<string name="partitioning_sd2">这将需要几分钟的时间。</string>
@@ -430,14 +430,14 @@
 		<string name="dumlock_install_confirm">是否安装 HTC Dumlock 文件到系统中？</string>
 		<string name="dumlock_installing">正在安装 HTC Dumlock…</string>
 		<string name="dumlock_install_complete">HTC Dumlock 安装完成</string>
-		<string name="swipe_to_unlock">滑动按钮解锁</string>
+		<string name="swipe_to_unlock">滑动滑块解锁</string>
 		<string name="swipe_unlock">   解锁</string>
 		<string name="fm_hdr">文件管理</string>
 		<string name="fm_sel_file">选择文件或文件夹</string>
 		<string name="fm_type_folder">文件夹</string>
 		<string name="fm_type_file">文件</string>
 		<string name="fm_choose_act">选择操作</string>
-		<string name="fm_selected">已选择：%tw_fm_type%</string>
+		<string name="fm_selected">已选择: %tw_fm_type%</string>
 		<string name="fm_copy_btn">复制</string>
 		<string name="fm_copy_file_btn">复制文件</string>
 		<string name="fm_copy_folder_btn">复制文件夹</string>
@@ -465,7 +465,7 @@
 		<string name="decrypt_data_failed_pattern">图案错误，请重试！</string>
 		<string name="decrypt_data_enter_pattern">绘制解锁图案</string>
 		<string name="decrypt_data_trying">正在尝试解密</string>
-		<string name="decrypt_data_vold_os_missing">缺少解密 vold 所需的文件：{1}</string>
+		<string name="decrypt_data_vold_os_missing">缺少解密 vold 所需的文件: {1}</string>
 		<string name="term_hdr">终端命令</string>
 		<string name="term_s_hdr">终端</string>
 		<string name="term_kill_btn">终止</string>
@@ -473,7 +473,7 @@
 		<string name="adb_sideload_hdr">ADB Sideload</string>
 		<string name="sideload_wipe_dalvik_chk">清除 Dalvik Cache</string>
 		<string name="sideload_wipe_cache_chk">清除 Cache</string>
-		<string name="swipe_to_sideload">滑动按钮开始 Sideload</string>
+		<string name="swipe_to_sideload">滑动滑块开始 Sideload</string>
 		<string name="swipe_sideload">   开始</string>
 		<string name="sideload_confirm">ADB Sideload</string>
 		<string name="sideload_usage">使用方式：adb sideload filename.zip</string>
@@ -482,7 +482,7 @@
 		<string name="fix_contexts_note1">注意：很少情况下需要修复 Context。</string>
 		<string name="fix_contexts_note2">修复 SELinux Context 可能会导致</string>
 		<string name="fix_contexts_note3">您的设备无法正常启动。</string>
-		<string name="swipe_to_fix_contexts">滑动按钮确认修复</string>
+		<string name="swipe_to_fix_contexts">滑动滑块确认修复</string>
 		<string name="swipe_fix_contexts">   修复 Context</string>
 		<string name="fixing_contexts">正在修复 Context…</string>
 		<string name="fix_contexts_complete">修复 Context 完成</string>
@@ -498,7 +498,7 @@
 		<string name="repack_ramdisk_confirm">是否安装 Recovery？</string>
 		<string name="repack_backup_first">请先备份现有的镜像</string>
 		<string name="repack">重新打包</string>
-		<string name="swipe_to_install">滑动按钮确认安装</string>
+		<string name="swipe_to_install">滑动滑块确认安装</string>
 		<string name="installing">正在安装…</string>
 		<string name="install_complete">安装完成</string>
 		<string name="unpack_error">解包镜像错误。</string>
@@ -512,17 +512,17 @@
 		<string name="fix_recovery_loop_complete">Recovery 无限重启修复完成</string>
 		<string name="fixing_recovery_loop_patch">正在对内核打补丁…</string>
 		<string name="fix_recovery_loop_patch_error">对内核打补丁时出错。</string>
-        <string name="decrypt_users">解密用户</string>
-		<string name="decrypt_users_selection">选择一个要解密的用户ID</string>
+		<string name="decrypt_users">解密用户</string>
+		<string name="decrypt_users_selection">选择一位要解密的用户 ID</string>
 		<string name="select_user">选择用户</string>
-		<string name="backup_storage_undecrypt_warning">备份不包括一些{1}用户的文件，因为此用户没有解密</string>
-		<string name="decrypting_user_fbe">尝试解密用户{1}的FBE...</string>
+		<string name="backup_storage_undecrypt_warning">备份不包含一些属于用户 {1} 的文件，因为该用户没有解密</string>
+		<string name="decrypting_user_fbe">尝试为用户 {1} 解密 FBE…</string>
 		<string name="decrypt_user_success_fbe">用户 {1} 解密成功</string>
 		<string name="decrypt_user_fail_fbe">用户 {1} 解密失败</string>
-		<string name="decrypt_data_enter_pass_fbe">请输入 [%tw_crypto_user_id%] 用户的密码</string>
-		<string name="decrypt_data_enter_pattern_fbe">请画出 [%tw_crypto_user_id%] 用户的密码</string>
-		<string name="multiuser_warning1">有用户没有被解密！</string>
-		<string name="multiuser_warning2">备份/还原操作有可能会失败！</string>
+		<string name="decrypt_data_enter_pass_fbe">请输入用户 [%tw_crypto_user_id%] 的密码</string>
+		<string name="decrypt_data_enter_pattern_fbe">请绘制用户 [%tw_crypto_user_id%] 的解锁图案</string>
+		<string name="multiuser_warning1">并非所有用户都被解密！</string>
+		<string name="multiuser_warning2">备份/还原操作可能会失败！</string>
 		<string name="multiuser_warning_accept">仍然继续</string>
 		<string name="multiuser_warning_hdr">多用户警告</string>
 
@@ -540,40 +540,40 @@
 		<string name="digest_created" version="2"> * Digest 已生成。</string>
 		<string name="digest_error" version="2"> * Digest 错误！</string>
 		<string name="digest_compute_error" version="2"> * 计算 Digest 错误。</string>
-		<string name="current_date">(当前日期)</string>
-		<string name="auto_generate">(自动生成)</string>
-		<string name="unable_to_locate_partition">未找到 '{1}' 分区。</string>
+		<string name="current_date">（当前日期）</string>
+		<string name="auto_generate">（自动生成）</string>
+		<string name="unable_to_locate_partition">未找到“{1}”分区。</string>
 		<string name="no_partition_selected">未选择备份分区。</string>
-		<string name="total_partitions_backup"> * 备份分区总数：{1}</string>
-		<string name="total_backup_size"> * 备份数据总计：{1}MB</string>
-		<string name="available_space"> * 可用空间：{1}MB</string>
+		<string name="total_partitions_backup"> * 备份分区总数: {1}</string>
+		<string name="total_backup_size"> * 备份数据总计: {1}MB</string>
+		<string name="available_space"> * 可用空间: {1}MB</string>
 		<string name="unable_locate_storage">未找到存储设备。</string>
 		<string name="no_space">存储器上没有足够的空间。</string>
 		<string name="backup_started">[已开始备份]</string>
-		<string name="backup_folder"> * 备份文件夹：{1}</string>
+		<string name="backup_folder"> * 备份文件夹: {1}</string>
 		<string name="fail_backup_folder">建立备份文件夹失败。</string>
-		<string name="avg_backup_fs">文件平均备份速度：{1}MB/秒</string>
-		<string name="avg_backup_img">镜像平均备份速度：{1}MB/秒</string>
+		<string name="avg_backup_fs">文件平均备份速度: {1}MB/秒</string>
+		<string name="avg_backup_img">镜像平均备份速度: {1}MB/秒</string>
 		<string name="total_backed_size">[总计备份 {1}MB]</string>
 		<string name="backup_completed">[备份已完成，耗时 {1} 秒]</string>
 		<string name="restore_started">[已开始还原]</string>
-		<string name="restore_folder">恢复文件夹：'{1}'</string>
+		<string name="restore_folder">恢复文件夹:“{1}”</string>
 		<!-- {1} is the partition display name and {2} is the number of seconds -->
 		<string name="restore_part_done">[{1} 恢复完成（{2} 秒）]</string>
 		<string name="verifying_digest" version="2">正在校验 Digest</string>
 		<string name="skip_digest" version="2">基于用户设置，已跳过 Digest 检查。</string>
 		<string name="calc_restore">正在计算恢复详情…</string>
 		<string name="restore_read_only">无法恢复 {1} -- 已挂载为只读。</string>
-		<string name="restore_unable_locate">未找到 '{1}' 分区。</string>
+		<string name="restore_unable_locate">未找到“{1}”分区。</string>
 		<string name="no_part_restore">未选择要恢复的分区。</string>
 		<string name="restore_part_count">正在恢复 {1} 个分区…</string>
 		<string name="total_restore_size">恢复文件总计 {1}MB</string>
 		<string name="updating_system_details">更新系统详细信息</string>
 		<string name="restore_completed">[恢复完成，耗时 {1} 秒]</string>
 		<!-- {1} is the path we could not open, {2} is strerror output -->
-		<string name="error_opening_strerr">打开出错：'{1}' ({2})</string>
-		<string name="unable_locate_part_backup_name">无法通过备份名称来查找分区：'{1}'</string>
-		<string name="unable_find_part_path">找不到分区路径 '{1}'</string>
+		<string name="error_opening_strerr">打开出错:“{1}” ({2})</string>
+		<string name="unable_locate_part_backup_name">无法通过备份名称来查找分区:“{1}”</string>
+		<string name="unable_find_part_path">找不到分区路径“{1}”</string>
 		<string name="update_part_details">正在更新分区详情…</string>
 		<string name="update_part_details_done">…完成</string>
 		<string name="wiping_dalvik">正在清除 Dalvik 目录…</string>
@@ -588,7 +588,7 @@
 		<string name="unable_to_mount_storage">无法挂载存储</string>
 		<string name="fail_decrypt">解密数据失败。</string>
 		<string name="no_crypto_support">此版本不支持加密。</string>
-		<string name="decrypt_success_dev">Data 分区成功解密，新增块设备：'{1}'</string>
+		<string name="decrypt_success_dev">Data 分区成功解密，新增块设备:“{1}”</string>
 		<string name="decrypt_success_nodev">Data 分区已成功解密</string>
 		<string name="done">完成。</string>
 		<string name="start_partition_sd">正在给 SD 卡分区…</string>
@@ -596,17 +596,17 @@
 		<string name="ext_swap_size">EXT+Swap 大小超过 SD 卡容量。</string>
 		<string name="remove_part_table">正在删除分区表…</string>
 		<string name="unable_rm_part">无法删除分区表。</string>
-		<string name="create_part">正在建立 {1} 分区…</string>
-		<string name="unable_to_create_part">无法建立 {1} 分区。</string>
+		<string name="create_part">正在创建 {1} 分区…</string>
+		<string name="unable_to_create_part">无法创建 {1} 分区。</string>
 		<string name="format_sdext_as">正在将 sd-ext 格式化为 {1}…</string>
 		<string name="part_complete">分区完成。</string>
-		<string name="unable_to_open">无法打开 '{1}'。</string>
+		<string name="unable_to_open">无法打开“{1}”。</string>
 		<string name="mtp_already_enabled">MTP 已经启用</string>
 		<string name="mtp_fail">启用 MTP 失败</string>
 		<string name="no_mtp">不支持 MTP</string>
 		<string name="image_flash_start">[开始刷入镜像]</string>
-		<string name="img_to_flash">刷入镜像：'{1}'</string>
-		<string name="flash_unable_locate">未找到 '{1}' 分区。</string>
+		<string name="img_to_flash">刷入镜像:“{1}”</string>
+		<string name="flash_unable_locate">未找到“{1}”分区。</string>
 		<string name="no_part_flash">未选择刷入分区。</string>
 		<string name="too_many_flash">选择刷入的分区太多。</string>
 		<string name="invalid_flash">指定的刷入分区无效。</string>
@@ -617,48 +617,48 @@
 		<string name="unable_repair">无法修复 {1}。</string>
 		<string name="mount_data_footer">无法挂载/data，未找到加密 footer。</string>
 		<!-- {1} is the folder name that we could not create, {2} is strerror output -->
-		<string name="create_folder_strerr">无法创建 '{1}' 文件夹 ({2})。</string>
+		<string name="create_folder_strerr">无法创建“{1}”文件夹 ({2})。</string>
 		<!-- {1} is the folder name that we could not mount, {2} is strerror output -->
-		<string name="fail_mount">挂载 '{1}' 失败 ({2})</string>
+		<string name="fail_mount">挂载“{1}”失败 ({2})</string>
 		<!-- {1} is the folder name that we could not unmount, {2} is strerror output -->
-		<string name="fail_unmount">卸载 '{1}' 失败 ({2})</string>
-		<string name="cannot_resize">无法更改 {1} 大小。</string>
+		<string name="fail_unmount">卸载“{1}”失败 ({2})</string>
+		<string name="cannot_resize">无法更改 {1} 的大小。</string>
 		<string name="repair_resize">在调整大小之前修复 {1}。</string>
-		<string name="unable_resize">无法调整 {1} 大小。</string>
-		<string name="no_digest_found" version="2">未找到 '{1}' 的 Digest 校验文件。请取消选中“启用 Digest 校验备份文件”复选框。</string>
-		<string name="digest_fail_match" version="2">'{1}' Digest 校验失败。</string>
-		<string name="digest_matched" version="2">Digest 匹配 '{1}'。</string>
-		<string name="fail_decrypt_tar">无法解密 tar 文件 '{1}'</string>
+		<string name="unable_resize">无法调整 {1} 的大小。</string>
+		<string name="no_digest_found" version="2">未找到“{1}”的 Digest 校验文件。请取消选中“启用 Digest 校验备份文件”复选框。</string>
+		<string name="digest_fail_match" version="2">“{1}” Digest 校验失败。</string>
+		<string name="digest_matched" version="2">Digest 匹配“{1}”。</string>
+		<string name="fail_decrypt_tar">无法解密 Tar 文件“{1}”</string>
 		<string name="format_data_msg">您可能需要重启 Recovery 才能使用/data。</string>
 		<string name="format_data_err">无法格式化并删除加密。</string>
 		<string name="formatting_using">使用 {2} 格式化 {1}…</string>
 		<string name="unable_to_wipe">无法清除 {1}。</string>
 		<string name="cannot_wipe">无法清除 {1} 分区。</string>
-		<string name="remove_all">移除 '{1}' 下的所有文件</string>
+		<string name="remove_all">移除“{1}”下的所有文件</string>
 		<string name="wiping_data">正在清除 Data 分区，跳过清除/data/media…</string>
 		<string name="backing_up">正在备份 {1}…</string>
 		<string name="backup_storage_warning">备份的 {1} 分区不包含内置存储上的任何文件，例如照片或下载的文件等等。</string>
 		<string name="backing">正在备份</string>
-		<string name="backup_size">'{1}' 的备份文件大小为 0 字节。</string>
-		<string name="datamedia_fs_restore">警告：此/data 备份文件系统为 {1}！除非把文件系统格式设置为 {1} 否则可能无法启动。</string>
+		<string name="backup_size">“{1}”的备份文件大小为 0 字节。</string>
+		<string name="datamedia_fs_restore">警告：此/data 备份文件系统为 {1}! 除非把文件系统格式设置为 {1} 否则可能无法启动。</string>
 		<string name="restoring">正在恢复 {1}…</string>
 		<string name="restoring_hdr">正在恢复</string>
 		<string name="recreate_folder_err">无法重新创建 {1} 文件夹。</string>
 		<string name="img_size_err">镜像大小大于目标设备</string>
 		<string name="flashing">正在刷入 {1}…</string>
-		<string name="backup_folder_set">备份文件夹设置为：'{1}'</string>
-		<string name="locate_backup_err">未找到备份文件 '{1}'</string>
-		<string name="set_restore_opt">设置恢复选项：'{1}'：</string>
+		<string name="backup_folder_set">备份文件夹设置为:“{1}”</string>
+		<string name="locate_backup_err">未找到备份文件“{1}”</string>
+		<string name="set_restore_opt">设置恢复选项:“{1}”：</string>
 		<string name="digest_check_skip" version="2">跳过校验 Digest 已开启</string>
 		<string name="ors_encrypt_restore_err">无法使用 OpenRecoveryScript 脚本恢复加密备份。</string>
 		<string name="mounting">正在挂载</string>
 		<string name="unmounting">正在卸载</string>
-		<string name="mounted">'{1}' 已挂载</string>
-		<string name="unmounted">'{1}' 已卸载</string>
-		<string name="setting">设置 '{1}' 为 '{2}'</string>
-		<string name="setting_empty">设置 '{1}' 为空</string>
+		<string name="mounted">“{1}”已挂载</string>
+		<string name="unmounted">“{1}”已卸载</string>
+		<string name="setting">设置“{1}”为“{2}”</string>
+		<string name="setting_empty">设置“{1}”为空</string>
 		<string name="making_dir1">创建目录</string>
-		<string name="making_dir2">创建目录：'{1}'</string>
+		<string name="making_dir2">创建目录:“{1}”</string>
 		<string name="running_command">运行命令</string>
 		<string name="sideload">ADB Sideload</string>
 		<string name="start_sideload">正在开始 ADB sideload…</string>
@@ -666,8 +666,8 @@
 		<string name="no_pwd">未提供密码。</string>
 		<string name="done_ors">脚本执行完毕</string>
 		<string name="injecttwrp">正在注入 TWRP 到 Boot 镜像…</string>
-		<string name="zip_err">安装 Zip 刷机包 '{1}' 时出错</string>
-		<string name="installing_zip">正在安装 Zip 刷机包 '{1}'</string>
+		<string name="zip_err">安装 Zip 刷机包“{1}”时出错</string>
+		<string name="installing_zip">正在安装 Zip 刷机包“{1}”</string>
 		<string name="select_backup_opt">设置备份选项：</string>
 		<string name="compression_on">压缩选项已开启</string>
 		<string name="digest_off" version="2">Digest 生成已关闭</string>
@@ -678,8 +678,8 @@
 		<string name="running_ors">运行 OpenRecoveryScript 脚本</string>
 		<string name="ors_complete">运行 OpenRecoveryScript 脚本完成</string>
 		<string name="check_for_digest" version="2">正在检测 Digest…</string>
-		<string name="invalid_zip_format">Zip 文件格式无效！</string>
-		<string name="fail_sysmap">映射文件 '{1}' 失败</string>
+		<string name="invalid_zip_format">无效的 Zip 文件格式！</string>
+		<string name="fail_sysmap">映射文件“{1}”失败</string>
 		<string name="verify_zip_sig">正在校验 Zip 刷机包签名…</string>
 		<string name="verify_zip_fail">刷机包签名校验失败！</string>
 		<string name="verify_zip_done">刷机包签名校验成功。</string>
@@ -687,8 +687,8 @@
 		<string name="no_digest" version="2">跳过 Digest 校验：未找到 Digest 文件</string>
 		<string name="digest_fail" version="2">Digest 不匹配</string>
 		<string name="digest_match" version="2">Digest 校验成功</string>
-		<string name="pid_signal">{1} 过程结束，标志：{2}</string>
-		<string name="pid_error">{1} 过程结束，错误：{2}</string>
+		<string name="pid_signal">{1} 过程结束，标志: {2}</string>
+		<string name="pid_error">{1} 过程结束，错误: {2}</string>
 		<string name="install_dumlock">安装 HTC Dumlock 到系统…</string>
 		<string name="dumlock_restore">正在恢复原版 Boot…</string>
 		<string name="dumlock_reflash">正在重新刷入 Recovery 到 Boot…</string>
@@ -701,7 +701,7 @@
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">已完成 %llu 个，共 %llu 个文件，进度 %i%%</string>
 		<string name="size_progress">已完成 %lluMB，共 %lluMB，进度 %i%%</string>
-		<string name="decrypt_cmd" version="2">尝试通过命令行解密 Data 分区 / 用户。</string>
+		<string name="decrypt_cmd" version="2">正在尝试通过命令行解密 Data 分区或用户数据。</string>
 		<string name="base_pkg_err">无法加载基本包。</string>
 		<string name="simulating">正在模拟操作…</string>
 		<string name="backup_cancel">备份已取消。</string>
@@ -718,7 +718,7 @@
 		<string name="auto_gen">(Auto Generate)</string>
 		<string name="curr_date">(Current Date)</string>
 		<string name="backup_name_len">备份名称太长。</string>
-		<string name="backup_name_invalid">备份名称 '{1}' 中包含无效字符：'{1}'</string>
+		<string name="backup_name_invalid">备份名称“{1}”中包含无效字符:“{1}”</string>
 		<string name="no_real_sdcard">此设备没有真实的 SD 卡！正在中止！</string>
 		<string name="cancel_sideload">取消 ADB Sideload…</string>
 		<string name="change_fs_err">更换文件系统时出错。</string>
@@ -727,29 +727,18 @@
 		<string name="install_reboot" version="2">将会在 %tw_sleep% 秒内重启</string>
 		<string name="adbbackup_error">ADB 备份错误。正在退出…"</string>
 		<string name="adbbackup_control_error">无法写入 adb 控制通道</string>
-		<string name="twrp_adbbu_option">--twrp 选项需启用 twrp adb backup</string>
-		<string name="partition_not_found">分区列表中未发现路径：{1}</string>
+		<string name="twrp_adbbu_option">启用 TWRP ADB 备份需使用 --twrp 选项</string>
+		<string name="partition_not_found">分区列表中未发现路径: {1}</string>
 		<string name="copy_kernel_log">已导出内核日志至 {1}</string>
 		<string name="include_kernel_log">包含内核日志</string>
 		<string name="sha2_chk">使用 SHA2 进行散列校验</string>
-		<string name="unable_set_boot_slot">更改 bootloader 启动分区至 {1} 错误</string>
-        <string name="unmount_sys_install">在安装 ZIP 之前先卸载系统(挂载)</string>
-		<string name="unmount_system">卸载系统中...</string>
-		<string name="unmount_system_err">卸载系统失败</string>
-		<string name="flash_ab_inactive">正在刷入 A/B zip 到未选择slot: {1}</string>
-		<string name="flash_ab_reboot">要刷入其他zip文件，请重新进入Recovery以切换到更新后的插槽。</string>
-		<string name="ozip_decrypt_decryption">正在解密Ozip...</string>
-		<string name="ozip_decrypt_finish">Ozip解密完成！</string>
-		<string name="fbe_wipe_msg">注意: {1} 已清除. FBE设备应启动至Android，而不是Recovery，才能在擦除后设置启动FBE策略。</string>
-		<string name="fastboot_button">Fastboot</string>
-		<string name="enable_adb">开启 ADB</string>
-		<string name="enable_fastboot">开启 Fastboot</string>
-		<string name="fastboot_console_msg">进入 Fastboot 模式...</string>
-		<!-- Android Rescue Party trigger -->
-		<string name="rescue_party0">Android 抢救模式被触发! 可能的解决方案? 要么:</string>
-		<string name="rescue_party1"> 1. 清除缓存, 和/或</string>
-		<string name="rescue_party2"> 2. 双清, 和/或</string>
-		<string name="rescue_party3"> 3. 重新刷入Rom.</string>
-		<string name="rescue_party4">报告的问题是：</string>
+		<string name="unable_set_boot_slot">更改 Bootloader 启动槽位至 {1} 错误</string>
+		<string name="unmount_sys_install">在安装 Zip 刷机包之前先解除挂载 System</string>
+		<string name="unmount_system">正在解除挂载 System…</string>
+		<string name="unmount_system_err">解除挂载 System 失败</string>
+		<string name="flash_ab_inactive">正在刷入 A/B Zip 刷机包至非活动槽位: {1}</string>
+		<string name="flash_ab_reboot">如需刷入其它的 Zip 刷机包，请重启 Recovery 切换到新槽位。</string>
+		<string name="ozip_decrypt_decryption">正在解密 Ozip…</string>
+		<string name="ozip_decrypt_finish">Ozip 解密完成！</string>
 	</resources>
 </language>
diff --git a/gui/theme/extra-languages/languages/zh_TW.xml b/gui/theme/extra-languages/languages/zh_TW.xml
index fe7cf49d2f..0f9e826a60 100644
--- a/gui/theme/extra-languages/languages/zh_TW.xml
+++ b/gui/theme/extra-languages/languages/zh_TW.xml
@@ -35,8 +35,8 @@
 		<!-- GUI XML strings -->
 		<string name="twrp_header">Team Win Recovery Project</string>
 		<string name="twrp_watch_header">TWRP %tw_version%</string>
-		<string name="cpu_temp">溫度：%tw_cpu_temp% &#xB0;C</string>
-		<string name="battery_pct">電量：%tw_battery%</string>
+		<string name="cpu_temp">溫度: %tw_cpu_temp% &#xB0;C</string>
+		<string name="battery_pct">電量: %tw_battery%</string>
 		<string name="sort_by_name">按名稱排序</string>
 		<string name="sort_by_date">按日期排序</string>
 		<string name="sort_by_size">按大小排序</string>
@@ -93,7 +93,7 @@
 		<string name="zip_add_btn">添加更多刷機包</string>
 		<string name="zip_clear_btn">清除刷機佇列</string>
 		<string name="install_zip_count_hdr">正在刷入第 %tw_zip_index% 個，共 %tw_zip_queue_count% 個</string>
-		<string name="installing_zip_xml">正在安裝：%tw_file%</string>
+		<string name="installing_zip_xml">正在安裝: %tw_file%</string>
 		<string name="failed">失敗</string>
 		<string name="successful">成功</string>
 		<string name="install_failed">安裝失敗</string>
@@ -111,13 +111,13 @@
 		<string name="wiping_cache_dalvik">正在清除 Cache 和 Dalvik…</string>
 		<string name="wipe_cache_dalvik_complete">Cache 和 Dalvik 清除完成</string>
 		<string name="wipe_dalvik_complete">Dalvik 清除完成</string>
-		<string name="swipe_wipe">滑動按鈕確認清除</string>
+		<string name="swipe_wipe">滑動滑塊確認清除</string>
 		<string name="swipe_wipe_s">   清除</string>
 		<string name="no_os1">沒有安裝任何系統！</string>
 		<string name="no_osrb">您確定要重啟？</string>
 		<string name="no_ospo">您確定要關機？</string>
 		<string name="rebooting">正在重啟…</string>
-		<string name="swipe_reboot">滑動按鈕確認重啟</string>
+		<string name="swipe_reboot">滑動滑塊確認重啟</string>
 		<string name="swipe_reboot_s">   重啟</string>
 		<string name="reboot_install_app_hdr">安裝 TWRP 應用？</string>
 		<string name="reboot_install_app1">您希望安裝官方 TWRP 應用嗎？</string>
@@ -125,8 +125,12 @@
 		<string name="reboot_install_app_prompt_install">如果 TWRP 應用未安裝時提示我</string>
 		<string name="reboot_install_app_system">安裝為系統應用</string>
 		<string name="reboot_installing_app">正在安裝應用…</string>
-		<string name="swipe_to_install_app">滑動按鈕確認安裝</string>
-		<string name="swipe_flash">滑動按鈕確認刷入</string>
+		<string name="swipe_to_install_app">滑動滑塊確認安裝</string>
+		<string name="uninstall_twrp_system_app">卸載 TWRP 應用</string>
+		<string name="uninstall_twrp_system_app_confirm">確認卸載 TWRP 應用？</string>
+		<string name="uninstalling_twrp_system_app">正在卸載 TWRP 應用…</string>
+		<string name="uninstall_twrp_system_app_complete">卸載 TWRP 應用完成</string>
+		<string name="swipe_flash">滑動滑塊確認刷入</string>
 		<string name="confirm_action">確認操作</string>
 		<string name="back_cancel">按返回按鈕取消。</string>
 		<string name="cancel_btn">取消</string>
@@ -137,12 +141,13 @@
 		<string name="factory_reset2">（不會清除內置存儲/sdcard）</string>
 		<string name="factory_reset3">在大多數情況下，您只需要</string>
 		<string name="factory_reset4">執行此操作即可。</string>
+		<string name="factory_reset5">（不包括用戶/鎖屏）</string>
 		<string name="factory_resetting">正在恢復出廠設置…</string>
 		<string name="advanced_wipe_hdr">高級清除選項</string>
 		<string name="advanced_wipe_btn">高級清除</string>
 		<string name="wipe_enc_confirm">是否清除 Data 分區加密？</string>
 		<string name="formatting_data">正在格式化 Data 分區…</string>
-		<string name="swipe_format_data">滑動按鈕確認格式化</string>
+		<string name="swipe_format_data">滑動滑塊確認格式化</string>
 		<string name="swipe_format_data_s">   格式化 Data 分區</string>
 		<string name="factory_reset_complete">恢復出廠完成</string>
 		<string name="sel_part_hdr">選擇分區</string>
@@ -165,50 +170,50 @@
 		<string name="format_data_complete">格式化 Data 分區完成</string>
 		<!-- Translator note: the word "yes" must remain English! -->
 		<string name="yes_continue">輸入 yes 繼續，按返回按鈕取消。</string>
-		<string name="part_opt_hdr">分區名：%tw_partition_name%</string>
+		<string name="part_opt_hdr">分區名: %tw_partition_name%</string>
 		<string name="sel_act_hdr">選擇操作</string>
 		<string name="file_sys_opt">檔案系統選項</string>
-		<string name="partition">分區：%tw_partition_name%</string>
-		<string name="part_mount_point">掛載位置：%tw_partition_mount_point%</string>
-		<string name="part_curr_fs">檔案系統：%tw_partition_file_system%</string>
+		<string name="partition">分區: %tw_partition_name%</string>
+		<string name="part_mount_point">掛載位置: %tw_partition_mount_point%</string>
+		<string name="part_curr_fs">檔案系統: %tw_partition_file_system%</string>
 		<string name="part_present_yes">當前：是</string>
 		<string name="part_present_no">當前：否</string>
 		<string name="part_removable_yes">可移除：是</string>
 		<string name="part_removable_no">可移除：否</string>
-		<string name="part_size">大小：%tw_partition_size%MB</string>
-		<string name="part_used">已用：%tw_partition_used%MB</string>
-		<string name="part_free">空閒：%tw_partition_free%MB</string>
-		<string name="part_backup_size">備份大小：%tw_partition_backup_size%MB</string>
+		<string name="part_size">大小: %tw_partition_size%MB</string>
+		<string name="part_used">已用: %tw_partition_used%MB</string>
+		<string name="part_free">空閒: %tw_partition_free%MB</string>
+		<string name="part_backup_size">備份大小: %tw_partition_backup_size%MB</string>
 		<string name="resize_btn">調整檔案系統</string>
 		<string name="resize_btn_s">調整</string>
 		<string name="resize_confirm">是否調整 %tw_partition_name%？</string>
 		<string name="resizing">正在調整…</string>
 		<string name="resize_complete">調整完成</string>
-		<string name="swipe_resize">滑動按鈕確認調整</string>
+		<string name="swipe_resize">滑動滑塊確認調整</string>
 		<string name="swipe_resize_s">   調整</string>
 		<string name="repair_btn">修復檔案系統</string>
 		<string name="repair_btn_s">修復</string>
 		<string name="repair_confirm">是否修復 %tw_partition_name%？</string>
 		<string name="repairing">正在修復…</string>
 		<string name="repair_complete">修復完成</string>
-		<string name="swipe_repair">滑動按鈕確認修復</string>
+		<string name="swipe_repair">滑動滑塊確認修復</string>
 		<string name="swipe_repair_s">   修復</string>
 		<string name="change_fs_btn">更改檔案系統</string>
 		<string name="change_fs_btn_s">更改</string>
-		<string name="change_fs_for_hdr">要更改的分區：%tw_partition_name%</string>
-		<string name="change_fs_for_hdr_s">分區：%tw_partition_name%&gt;選擇檔案系統</string>
+		<string name="change_fs_for_hdr">要更改的分區: %tw_partition_name%</string>
+		<string name="change_fs_for_hdr_s">分區: %tw_partition_name%&gt;選擇檔案系統</string>
 		<string name="change_fs_warn1">一些固件或內核可能不支持</string>
 		<string name="change_fs_warn2">某些檔案系統，請謹慎！</string>
 		<string name="change_fs_confirm">是否更改 %tw_partition_name% 為：</string>
 		<string name="formatting">正在格式化…</string>
 		<string name="format_complete">格式化完成</string>
-		<string name="swipe_change_fs">滑動按鈕確認更改</string>
+		<string name="swipe_change_fs">滑動滑塊確認更改</string>
 		<string name="swipe_change_s">   更改</string>
 		<string name="back_btn">返回</string>
 		<string name="wipe_enc_btn">清除加密</string>
-		<string name="swipe_factory_reset">滑動按鈕確認恢復出廠</string>
+		<string name="swipe_factory_reset">滑動滑塊確認恢復出廠</string>
 		<string name="repair_change_btn">修復或更改檔案系統</string>
-		<string name="storage_hdr">存儲位置：%tw_storage_display_name% (%tw_storage_free_size% MB)</string>
+		<string name="storage_hdr">存儲位置: %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
 		<string name="backup_hdr">備份</string>
 		<string name="backup_confirm_hdr">確認備份</string>
 		<string name="encryption_tab">加密</string>
@@ -221,13 +226,13 @@
 		<string name="enable_backup_comp_chk">啟用壓縮</string>
 		<string name="skip_digest_backup_chk" version="2">備份時跳過生成 Digest</string>
 		<string name="disable_backup_space_chk" version="2">在備份之前禁用剩餘空間檢查</string>
-		<string name="current_boot_slot">當前分區：%tw_active_slot%</string>
-		<string name="boot_slot_a">分區 A</string>
-		<string name="boot_slot_b">分區 B</string>
-		<string name="changing_boot_slot">更改啟動分區</string>
-		<string name="changing_boot_slot_complete">更改啟動分區完成</string>
+		<string name="current_boot_slot">當前槽位: %tw_active_slot%</string>
+		<string name="boot_slot_a">槽位 A</string>
+		<string name="boot_slot_b">槽位 B</string>
+		<string name="changing_boot_slot">更改啟動槽位</string>
+		<string name="changing_boot_slot_complete">更改啟動槽位完成</string>
 		<string name="refresh_sizes_btn">刷新大小</string>
-		<string name="swipe_backup">滑動按鈕確認備份</string>
+		<string name="swipe_backup">滑動滑塊確認備份</string>
 		<string name="append_date_btn">附加日期</string>
 		<string name="backup_name_exists">使用該名稱的備份已經存在！</string>
 		<string name="encrypt_backup">是否加密備份？</string>
@@ -251,7 +256,7 @@
 		<string name="del_backup_confirm2">此操作無法恢復！</string>
 		<string name="deleting_backup">正在刪除備份…</string>
 		<string name="backup_deleted">備份刪除完成</string>
-		<string name="swipe_delete">滑動按鈕確認刪除</string>
+		<string name="swipe_delete">滑動滑塊確認刪除</string>
 		<string name="swipe_delete_s">   刪除</string>
 		<string name="restore_try_decrypt">加密的備份 - 嘗試解密</string>
 		<string name="restore_try_decrypt_s">正在嘗試解密</string>
@@ -259,14 +264,14 @@
 		<string name="restore_sel_part">選擇要恢復的分區：</string>
 		<string name="restore_enable_digest_chk" version="2">啟用 Digest 校驗備份檔案</string>
 		<string name="restore_complete">恢復完成</string>
-		<string name="swipe_restore">滑動按鈕確認恢復</string>
+		<string name="swipe_restore">滑動滑塊確認恢復</string>
 		<string name="swipe_restore_s">   恢復</string>
 		<string name="rename_backup_hdr">重命名備份</string>
 		<string name="rename_backup_confirm">是否重命名備份檔案？</string>
 		<string name="rename_backup_confirm2">此操作無法恢復！</string>
 		<string name="renaming_backup">正在重命名…</string>
 		<string name="rename_backup_complete">重命名完成</string>
-		<string name="swipe_to_rename">滑動按鈕確認重命名</string>
+		<string name="swipe_to_rename">滑動滑塊確認重命名</string>
 		<string name="swipe_rename">   重命名</string>
 		<string name="confirm_hdr">確認</string>
 		<string name="mount_hdr">掛載</string>
@@ -279,8 +284,8 @@
 		<string name="mount_usb_storage_btn">掛載 USB 存儲</string>
 		<string name="usb_storage_hdr">USB 存儲</string>
 		<string name="usb_stor_mnt1">已掛載 USB 存儲</string>
-		<string name="usb_stor_mnt2">從您的電腦卸載之前</string>
-		<string name="usb_stor_mnt3">一定要安全地移除設備！</string>
+		<string name="usb_stor_mnt2">請確認解除挂載前先從</string>
+		<string name="usb_stor_mnt3">電腦上安全地移除設備！</string>
 		<string name="unmount_btn">卸載</string>
 		<string name="rb_system_btn">系統</string>
 		<string name="rb_poweroff_btn">關機</string>
@@ -289,7 +294,7 @@
 		<string name="rb_download_btn">Download</string>
 		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">正在關機…</string>
-		<string name="swipe_power_off">滑動按鈕確認關機</string>
+		<string name="swipe_power_off">滑動滑塊確認關機</string>
 		<string name="swipe_power_off_s">關機</string>
 		<string name="sys_ro_hdr">未修改的 System 分區</string>
 		<string name="sys_ro_keep">是否保持系統分區為只讀？</string>
@@ -304,7 +309,7 @@
 		<string name="sys_rol3">安裝刷機包或者通過 adb 操作依然可以修改系統分區。</string>
 		<string name="sys_ro_never_show_chk">下次啟動時不再顯示此介面</string>
 		<string name="sys_ro_keep_ro_btn">保持只讀</string>
-		<string name="swipe_allow_mod">滑動按鈕允許修改</string>
+		<string name="swipe_allow_mod">滑動滑塊允許修改</string>
 		<string name="swipe_allow_mod_s">允許修改</string>
 		<string name="settings_hdr">設置</string>
 		<string name="settings_gen_hdr">常規</string>
@@ -337,9 +342,9 @@
 		<string name="utcm6">(UTC -6) 北美中部標準時間</string>
 		<string name="utcm5">(UTC -5) 北美東部標準時間</string>
 		<string name="utcm4">(UTC -4) 大西洋標準時間</string>
-		<string name="utcm3">(UTC -3) 巴西、阿根廷(布宜諾斯)</string>
+		<string name="utcm3">(UTC -3) 巴西、阿根廷（布宜諾斯）</string>
 		<string name="utcm2">(UTC -2) 大西洋中部</string>
-		<string name="utcm1">(UTC -1) 葡萄牙(亞速爾群島)，佛得角</string>
+		<string name="utcm1">(UTC -1) 葡萄牙（亞速爾群島），佛得角</string>
 		<string name="utc0">(UTC  0) 倫敦、都柏林、里斯本</string>
 		<string name="utcp1">(UTC +1) 柏林、布魯塞爾、巴黎</string>
 		<string name="utcp2">(UTC +2) 雅典、伊斯坦布爾、南非</string>
@@ -353,23 +358,23 @@
 		<string name="utcp10">(UTC +10) 澳大利亞東部、關島</string>
 		<string name="utcp11">(UTC +11) 符拉迪沃斯托克、所羅門群島</string>
 		<string name="utcp12">(UTC +12) 奧克蘭、惠靈頓、斐濟</string>
-		<string name="sel_tz_offset">時間偏差（通常為 0）：%tw_time_zone_guioffset%</string>
+		<string name="sel_tz_offset">時間偏差（通常為 0）: %tw_time_zone_guioffset%</string>
 		<string name="tz_offset_none">無</string>
 		<string name="tz_offset_0">0 分鐘</string>
 		<string name="tz_offset_15">15 分鐘</string>
 		<string name="tz_offset_30">30 分鐘</string>
 		<string name="tz_offset_45">45 分鐘</string>
 		<string name="use_dst_chk">使用夏令時 (DST)</string>
-		<string name="curr_tz">當前時區：%tw_time_zone%</string>
+		<string name="curr_tz">當前時區: %tw_time_zone%</string>
 		<string name="curr_tz_s">當前時區：</string>
 		<string name="set_tz_btn">設置時區</string>
 		<string name="settings_screen_hdr">螢幕</string>
 		<string name="settings_screen_timeout_hdr">螢幕超時</string>
 		<string name="enable_timeout_chk">啟用螢幕超時</string>
 		<string name="screen_to_slider">螢幕超時時間（秒）：</string>
-		<string name="screen_to_slider_s">螢幕超時（0=禁用）：%tw_screen_timeout_secs%</string>
+		<string name="screen_to_slider_s">螢幕超時（0=禁用）: %tw_screen_timeout_secs%</string>
 		<string name="screen_to_na">螢幕超時設置不可用</string>
-		<string name="screen_bright_slider">螢幕亮度：%tw_brightness_pct%%</string>
+		<string name="screen_bright_slider">螢幕亮度: %tw_brightness_pct%%</string>
 		<string name="screen_bright_na">螢幕亮度設置不可用</string>
 		<string name="vibration_hdr">振動</string>
 		<string name="button_vibration_hdr">按鈕振動</string>
@@ -397,7 +402,7 @@
 		<string name="inject_twrp_confirm">是否重新注入 TWRP？</string>
 		<string name="injecting_twrp">正在重新注入 TWRP…</string>
 		<string name="inject_twrp_complete">TWRP 注入完成</string>
-		<string name="swipe_to_confirm">滑動按鈕確認</string>
+		<string name="swipe_to_confirm">滑動滑塊確認</string>
 		<string name="part_sd_hdr">SD 卡分區</string>
 		<string name="invalid_partsd_sel">您必須選擇一個可移動設備</string>
 		<string name="part_sd_lose">您將會丟失 SD 卡上的所有檔案！</string>
@@ -407,7 +412,7 @@
 		<string name="part_sd_m">-</string>
 		<string name="part_sd_p">+</string>
 		<string name="file_system">檔案系統：</string>
-		<string name="swipe_part_sd">滑動按鈕確認分區</string>
+		<string name="swipe_part_sd">滑動滑塊確認分區</string>
 		<string name="swipe_part_sd_s">分區</string>
 		<string name="partitioning_sd">正在對 SD 卡分區…</string>
 		<string name="partitioning_sd2">這將需要幾分鐘的時間。</string>
@@ -425,14 +430,14 @@
 		<string name="dumlock_install_confirm">是否安裝 HTC Dumlock 檔案到系統中？</string>
 		<string name="dumlock_installing">正在安裝 HTC Dumlock…</string>
 		<string name="dumlock_install_complete">HTC Dumlock 安裝完成</string>
-		<string name="swipe_to_unlock">滑動按鈕解鎖</string>
+		<string name="swipe_to_unlock">滑動滑塊解鎖</string>
 		<string name="swipe_unlock">   解鎖</string>
 		<string name="fm_hdr">檔案管理</string>
 		<string name="fm_sel_file">選擇檔案或檔案夾</string>
 		<string name="fm_type_folder">檔案夾</string>
 		<string name="fm_type_file">檔案</string>
 		<string name="fm_choose_act">選擇操作</string>
-		<string name="fm_selected">已選擇：%tw_fm_type%</string>
+		<string name="fm_selected">已選擇: %tw_fm_type%</string>
 		<string name="fm_copy_btn">複製</string>
 		<string name="fm_copy_file_btn">複製檔案</string>
 		<string name="fm_copy_folder_btn">複製檔案夾</string>
@@ -460,7 +465,7 @@
 		<string name="decrypt_data_failed_pattern">圖案錯誤，請重試！</string>
 		<string name="decrypt_data_enter_pattern">繪製解鎖圖案</string>
 		<string name="decrypt_data_trying">正在嘗試解密</string>
-		<string name="decrypt_data_vold_os_missing">缺少解密 vold 所需的檔案：{1}</string>
+		<string name="decrypt_data_vold_os_missing">缺少解密 vold 所需的檔案: {1}</string>
 		<string name="term_hdr">終端命令</string>
 		<string name="term_s_hdr">終端</string>
 		<string name="term_kill_btn">終止</string>
@@ -468,7 +473,7 @@
 		<string name="adb_sideload_hdr">ADB Sideload</string>
 		<string name="sideload_wipe_dalvik_chk">清除 Dalvik Cache</string>
 		<string name="sideload_wipe_cache_chk">清除 Cache</string>
-		<string name="swipe_to_sideload">滑動按鈕開始 Sideload</string>
+		<string name="swipe_to_sideload">滑動滑塊開始 Sideload</string>
 		<string name="swipe_sideload">   開始</string>
 		<string name="sideload_confirm">ADB Sideload</string>
 		<string name="sideload_usage">使用方式：adb sideload filename.zip</string>
@@ -477,7 +482,7 @@
 		<string name="fix_contexts_note1">注意：很少情況下需要修復 Context。</string>
 		<string name="fix_contexts_note2">修復 SELinux Context 可能會導致</string>
 		<string name="fix_contexts_note3">您的設備無法正常啓動。</string>
-		<string name="swipe_to_fix_contexts">滑動按鈕確認修復</string>
+		<string name="swipe_to_fix_contexts">滑動滑塊確認修復</string>
 		<string name="swipe_fix_contexts">   修復 Context</string>
 		<string name="fixing_contexts">正在修復 Context…</string>
 		<string name="fix_contexts_complete">修復 Context 完成</string>
@@ -493,7 +498,7 @@
 		<string name="repack_ramdisk_confirm">是否安裝 Recovery？</string>
 		<string name="repack_backup_first">請先備份現有的鏡像</string>
 		<string name="repack">重新打包</string>
-		<string name="swipe_to_install">滑動按鈕確認安裝</string>
+		<string name="swipe_to_install">滑動滑塊確認安裝</string>
 		<string name="installing">正在安裝…</string>
 		<string name="install_complete">安裝完成</string>
 		<string name="unpack_error">解包鏡像錯誤。</string>
@@ -507,6 +512,19 @@
 		<string name="fix_recovery_loop_complete">Recovery 無限重啟修復完成</string>
 		<string name="fixing_recovery_loop_patch">正在對內核打補丁…</string>
 		<string name="fix_recovery_loop_patch_error">對內核打補丁時出錯。</string>
+		<string name="decrypt_users">解密用戶</string>
+		<string name="decrypt_users_selection">選擇一位要解密的用戶 ID</string>
+		<string name="select_user">選擇用戶</string>
+		<string name="backup_storage_undecrypt_warning">備份不包含一些屬於用戶 {1} 的文件，因爲該用戶沒有解密</string>
+		<string name="decrypting_user_fbe">嘗試為用戶 {1} 解密 FBE…</string>
+		<string name="decrypt_user_success_fbe">用戶 {1} 解密成功</string>
+		<string name="decrypt_user_fail_fbe">用戶 {1} 解密失敗</string>
+		<string name="decrypt_data_enter_pass_fbe">請輸入用戶 [%tw_crypto_user_id%] 的密碼</string>
+		<string name="decrypt_data_enter_pattern_fbe">請繪製用戶 [%tw_crypto_user_id%] 的解鎖圖案</string>
+		<string name="multiuser_warning1">并非所有用戶都被解密！</string>
+		<string name="multiuser_warning2">備份/還原操作可能會失敗！</string>
+		<string name="multiuser_warning_accept">仍然繼續</string>
+		<string name="multiuser_warning_hdr">多用戶警告</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">內核不支持讀取 SELinux Context。</string>
@@ -522,40 +540,40 @@
 		<string name="digest_created" version="2"> * Digest 已生成。</string>
 		<string name="digest_error" version="2"> * Digest 錯誤！</string>
 		<string name="digest_compute_error" version="2"> * 計算 Digest 錯誤。</string>
-		<string name="current_date">(Current Date)</string>
-		<string name="auto_generate">(Auto Generate)</string>
-		<string name="unable_to_locate_partition">未找到 '{1}' 分區。</string>
+		<string name="current_date">（當前日期）</string>
+		<string name="auto_generate">（自動生成）</string>
+		<string name="unable_to_locate_partition">未找到“{1}”分區。</string>
 		<string name="no_partition_selected">未選擇備份分區。</string>
-		<string name="total_partitions_backup"> * 備份分區總數：{1}</string>
-		<string name="total_backup_size"> * 備份數據總計：{1}MB</string>
-		<string name="available_space"> * 可用空間：{1}MB</string>
+		<string name="total_partitions_backup"> * 備份分區總數: {1}</string>
+		<string name="total_backup_size"> * 備份數據總計: {1}MB</string>
+		<string name="available_space"> * 可用空間: {1}MB</string>
 		<string name="unable_locate_storage">未找到存儲設備。</string>
 		<string name="no_space">記憶體上沒有足夠的空間。</string>
 		<string name="backup_started">[已開始備份]</string>
-		<string name="backup_folder"> * 備份檔案夾：{1}</string>
+		<string name="backup_folder"> * 備份檔案夾: {1}</string>
 		<string name="fail_backup_folder">建立備份檔案夾失敗。</string>
-		<string name="avg_backup_fs">檔案平均備份速度：{1}MB/秒</string>
-		<string name="avg_backup_img">鏡像平均備份速度：{1}MB/秒</string>
+		<string name="avg_backup_fs">檔案平均備份速度: {1}MB/秒</string>
+		<string name="avg_backup_img">鏡像平均備份速度: {1}MB/秒</string>
 		<string name="total_backed_size">[總計備份 {1}MB]</string>
 		<string name="backup_completed">[備份已完成，耗時 {1} 秒]</string>
 		<string name="restore_started">[已開始恢復]</string>
-		<string name="restore_folder">恢復檔案夾：'{1}'</string>
+		<string name="restore_folder">恢復檔案夾:“{1}”</string>
 		<!-- {1} is the partition display name and {2} is the number of seconds -->
 		<string name="restore_part_done">[{1} 恢復完成（{2} 秒）]</string>
 		<string name="verifying_digest" version="2">正在校驗 Digest</string>
 		<string name="skip_digest" version="2">基於用戶設置，已跳過 Digest 檢查。</string>
 		<string name="calc_restore">正在計算恢復詳情…</string>
 		<string name="restore_read_only">無法恢復 {1} -- 已掛載為只讀。</string>
-		<string name="restore_unable_locate">未找到 '{1}' 分區。</string>
+		<string name="restore_unable_locate">未找到“{1}”分區。</string>
 		<string name="no_part_restore">未選擇要恢復的分區。</string>
 		<string name="restore_part_count">正在恢復 {1} 個分區…</string>
 		<string name="total_restore_size">恢復檔案總計 {1}MB</string>
 		<string name="updating_system_details">更新系統詳細資訊</string>
 		<string name="restore_completed">[恢復完成，耗時 {1} 秒]</string>
 		<!-- {1} is the path we could not open, {2} is strerror output -->
-		<string name="error_opening_strerr">打開出錯：'{1}' ({2})</string>
-		<string name="unable_locate_part_backup_name">無法通過備份名稱來查找分區：'{1}'</string>
-		<string name="unable_find_part_path">找不到分區路徑 '{1}'</string>
+		<string name="error_opening_strerr">打開出錯:“{1}” ({2})</string>
+		<string name="unable_locate_part_backup_name">無法通過備份名稱來查找分區:“{1}”</string>
+		<string name="unable_find_part_path">找不到分區路徑“{1}”</string>
 		<string name="update_part_details">正在更新分區詳情…</string>
 		<string name="update_part_details_done">…完成</string>
 		<string name="wiping_dalvik">正在清除 Dalvik 目錄…</string>
@@ -570,7 +588,7 @@
 		<string name="unable_to_mount_storage">無法掛載存儲</string>
 		<string name="fail_decrypt">解密數據失敗。</string>
 		<string name="no_crypto_support">此版本不支持加密。</string>
-		<string name="decrypt_success_dev">Data 分區成功解密，新增塊設備：'{1}'</string>
+		<string name="decrypt_success_dev">Data 分區成功解密，新增塊設備:“{1}”</string>
 		<string name="decrypt_success_nodev">Data 分區已成功解密</string>
 		<string name="done">完成。</string>
 		<string name="start_partition_sd">正在給 SD 卡分區…</string>
@@ -578,17 +596,17 @@
 		<string name="ext_swap_size">EXT+Swap 大小超過 SD 卡容量。</string>
 		<string name="remove_part_table">正在刪除分區表…</string>
 		<string name="unable_rm_part">無法刪除分區表。</string>
-		<string name="create_part">正在建立 {1} 分區…</string>
-		<string name="unable_to_create_part">無法建立 {1} 分區。</string>
+		<string name="create_part">正在創建 {1} 分區…</string>
+		<string name="unable_to_create_part">無法創建 {1} 分區。</string>
 		<string name="format_sdext_as">正在將 sd-ext 格式化為 {1}…</string>
 		<string name="part_complete">分區完成。</string>
-		<string name="unable_to_open">無法打開 '{1}'。</string>
+		<string name="unable_to_open">無法打開“{1}”。</string>
 		<string name="mtp_already_enabled">MTP 已經啟用</string>
 		<string name="mtp_fail">啟用 MTP 失敗</string>
 		<string name="no_mtp">不支持 MTP</string>
 		<string name="image_flash_start">[開始刷入鏡像]</string>
-		<string name="img_to_flash">刷入鏡像：'{1}'</string>
-		<string name="flash_unable_locate">未找到 '{1}' 分區。</string>
+		<string name="img_to_flash">刷入鏡像:“{1}”</string>
+		<string name="flash_unable_locate">未找到“{1}”分區。</string>
 		<string name="no_part_flash">未選擇刷入分區。</string>
 		<string name="too_many_flash">選擇刷入的分區太多。</string>
 		<string name="invalid_flash">指定的刷入分區無效。</string>
@@ -599,48 +617,48 @@
 		<string name="unable_repair">無法修復 {1}。</string>
 		<string name="mount_data_footer">無法掛載/data，未找到加密 footer。</string>
 		<!-- {1} is the folder name that we could not create, {2} is strerror output -->
-		<string name="create_folder_strerr">無法創建 '{1}' 檔案夾 ({2})。</string>
+		<string name="create_folder_strerr">無法創建“{1}”檔案夾 ({2})。</string>
 		<!-- {1} is the folder name that we could not mount, {2} is strerror output -->
-		<string name="fail_mount">掛載 '{1}' 失敗 ({2})</string>
+		<string name="fail_mount">掛載“{1}”失敗 ({2})</string>
 		<!-- {1} is the folder name that we could not unmount, {2} is strerror output -->
-		<string name="fail_unmount">卸載 '{1}' 失敗 ({2})</string>
-		<string name="cannot_resize">無法更改 {1} 大小。</string>
+		<string name="fail_unmount">卸載“{1}”失敗 ({2})</string>
+		<string name="cannot_resize">無法更改 {1} 的大小。</string>
 		<string name="repair_resize">在調整大小之前修復 {1}。</string>
-		<string name="unable_resize">無法調整 {1} 大小。</string>
-		<string name="no_digest_found" version="2">未找到 '{1}' 的 Digest 校驗檔案。請取消選中“啟用 Digest 校驗備份檔案”複選框。</string>
-		<string name="digest_fail_match" version="2">'{1}' Digest 校驗失敗。</string>
-		<string name="digest_matched" version="2">Digest 匹配 '{1}'。</string>
-		<string name="fail_decrypt_tar">無法解密 tar 檔案 '{1}'</string>
+		<string name="unable_resize">無法調整 {1} 的大小。</string>
+		<string name="no_digest_found" version="2">未找到“{1}”的 Digest 校驗檔案。請取消選中“啟用 Digest 校驗備份檔案”複選框。</string>
+		<string name="digest_fail_match" version="2">“{1}” Digest 校驗失敗。</string>
+		<string name="digest_matched" version="2">Digest 匹配“{1}”。</string>
+		<string name="fail_decrypt_tar">無法解密 Tar 檔案“{1}”</string>
 		<string name="format_data_msg">您可能需要重啟 Recovery 才能使用/data。</string>
 		<string name="format_data_err">無法格式化並刪除加密。</string>
 		<string name="formatting_using">使用 {2} 格式化 {1}…</string>
 		<string name="unable_to_wipe">無法清除 {1}。</string>
 		<string name="cannot_wipe">無法清除 {1} 分區。</string>
-		<string name="remove_all">移除 '{1}' 下的所有檔案</string>
+		<string name="remove_all">移除“{1}”下的所有檔案</string>
 		<string name="wiping_data">正在清除 Data 分区，跳過清除/data/media…</string>
 		<string name="backing_up">正在備份 {1}…</string>
 		<string name="backup_storage_warning">備份的 {1} 分區不包含內置存儲上的任何檔案，例如照片或下載的檔案等等。</string>
 		<string name="backing">正在備份</string>
-		<string name="backup_size">'{1}' 的備份檔案大小為 0 位元組。</string>
+		<string name="backup_size">“{1}”的備份檔案大小為 0 位元組。</string>
 		<string name="datamedia_fs_restore">警告：此/data備份檔案系統為 {1}！除非把檔案系統格式設置為 {1} 否則可能無法啟動。</string>
 		<string name="restoring">正在恢復 {1}…</string>
 		<string name="restoring_hdr">正在恢復</string>
 		<string name="recreate_folder_err">無法重新創建 {1} 檔案夾。</string>
 		<string name="img_size_err">鏡像大小大於目標設備</string>
 		<string name="flashing">正在刷入 {1}…</string>
-		<string name="backup_folder_set">備份檔案夾設置為：'{1}'</string>
-		<string name="locate_backup_err">未找到備份檔案 '{1}'</string>
-		<string name="set_restore_opt">設置恢復選項：'{1}'：</string>
+		<string name="backup_folder_set">備份檔案夾設置為:“{1}”</string>
+		<string name="locate_backup_err">未找到備份檔案“{1}”</string>
+		<string name="set_restore_opt">設置恢復選項:“{1}”：</string>
 		<string name="digest_check_skip" version="2">跳過校驗 Digest 已開啟</string>
 		<string name="ors_encrypt_restore_err">無法使用 OpenRecoveryScript 腳本恢復加密備份。</string>
 		<string name="mounting">正在掛載</string>
 		<string name="unmounting">正在卸載</string>
-		<string name="mounted">'{1}' 已掛載</string>
-		<string name="unmounted">'{1}' 已卸載</string>
-		<string name="setting">設置 '{1}' 為 '{2}'</string>
-		<string name="setting_empty">設置 '{1}' 為空</string>
+		<string name="mounted">“{1}”已掛載</string>
+		<string name="unmounted">“{1}”已卸載</string>
+		<string name="setting">設置“{1}”為“{2}”</string>
+		<string name="setting_empty">設置“{1}”為空</string>
 		<string name="making_dir1">創建目錄</string>
-		<string name="making_dir2">創建目錄：'{1}'</string>
+		<string name="making_dir2">創建目錄:“{1}”</string>
 		<string name="running_command">運行命令</string>
 		<string name="sideload">ADB Sideload</string>
 		<string name="start_sideload">正在開始 ADB sideload…</string>
@@ -648,8 +666,8 @@
 		<string name="no_pwd">未提供密碼。</string>
 		<string name="done_ors">腳本執行完畢</string>
 		<string name="injecttwrp">正在注入 TWRP 到 Boot 鏡像…</string>
-		<string name="zip_err">安裝 Zip 刷機包 '{1}' 時出錯</string>
-		<string name="installing_zip">正在安裝 Zip 刷機包 '{1}'</string>
+		<string name="zip_err">安裝 Zip 刷機包“{1}”時出錯</string>
+		<string name="installing_zip">正在安裝 Zip 刷機包“{1}”</string>
 		<string name="select_backup_opt">設置備份選項：</string>
 		<string name="compression_on">壓縮選項已開啟</string>
 		<string name="digest_off" version="2">Digest 生成已關閉</string>
@@ -661,7 +679,7 @@
 		<string name="ors_complete">運行 OpenRecoveryScript 腳本完成</string>
 		<string name="check_for_digest" version="2">正在檢測 Digest…</string>
 		<string name="invalid_zip_format">Zip 檔案格式無效！</string>
-		<string name="fail_sysmap">映射檔案 '{1}' 失敗</string>
+		<string name="fail_sysmap">映射檔案“{1}”失敗</string>
 		<string name="verify_zip_sig">正在校驗 Zip 刷機包簽名…</string>
 		<string name="verify_zip_fail">刷機包簽名校驗失敗！</string>
 		<string name="verify_zip_done">刷機包簽名校驗成功。</string>
@@ -669,8 +687,8 @@
 		<string name="no_digest" version="2">跳過 Digest 校驗：未找到 Digest 檔案</string>
 		<string name="digest_fail" version="2">Digest 不匹配</string>
 		<string name="digest_match" version="2">Digest 校驗成功</string>
-		<string name="pid_signal">{1} 過程結束，標誌：{2}</string>
-		<string name="pid_error">{1} 過程結束，錯誤：{2}</string>
+		<string name="pid_signal">{1} 過程結束，標誌: {2}</string>
+		<string name="pid_error">{1} 過程結束，錯誤: {2}</string>
 		<string name="install_dumlock">安裝 HTC Dumlock 到系統…</string>
 		<string name="dumlock_restore">正在恢復原版 Boot…</string>
 		<string name="dumlock_reflash">正在重新刷入 Recovery 到 Boot…</string>
@@ -683,7 +701,7 @@
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">已完成 %llu 個，共 %llu 個檔案，進度 %i%%</string>
 		<string name="size_progress">已完成 %lluMB，共 %lluMB，進度 %i%%</string>
-		<string name="decrypt_cmd">嘗試通過命令行解密 Data 分區。</string>
+		<string name="decrypt_cmd" version="2">正在嘗試通過命令行解密 Data 分區或用戶數據。</string>
 		<string name="base_pkg_err">無法加載基本包。</string>
 		<string name="simulating">正在模擬操作…</string>
 		<string name="backup_cancel">備份已取消。</string>
@@ -700,7 +718,7 @@
 		<string name="auto_gen">(Auto Generate)</string>
 		<string name="curr_date">(Current Date)</string>
 		<string name="backup_name_len">備份名稱太長。</string>
-		<string name="backup_name_invalid">備份名稱 '{1}' 中包含無效字元：'{1}'</string>
+		<string name="backup_name_invalid">備份名稱“{1}”中包含無效字元:“{1}”</string>
 		<string name="no_real_sdcard">此設備沒有真實的 SD 卡！正在中止！</string>
 		<string name="cancel_sideload">取消 ADB Sideload…</string>
 		<string name="change_fs_err">更換檔案系統时出錯。</string>
@@ -709,11 +727,18 @@
 		<string name="install_reboot" version="2">將會在 %tw_sleep% 秒內重啟</string>
 		<string name="adbbackup_error">ADB 備份錯誤。正在退出…"</string>
 		<string name="adbbackup_control_error">無法寫入 adb 控制通道</string>
-		<string name="twrp_adbbu_option">--twrp 選項需啟用 twrp adb backup</string>
-		<string name="partition_not_found">分區列表中未發現路徑：{1}</string>
+		<string name="twrp_adbbu_option">啟用 TWRP ADB 備份需使用 --twrp 選項</string>
+		<string name="partition_not_found">分區列表中未發現路徑: {1}</string>
 		<string name="copy_kernel_log">已導出內核日誌至 {1}</string>
 		<string name="include_kernel_log">包含內核日誌</string>
 		<string name="sha2_chk">使用 SHA2 進行散列校驗</string>
-		<string name="unable_set_boot_slot">更改 bootloader 啟動分區至 {1} 錯誤</string>
+		<string name="unable_set_boot_slot">更改 Bootloader 啟動槽位至 {1} 錯誤</string>
+		<string name="unmount_sys_install">在安裝 Zip 刷機包之前先解除挂載 System</string>
+		<string name="unmount_system">正在解除挂載 System…</string>
+		<string name="unmount_system_err">解除挂載 System 失敗</string>
+		<string name="flash_ab_inactive">正在刷入 A/B Zip 刷機包至非活動槽位: {1}</string>
+		<string name="flash_ab_reboot">如需刷入其它的 Zip 刷機包，請重新啓動 Recovery 切換到新槽位。</string>
+		<string name="ozip_decrypt_decryption">正在解密 Ozip…</string>
+		<string name="ozip_decrypt_finish">Ozip 解密完成！</string>
 	</resources>
 </language>

From 6ce15437b47d894fa9c5c98406ebe1400c6af30f Mon Sep 17 00:00:00 2001
From: klabit87 <keith.labit@gmail.com>
Date: Sat, 2 Jan 2021 12:38:21 -0600
Subject: [PATCH 128/207] Remove duplicate PackageExtractFileFn

Change-Id: I4d211d7b97d528fd17efe61bf5ba817a2e9774f9
---
 updater/install.cpp | 88 ---------------------------------------------
 1 file changed, 88 deletions(-)

diff --git a/updater/install.cpp b/updater/install.cpp
index 2266127f25..bcc859a1e2 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -149,94 +149,6 @@ Value* UIPrintFn(const char* name, State* state, const std::vector<std::unique_p
   return StringValue(buffer);
 }
 
-// package_extract_file(package_file[, dest_file])
-//   Extracts a single package_file from the update package and writes it to dest_file,
-//   overwriting existing files if necessary. Without the dest_file argument, returns the
-//   contents of the package file as a binary blob.
-Value* PackageExtractFileFn(const char* name, State* state,
-                            const std::vector<std::unique_ptr<Expr>>& argv) {
-  if (argv.size() < 1 || argv.size() > 2) {
-    return ErrorAbort(state, kArgsParsingFailure, "%s() expects 1 or 2 args, got %zu", name,
-                      argv.size());
-  }
-
-  if (argv.size() == 2) {
-    // The two-argument version extracts to a file.
-
-    std::vector<std::string> args;
-    if (!ReadArgs(state, argv, &args)) {
-      return ErrorAbort(state, kArgsParsingFailure, "%s() Failed to parse %zu args", name,
-                        argv.size());
-    }
-    const std::string& zip_path = args[0];
-    const std::string& dest_path = args[1];
-
-    ZipArchiveHandle za = static_cast<UpdaterInfo*>(state->cookie)->package_zip;
-    ZipString zip_string_path(zip_path.c_str());
-    ZipEntry entry;
-    if (FindEntry(za, zip_string_path, &entry) != 0) {
-      LOG(ERROR) << name << ": no " << zip_path << " in package";
-      return StringValue("");
-    }
-
-    unique_fd fd(TEMP_FAILURE_RETRY(
-        ota_open(dest_path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)));
-    if (fd == -1) {
-      PLOG(ERROR) << name << ": can't open " << dest_path << " for write";
-      return StringValue("");
-    }
-
-    bool success = true;
-    int32_t ret = ExtractEntryToFile(za, &entry, fd);
-    if (ret != 0) {
-      LOG(ERROR) << name << ": Failed to extract entry \"" << zip_path << "\" ("
-                 << entry.uncompressed_length << " bytes) to \"" << dest_path
-                 << "\": " << ErrorCodeString(ret);
-      success = false;
-    }
-    if (ota_fsync(fd) == -1) {
-      PLOG(ERROR) << "fsync of \"" << dest_path << "\" failed";
-      success = false;
-    }
-    if (ota_close(fd) == -1) {
-      PLOG(ERROR) << "close of \"" << dest_path << "\" failed";
-      success = false;
-    }
-
-    return StringValue(success ? "t" : "");
-  } else {
-    // The one-argument version returns the contents of the file as the result.
-
-    std::vector<std::string> args;
-    if (!ReadArgs(state, argv, &args)) {
-      return ErrorAbort(state, kArgsParsingFailure, "%s() Failed to parse %zu args", name,
-                        argv.size());
-    }
-    const std::string& zip_path = args[0];
-
-    ZipArchiveHandle za = static_cast<UpdaterInfo*>(state->cookie)->package_zip;
-    ZipString zip_string_path(zip_path.c_str());
-    ZipEntry entry;
-    if (FindEntry(za, zip_string_path, &entry) != 0) {
-      return ErrorAbort(state, kPackageExtractFileFailure, "%s(): no %s in package", name,
-                        zip_path.c_str());
-    }
-
-    std::string buffer;
-    buffer.resize(entry.uncompressed_length);
-
-    int32_t ret =
-        ExtractToMemory(za, &entry, reinterpret_cast<uint8_t*>(&buffer[0]), buffer.size());
-    if (ret != 0) {
-      return ErrorAbort(state, kPackageExtractFileFailure,
-                        "%s: Failed to extract entry \"%s\" (%zu bytes) to memory: %s", name,
-                        zip_path.c_str(), buffer.size(), ErrorCodeString(ret));
-    }
-
-    return new Value(VAL_BLOB, buffer);
-  }
-}
-
 // apply_patch(src_file, tgt_file, tgt_sha1, tgt_size, patch1_sha1, patch1_blob, [...])
 //   Applies a binary patch to the src_file to produce the tgt_file. If the desired target is the
 //   same as the source, pass "-" for tgt_file. tgt_sha1 and tgt_size are the expected final SHA1

From 7a45b898c337462856d40daccc07deab9baf9cd9 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sat, 2 Nov 2019 20:04:34 +0800
Subject: [PATCH 129/207] cryptfs: add support for keymaster 2

Change-Id: I1c4f06551897c8964ac2d40c9e785d527cc83847
---
 crypto/fde/cryptfs.cpp | 94 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 90 insertions(+), 4 deletions(-)

diff --git a/crypto/fde/cryptfs.cpp b/crypto/fde/cryptfs.cpp
index 9ba4f0b0b2..eeefc2976f 100644
--- a/crypto/fde/cryptfs.cpp
+++ b/crypto/fde/cryptfs.cpp
@@ -74,6 +74,7 @@
 #include <openssl/sha.h>
 #include <hardware/keymaster0.h>
 #include <hardware/keymaster1.h>
+#include <hardware/keymaster2.h>
 #endif
 //#include "android-base/properties.h"
 //#include <bootloader_message/bootloader_message.h>
@@ -176,7 +177,8 @@ static int keymaster_init(keymaster_device_t **keymaster_dev)
 }
 #else //TW_KEYMASTER_MAX_API == 0
 static int keymaster_init(keymaster0_device_t **keymaster0_dev,
-                          keymaster1_device_t **keymaster1_dev)
+                          keymaster1_device_t **keymaster1_dev,
+			  keymaster2_device_t **keymaster2_dev)
 {
     int rc;
 
@@ -192,7 +194,11 @@ static int keymaster_init(keymaster0_device_t **keymaster0_dev,
 
     *keymaster0_dev = NULL;
     *keymaster1_dev = NULL;
-    if (mod->module_api_version == KEYMASTER_MODULE_API_VERSION_1_0) {
+    *keymaster2_dev = NULL;
+    if (mod->module_api_version == KEYMASTER_MODULE_API_VERSION_2_0) {
+        printf("Found keymaster2 module, using keymaster2 API.\n");
+        rc = keymaster2_open(mod, keymaster2_dev);
+    } else if (mod->module_api_version == KEYMASTER_MODULE_API_VERSION_1_0) {
         printf("Found keymaster1 module, using keymaster1 API.\n");
         rc = keymaster1_open(mod, keymaster1_dev);
     } else {
@@ -211,6 +217,7 @@ static int keymaster_init(keymaster0_device_t **keymaster0_dev,
 err:
     *keymaster0_dev = NULL;
     *keymaster1_dev = NULL;
+    *keymaster2_dev = NULL;
     return rc;
 }
 #endif //TW_KEYMASTER_MAX_API == 0
@@ -424,7 +431,8 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
 #if TW_KEYMASTER_MAX_API >= 1
     keymaster0_device_t *keymaster0_dev = 0;
     keymaster1_device_t *keymaster1_dev = 0;
-    if (keymaster_init(&keymaster0_dev, &keymaster1_dev)) {
+    keymaster2_device_t *keymaster2_dev = 0;
+    if (keymaster_init(&keymaster0_dev, &keymaster1_dev, &keymaster2_dev)) {
 #else
     keymaster_device_t *keymaster0_dev = 0;
     if (keymaster_init(&keymaster0_dev)) {
@@ -500,6 +508,82 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
             goto out;
         }
 
+        *signature = (uint8_t*)tmp_sig.data;
+        *signature_size = tmp_sig.data_length;
+        rc = 0;
+    }
+    else if (keymaster2_dev) {
+        keymaster_key_blob_t key = { ftr->keymaster_blob, ftr->keymaster_blob_size };
+        keymaster_key_param_t params[] = {
+            keymaster_param_enum(KM_TAG_PADDING, KM_PAD_NONE),
+            keymaster_param_enum(KM_TAG_DIGEST, KM_DIGEST_NONE),
+        };
+        keymaster_key_param_set_t param_set = { params, sizeof(params)/sizeof(*params) };
+        keymaster_operation_handle_t op_handle;
+        keymaster_key_param_t config_params[] = {
+            // Set these to crazy values so we don't need to synchronize
+            // the recovery with system updates.
+            // key upgrades will be required; it will be upgraded in-memory
+            keymaster_param_int(KM_TAG_OS_VERSION, 999999),
+	    keymaster_param_int(KM_TAG_OS_PATCHLEVEL, 209912),
+        };
+        keymaster_key_param_set_t config_param_set = { config_params, sizeof(config_params)/sizeof(*config_params) };
+        keymaster2_dev->configure(keymaster2_dev, &config_param_set);
+        keymaster_error_t error = keymaster2_dev->begin(keymaster2_dev, KM_PURPOSE_SIGN, &key,
+                                                        &param_set, NULL /* out_params */,
+                                                        &op_handle);
+        if (error == KM_ERROR_KEY_RATE_LIMIT_EXCEEDED) {
+            // Key usage has been rate-limited.  Wait a bit and try again.
+            sleep(KEYMASTER_CRYPTFS_RATE_LIMIT);
+            error = keymaster2_dev->begin(keymaster2_dev, KM_PURPOSE_SIGN, &key,
+                                          &param_set, NULL /* out_params */,
+                                          &op_handle);
+        }
+
+        if (error == KM_ERROR_KEY_REQUIRES_UPGRADE) {
+            // Upgrade key in-memory if required
+            // Do not actually write it back; just keep it in memory
+            const keymaster_key_blob_t key_to_upd = key;
+            keymaster2_dev->upgrade_key(keymaster2_dev, &key_to_upd, &config_param_set, &key);
+            error = keymaster2_dev->begin(keymaster2_dev, KM_PURPOSE_SIGN, &key,
+                                          &param_set, NULL /* out_params */,
+                                          &op_handle);
+        }
+
+        if (error != KM_ERROR_OK) {
+            printf("Error starting keymaster signature transaction: %d\n", error);
+            rc = -1;
+            goto out;
+        }
+
+        keymaster_blob_t input = { to_sign, to_sign_size };
+        size_t input_consumed;
+        error = keymaster2_dev->update(keymaster2_dev, op_handle, NULL /* in_params */,
+                                       &input, &input_consumed, NULL /* out_params */,
+                                       NULL /* output */);
+        if (error != KM_ERROR_OK) {
+            printf("Error sending data to keymaster signature transaction: %d\n", error);
+            rc = -1;
+            goto out;
+        }
+        if (input_consumed != to_sign_size) {
+            // This should never happen.  If it does, it's a bug in the keymaster implementation.
+            printf("Keymaster update() did not consume all data.\n");
+            keymaster2_dev->abort(keymaster2_dev, op_handle);
+            rc = -1;
+            goto out;
+        }
+
+        keymaster_blob_t tmp_sig;
+        error = keymaster2_dev->finish(keymaster2_dev, op_handle, NULL /* in_params */,
+                                       NULL, NULL /* verify signature */, NULL /* out_params */,
+                                       &tmp_sig);
+        if (error != KM_ERROR_OK) {
+            printf("Error finishing keymaster signature transaction: %d\n", error);
+            rc = -1;
+            goto out;
+        }
+
         *signature = (uint8_t*)tmp_sig.data;
         *signature_size = tmp_sig.data_length;
         rc = 0;
@@ -949,7 +1033,9 @@ static int load_crypto_mapping_table(struct crypt_mnt_ftr *crypt_ftr,
   tgt->next = crypt_params - buffer;
 
   for (i = 0; i < TABLE_LOAD_RETRIES; i++) {
-    if (! ioctl(fd, DM_TABLE_LOAD, io)) {
+    int ret = ioctl(fd, DM_TABLE_LOAD, io);
+    if (!ret)  {
+      SLOGI("ioctl err: %d", ret);
       break;
     }
     usleep(500000);

From 3ca062d063d40b8c2ea61920f0cd57304f267946 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 8 Jan 2021 11:36:07 -0500
Subject: [PATCH 130/207] logd: remove logd-reinit service

Not needed in TWRP, and causes service to restart and
fail to re-initialize on some devices

Also remove split logd rc files as they cause logcat
read failure on 9.0 tree devices.

Change-Id: I7a5a2de916df3ccc2805c120c6f842011c39f53a
---
 etc/Android.mk                                | 39 ++++++-------------
 ...covery.logd27.rc => init.recovery.logd.rc} |  9 -----
 etc/init.recovery.logd28.rc                   | 31 ---------------
 3 files changed, 12 insertions(+), 67 deletions(-)
 rename etc/{init.recovery.logd27.rc => init.recovery.logd.rc} (60%)
 delete mode 100644 etc/init.recovery.logd28.rc

diff --git a/etc/Android.mk b/etc/Android.mk
index f7bb3d87ad..ece8bd695d 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -82,33 +82,18 @@ endif
 
 ifeq ($(TWRP_INCLUDE_LOGCAT), true)
     ifeq ($(TARGET_USES_LOGD), true)
-        ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 28; echo $$?),0)
-            include $(CLEAR_VARS)
-            LOCAL_MODULE := init.recovery.logd.rc
-            LOCAL_MODULE_TAGS := eng
-            LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-
-            # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc
-            # during ramdisk creation and only allows init.recovery.*.rc files to be copied
-            # from TARGET_ROOT_OUT thereafter
-            LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
-
-            LOCAL_SRC_FILES := init.recovery.logd27.rc
-            include $(BUILD_PREBUILT)
-        else
-            include $(CLEAR_VARS)
-            LOCAL_MODULE := init.recovery.logd.rc
-            LOCAL_MODULE_TAGS := eng
-            LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-
-            # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc
-            # during ramdisk creation and only allows init.recovery.*.rc files to be copied
-            # from TARGET_ROOT_OUT thereafter
-            LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
-
-            LOCAL_SRC_FILES := init.recovery.logd28.rc
-            include $(BUILD_PREBUILT)
-        endif
+        include $(CLEAR_VARS)
+        LOCAL_MODULE := init.recovery.logd.rc
+        LOCAL_MODULE_TAGS := eng
+        LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+
+        # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc
+        # during ramdisk creation and only allows init.recovery.*.rc files to be copied
+        # from TARGET_ROOT_OUT thereafter
+        LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+
+        LOCAL_SRC_FILES := $(LOCAL_MODULE)
+        include $(BUILD_PREBUILT)
     endif
 endif
 
diff --git a/etc/init.recovery.logd27.rc b/etc/init.recovery.logd.rc
similarity index 60%
rename from etc/init.recovery.logd27.rc
rename to etc/init.recovery.logd.rc
index 0454a7a2a8..423039cf02 100644
--- a/etc/init.recovery.logd27.rc
+++ b/etc/init.recovery.logd.rc
@@ -3,7 +3,6 @@ on load_all_props_action
 
 on load_persist_props_action
     start logd
-    start logd-reinit
 
 service logd /sbin/logd
     class core
@@ -12,11 +11,3 @@ service logd /sbin/logd
     socket logdw dgram 0222 logd logd
     group root system
     seclabel u:r:logd:s0
-
-service logd-reinit /sbin/logd --reinit
-    oneshot
-    disabled
-    user logd
-    group logd
-    writepid /dev/cpuset/system-background/tasks
-    seclabel u:r:logd:s0
diff --git a/etc/init.recovery.logd28.rc b/etc/init.recovery.logd28.rc
deleted file mode 100644
index 673df77c2b..0000000000
--- a/etc/init.recovery.logd28.rc
+++ /dev/null
@@ -1,31 +0,0 @@
-on init
-    start logd
-
-on fs
-    write /dev/event-log-tags "# content owned by logd
-"
-    chown logd logd /dev/event-log-tags
-    chmod 0644 /dev/event-log-tags
-
-on load_persist_props_action
-    start logd
-    start logd-reinit
-
-service logd /sbin/logd
-    socket logd stream 0666 logd logd
-    socket logdr seqpacket 0666 logd logd
-    socket logdw dgram+passcred 0222 logd logd
-    file /proc/kmsg r
-    file /dev/kmsg w
-    user logd
-    group logd system package_info readproc
-    writepid /dev/cpuset/system-background/tasks
-    seclabel u:r:logd:s0
-
-service logd-reinit /sbin/logd --reinit
-    oneshot
-    disabled
-    user logd
-    group logd
-    writepid /dev/cpuset/system-background/tasks
-    seclabel u:r:logd:s0

From aaedfa81aff93713581066b1f7c57b1337541e34 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 8 Jan 2021 11:29:39 -0500
Subject: [PATCH 131/207] SAR: update script name for clarity when run in TWRP
 console

Change-Id: Ice503c793453b9347d26c064dd9983147a1b9a4a
---
 twrp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twrp.cpp b/twrp.cpp
index eb05b2d27f..dbc024b395 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -191,7 +191,7 @@ int main(int argc, char **argv) {
 
 		rmdir("/s");
 
-		TWFunc::check_and_run_script("/sbin/sarsetup.sh", "boot");
+		TWFunc::check_and_run_script("/sbin/sarsetup.sh", "SAR");
 	}
 	// End SAR detection
 

From 2f7afe1e463a6875e58a5975ab547dbac181f789 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sat, 30 Jan 2021 11:46:11 -0500
Subject: [PATCH 132/207] tzdata: add to TWRP build automatically

Fixes "__bionic_open_tzdata" errors in recovery log

Use "TW_EXCLUDE_TZDATA := true" flag to exclude from build
if needed for space reasons. Will automatically be excluded
is "TW_OEM_BUILD := true" flag is present

Change-Id: I2f4a0f3a354a32c2f4f9733b3e88beedc4773020
---
 Android.mk          |  4 ++++
 prebuilt/Android.mk | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/Android.mk b/Android.mk
index 08080ae40a..f5821cc9e2 100755
--- a/Android.mk
+++ b/Android.mk
@@ -176,6 +176,7 @@ ifeq ($(TW_OEM_BUILD),true)
     BOARD_HAS_NO_REAL_SDCARD := true
     TW_USE_TOOLBOX := true
     TW_EXCLUDE_MTP := true
+    TW_EXCLUDE_TZDATA := true
 endif
 
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
@@ -525,6 +526,9 @@ ifeq ($(TWRP_INCLUDE_LOGCAT), true)
         endif
     endif
 endif
+ifneq ($(TW_EXCLUDE_TZDATA), true)
+    TWRP_REQUIRED_MODULES += tzdata_twrp
+endif
 # Allow devices to specify device-specific recovery dependencies
 ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
     TWRP_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index e27f6cdafe..0cdf5c20ee 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -600,3 +600,25 @@ ifneq (,$(filter $(TW_INCLUDE_REPACKTOOLS) $(TW_INCLUDE_RESETPROP) $(TW_INCLUDE_
         $(error magiskboot prebuilts not present; exiting)
     endif
 endif
+
+# Include tzdata in TWRP to fix "__bionic_open_tzdata" log spam
+# Dummy file to apply post-install patch
+ifneq ($(TW_EXCLUDE_TZDATA), true)
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := tzdata_twrp
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE_CLASS := ETC
+    LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
+    LOCAL_REQUIRED_MODULES := tzdata
+
+    ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+        LOCAL_POST_INSTALL_CMD += \
+            mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/usr/share/zoneinfo; \
+            cp -f $(TARGET_OUT)/usr/share/zoneinfo/tzdata $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/usr/share/zoneinfo/;
+    else
+        LOCAL_POST_INSTALL_CMD += \
+            mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/usr/share/zoneinfo; \
+            cp -f $(TARGET_OUT)/usr/share/zoneinfo/tzdata $(TARGET_RECOVERY_ROOT_OUT)/system/usr/share/zoneinfo/;
+    endif
+    include $(BUILD_PHONY_PACKAGE)
+endif

From 35d2bfda3c89ebd212a9bd2328bffd7464f95d47 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sat, 23 Jan 2021 14:08:03 -0500
Subject: [PATCH 133/207] android root: restore context for android system root

In this patchset we will store and reset the android system
root context after a wipe and restore to prevent issues
with no context labels in the file_contexts being applied.
This will prevent no boot issues in android with selinux
denials on the system root partition.

Change-Id: I87fd3a6060fbaa3e7bdfd7a4b1d09feeb4fa3f27
---
 gui/theme/common/languages/en.xml | 1 +
 partition.cpp                     | 9 +++++++++
 partitionmanager.cpp              | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 6432524133..e29ffafe06 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -740,5 +740,6 @@
 		<string name="flash_ab_reboot">To flash additional zips, please reboot recovery to switch to the updated slot.</string>
 		<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
 		<string name="ozip_decrypt_finish">Ozip Decryption Finished!</string>
+		<string name="restore_system_context">Unable to get default context for {1} -- Android may not boot.</string>
 	</resources>
 </language>
diff --git a/partition.cpp b/partition.cpp
index 17614ffe7e..b55cf49bd3 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -1664,6 +1664,12 @@ bool TWPartition::Wipe(string New_File_System) {
 	if (Mount_Point == "/cache")
 		Log_Offset = 0;
 
+	if (Mount_Point == PartitionManager.Get_Android_Root_Path()) {
+		if (tw_get_default_metadata(PartitionManager.Get_Android_Root_Path().c_str()) != 0) {
+			gui_msg(Msg(msg::kWarning, "restore_system_context=Unable to get default context for {1} -- Android may not boot.")(PartitionManager.Get_Android_Root_Path()));
+		}
+	}
+
 	if (Retain_Layout_Version && Mount(false) && TWFunc::Path_Exists(Layout_Filename))
 		TWFunc::copy_file(Layout_Filename, "/.layout_version", 0600);
 	else
@@ -1708,6 +1714,9 @@ bool TWPartition::Wipe(string New_File_System) {
 		if (Mount_Point == "/cache" && TWFunc::get_log_dir() != DATA_LOGS_DIR)
 			DataManager::Output_Version();
 
+		if (Mount_Point == PartitionManager.Get_Android_Root_Path()) {
+			tw_set_default_metadata(PartitionManager.Get_Android_Root_Path().c_str());
+		}
 		if (TWFunc::Path_Exists("/.layout_version") && Mount(false))
 			TWFunc::copy_file("/.layout_version", Layout_Filename, 0600);
 
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 30bdf3efda..97b708b81f 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1128,6 +1128,10 @@ int TWPartitionManager::Run_Restore(const string& Restore_Name) {
 
 				string Full_Filename = part_settings.Backup_Folder + "/" + part_settings.Part->Backup_FileName;
 
+				if (tw_get_default_metadata(Get_Android_Root_Path().c_str()) != 0) {
+					gui_msg(Msg(msg::kWarning, "restore_system_context=Unable to get default context for {1} -- Android may not boot.")(Get_Android_Root_Path()));
+				}
+
 				if (check_digest > 0 && !twrpDigestDriver::Check_Digest(Full_Filename))
 					return false;
 				part_settings.partition_count++;
@@ -1183,6 +1187,7 @@ int TWPartitionManager::Run_Restore(const string& Restore_Name) {
 		}
 	}
 	TWFunc::GUI_Operation_Text(TW_UPDATE_SYSTEM_DETAILS_TEXT, gui_parse_text("{@updating_system_details}"));
+	tw_set_default_metadata(Get_Android_Root_Path().c_str());
 	UnMount_By_Path(Get_Android_Root_Path(), false);
 	Update_System_Details();
 	UnMount_Main_Partitions();

From c50044bf56ee1f44799b1c0f4e69e63048c18c9f Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 17 Oct 2019 08:49:10 +0800
Subject: [PATCH 134/207] partitionmanager: support delayed adopted storage
 mount

* On some devices, the external mmc driver will only load the card after
  a certain delay. The original code will break and fail to mount any
  adopted storage in this case.

* Add a special fstab flag to allow the partitionmanager to retry after
  a delay.

Change-Id: I219978850ff3ba7ad9dc7ca96fc30634c9574164
---
 partition.cpp        |  6 ++++++
 partitionmanager.cpp | 10 ++++++++++
 partitions.hpp       |  1 +
 3 files changed, 17 insertions(+)

diff --git a/partition.cpp b/partition.cpp
index b55cf49bd3..d08aa5bf22 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -162,6 +162,7 @@ enum TW_FSTAB_FLAGS {
 	TWFLAG_RESIZE,
 	TWFLAG_KEYDIRECTORY,
 	TWFLAG_WRAPPEDKEY,
+	TWFLAG_ADOPTED_MOUNT_DELAY,
 };
 
 /* Flags without a trailing '=' are considered dual format flags and can be
@@ -207,6 +208,7 @@ const struct flag_list tw_flags[] = {
 	{ "resize",                 TWFLAG_RESIZE },
 	{ "keydirectory=",          TWFLAG_KEYDIRECTORY },
 	{ "wrappedkey",             TWFLAG_WRAPPEDKEY },
+	{ "adopted_mount_delay=",   TWFLAG_ADOPTED_MOUNT_DELAY },
 	{ 0,                        0 },
 };
 
@@ -271,6 +273,7 @@ TWPartition::TWPartition() {
 	Adopted_GUID = "";
 	SlotSelect = false;
 	Key_Directory = "";
+	Adopted_Mount_Delay = 0;
 }
 
 TWPartition::~TWPartition(void) {
@@ -986,6 +989,9 @@ void TWPartition::Apply_TW_Flag(const unsigned flag, const char* str, const bool
 		case TWFLAG_ALTDEVICE:
 			Alternate_Block_Device = str;
 			break;
+		case TWFLAG_ADOPTED_MOUNT_DELAY:
+			Adopted_Mount_Delay = atoi(str);
+			break;
 		case TWFLAG_KEYDIRECTORY:
 			Key_Directory = str;
 		default:
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 97b708b81f..b55defc043 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2887,6 +2887,16 @@ bool TWPartitionManager::Decrypt_Adopted() {
 	}
 	std::vector<TWPartition*>::iterator adopt;
 	for (adopt = Partitions.begin(); adopt != Partitions.end(); adopt++) {
+		if ((*adopt)->Removable && !(*adopt)->Is_Present && (*adopt)->Adopted_Mount_Delay > 0) {
+			// On some devices, the external mmc driver takes some time
+			// to recognize the card, in which case the "actual block device"
+			// would not have been found yet. We wait the specified delay
+			// and then try again.
+			LOGINFO("Sleeping %d seconds for adopted storage.\n", (*adopt)->Adopted_Mount_Delay);
+			sleep((*adopt)->Adopted_Mount_Delay);
+			(*adopt)->Find_Actual_Block_Device();
+		}
+
 		if ((*adopt)->Removable && (*adopt)->Is_Present) {
 			if ((*adopt)->Decrypt_Adopted() == 0) {
 				ret = true;
diff --git a/partitions.hpp b/partitions.hpp
index 564004e753..cc4eb985de 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -173,6 +173,7 @@ class TWPartition
 	string Crypto_Key_Location;                                               // Location of the crypto key used for decrypting encrypted data partitions
 	unsigned int MTP_Storage_ID;
 	string Adopted_GUID;
+	unsigned int Adopted_Mount_Delay;
 
 protected:
 	bool Has_Data_Media;                                                      // Indicates presence of /data/media, may affect wiping and backup methods

From 39881ab3251568029fb3623949c6b4c61d44d434 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sat, 2 Nov 2019 19:22:38 +0800
Subject: [PATCH 135/207] partition: add support dm_use_original_path

* On some mediatek devices we must use symlinked path instead of the
      real block device.  Needed for decryption on some MTK HW FDE devices.

Change-Id: Ib48d745fd442c590aea2baf6d2dbe20aaaef9eec
---
 partition.cpp  | 10 +++++++++-
 partitions.hpp |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/partition.cpp b/partition.cpp
index d08aa5bf22..b31b228c45 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -163,6 +163,7 @@ enum TW_FSTAB_FLAGS {
 	TWFLAG_KEYDIRECTORY,
 	TWFLAG_WRAPPEDKEY,
 	TWFLAG_ADOPTED_MOUNT_DELAY,
+	TWFLAG_DM_USE_ORIGINAL_PATH,
 };
 
 /* Flags without a trailing '=' are considered dual format flags and can be
@@ -209,6 +210,7 @@ const struct flag_list tw_flags[] = {
 	{ "keydirectory=",          TWFLAG_KEYDIRECTORY },
 	{ "wrappedkey",             TWFLAG_WRAPPEDKEY },
 	{ "adopted_mount_delay=",   TWFLAG_ADOPTED_MOUNT_DELAY },
+	{ "dm_use_original_path",   TWFLAG_DM_USE_ORIGINAL_PATH },
 	{ 0,                        0 },
 };
 
@@ -274,6 +276,8 @@ TWPartition::TWPartition() {
 	SlotSelect = false;
 	Key_Directory = "";
 	Adopted_Mount_Delay = 0;
+	Original_Path = "";
+	Use_Original_Path = false;
 }
 
 TWPartition::~TWPartition(void) {
@@ -671,7 +675,7 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 	} else if (!Mount(false)) {
 		if (Is_Present) {
 			if (Key_Directory.empty()) {
-				set_partition_data(Actual_Block_Device.c_str(), Crypto_Key_Location.c_str(),
+				set_partition_data(Use_Original_Path ? Original_Path.c_str() : Actual_Block_Device.c_str(), Crypto_Key_Location.c_str(),
 				Fstab_File_System.c_str());
 				if (cryptfs_check_footer() == 0) {
 					Is_Encrypted = true;
@@ -994,6 +998,8 @@ void TWPartition::Apply_TW_Flag(const unsigned flag, const char* str, const bool
 			break;
 		case TWFLAG_KEYDIRECTORY:
 			Key_Directory = str;
+		case TWFLAG_DM_USE_ORIGINAL_PATH:
+			Use_Original_Path = true;
 		default:
 			// Should not get here
 			LOGINFO("Flag identified for processing, but later unmatched: %i\n", flag);
@@ -1207,6 +1213,8 @@ void TWPartition::Setup_Data_Media() {
 void TWPartition::Find_Real_Block_Device(string& Block, bool Display_Error) {
 	char device[PATH_MAX], realDevice[PATH_MAX];
 
+	Original_Path = Block;
+
 	strcpy(device, Block.c_str());
 	memset(realDevice, 0, sizeof(realDevice));
 	while (readlink(device, realDevice, sizeof(realDevice)) > 0)
diff --git a/partitions.hpp b/partitions.hpp
index cc4eb985de..45102812c6 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -285,6 +285,8 @@ class TWPartition
 	TWExclude backup_exclusions;                                              // Exclusions for file based backups
 	TWExclude wipe_exclusions;                                                // Exclusions for file based wipes (data/media devices only)
 	string Key_Directory;                                                     // Metadata key directory needed for mounting FBE encrypted data partitions using metadata encryption
+	string Original_Path;
+	bool Use_Original_Path;
 
 	struct partition_fs_flags_struct {                                        // This struct is used to store mount flags and options for different file systems for the same partition
 		string File_System;

From 8303e6d55d8764e860f679a84ed68d28608e28fa Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Mon, 15 Feb 2021 22:11:24 -0500
Subject: [PATCH 136/207] cryptfs: only include keymaster 2 if tree supports it

This fixes missing <hardware/keymaster2.h> header error
in the 6.0 build tree

Change-Id: I9cad67f0d36f215a033bf131c410620e7cdfdb2d
---
 crypto/fde/cryptfs.cpp | 55 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/crypto/fde/cryptfs.cpp b/crypto/fde/cryptfs.cpp
index eeefc2976f..544d3eccf6 100644
--- a/crypto/fde/cryptfs.cpp
+++ b/crypto/fde/cryptfs.cpp
@@ -60,6 +60,9 @@
 //#include "f2fs_sparseblock.h"
 //#include "EncryptInplace.h"
 //#include "Process.h"
+#if TW_KEYMASTER_MAX_API > 1
+#include <hardware/keymaster2.h>
+#endif
 #if TW_KEYMASTER_MAX_API == 3
 #include "../ext4crypt/Keymaster3.h"
 #endif
@@ -74,7 +77,6 @@
 #include <openssl/sha.h>
 #include <hardware/keymaster0.h>
 #include <hardware/keymaster1.h>
-#include <hardware/keymaster2.h>
 #endif
 //#include "android-base/properties.h"
 //#include <bootloader_message/bootloader_message.h>
@@ -150,7 +152,7 @@ static void get_blkdev_size(int fd, unsigned long *nr_sec)
   }
 }
 
-#if TW_KEYMASTER_MAX_API == 0
+#if TW_KEYMASTER_MAX_API == 0 //TW_KEYMASTER_MAX_API
 static int keymaster_init(keymaster_device_t **keymaster_dev)
 {
     int rc;
@@ -175,7 +177,7 @@ static int keymaster_init(keymaster_device_t **keymaster_dev)
     *keymaster_dev = NULL;
     return rc;
 }
-#else //TW_KEYMASTER_MAX_API == 0
+#elif TW_KEYMASTER_MAX_API > 1
 static int keymaster_init(keymaster0_device_t **keymaster0_dev,
                           keymaster1_device_t **keymaster1_dev,
 			  keymaster2_device_t **keymaster2_dev)
@@ -220,7 +222,46 @@ static int keymaster_init(keymaster0_device_t **keymaster0_dev,
     *keymaster2_dev = NULL;
     return rc;
 }
-#endif //TW_KEYMASTER_MAX_API == 0
+#else
+static int keymaster_init(keymaster0_device_t **keymaster0_dev,
+                          keymaster1_device_t **keymaster1_dev)
+{
+    int rc;
+
+    const hw_module_t* mod;
+    rc = hw_get_module_by_class(KEYSTORE_HARDWARE_MODULE_ID, NULL, &mod);
+    if (rc) {
+        printf("could not find any keystore module\n");
+        goto err;
+    }
+
+    printf("keymaster module name is %s\n", mod->name);
+    printf("keymaster version is %d\n", mod->module_api_version);
+
+    *keymaster0_dev = NULL;
+    *keymaster1_dev = NULL;
+    if (mod->module_api_version == KEYMASTER_MODULE_API_VERSION_1_0) {
+        printf("Found keymaster1 module, using keymaster1 API.\n");
+        rc = keymaster1_open(mod, keymaster1_dev);
+    } else {
+        printf("Found keymaster0 module, using keymaster0 API.\n");
+        rc = keymaster0_open(mod, keymaster0_dev);
+    }
+
+    if (rc) {
+        printf("could not open keymaster device in %s (%s)\n",
+              KEYSTORE_HARDWARE_MODULE_ID, strerror(-rc));
+        goto err;
+    }
+
+    return 0;
+
+err:
+    *keymaster0_dev = NULL;
+    *keymaster1_dev = NULL;
+    return rc;
+}
+#endif //TW_KEYMASTER_MAX_API
 
 #ifdef CONFIG_HW_DISK_ENCRYPTION
 static int scrypt_keymaster(const char *passwd, const unsigned char *salt,
@@ -431,8 +472,12 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
 #if TW_KEYMASTER_MAX_API >= 1
     keymaster0_device_t *keymaster0_dev = 0;
     keymaster1_device_t *keymaster1_dev = 0;
+#if TW_KEYMASTER_MAX_API > 1
     keymaster2_device_t *keymaster2_dev = 0;
     if (keymaster_init(&keymaster0_dev, &keymaster1_dev, &keymaster2_dev)) {
+#else
+    if (keymaster_init(&keymaster0_dev, &keymaster1_dev)) {
+#endif
 #else
     keymaster_device_t *keymaster0_dev = 0;
     if (keymaster_init(&keymaster0_dev)) {
@@ -512,6 +557,7 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
         *signature_size = tmp_sig.data_length;
         rc = 0;
     }
+#if TW_KEYMASTER_MAX_API > 1
     else if (keymaster2_dev) {
         keymaster_key_blob_t key = { ftr->keymaster_blob, ftr->keymaster_blob_size };
         keymaster_key_param_t params[] = {
@@ -588,6 +634,7 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr,
         *signature_size = tmp_sig.data_length;
         rc = 0;
     }
+#endif // TW_KEYMASTER_API > 1
 #endif // TW_KEYMASTER_API >= 1
 
     out:

From 3c25ab3a9963fb08cffbbf4f8842d6dcaa67623d Mon Sep 17 00:00:00 2001
From: Mohd Faraz <androiabledroid@gmail.com>
Date: Wed, 12 Aug 2020 12:29:42 +0000
Subject: [PATCH 137/207] Added Support for terminal from filemanager

 * Now We can open terminal from current directory in filemanager

Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
Change-Id: I6df9ee1222c1fa24105da1002abe3c180be2ded1
Signed-off-by: AndroiableDroid <mohd.faraz.abc@gmail.com>
---
 gui/action.cpp                    | 35 +++++++++++++++++++++++++++++++
 gui/objects.hpp                   |  3 +++
 gui/pages.cpp                     |  2 ++
 gui/terminal.cpp                  | 22 +++++++++++++++++--
 gui/theme/common/landscape.xml    | 12 +++++++++++
 gui/theme/common/languages/en.xml |  1 +
 gui/theme/common/portrait.xml     | 11 ++++++++++
 7 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/gui/action.cpp b/gui/action.cpp
index 06de41ef28..1ab4ee44f0 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -64,6 +64,7 @@ static string zip_queue[10];
 static int zip_queue_index;
 pid_t sideload_child_pid;
 extern std::vector<users_struct> Users_List;
+extern GUITerminal* term;
 
 static void *ActionThread_work_wrapper(void *data);
 
@@ -200,6 +201,7 @@ GUIAction::GUIAction(xml_node<>* node)
 		ADD_ACTION(setlanguage);
 		ADD_ACTION(checkforapp);
 		ADD_ACTION(togglebacklight);
+		ADD_ACTION(changeterminal);
 
 		// remember actions that run in the caller thread
 		for (mapFunc::const_iterator it = mf.begin(); it != mf.end(); ++it)
@@ -2218,3 +2220,36 @@ int GUIAction::fixabrecoverybootloop(std::string arg __unused)
 	operation_end(op_status);
 	return 0;
 }
+
+int GUIAction::changeterminal(std::string arg) {
+	bool res = true;
+	std::string resp, cmd = "cd " + arg;
+	DataManager::GetValue("tw_terminal_location", resp);
+	if (arg.empty() && !resp.empty()) {
+		cmd = "cd /";
+		for (uint8_t iter = 0; iter < cmd.size(); iter++)
+			term->NotifyCharInput(cmd.at(iter));
+		term->NotifyCharInput(13);
+		DataManager::SetValue("tw_terminal_location", "");
+		return 0;
+	}
+	if (term != NULL && !arg.empty()) {
+		DataManager::SetValue("tw_terminal_location", arg);
+		if (term->status()) {
+			for (uint8_t iter = 0; iter < cmd.size(); iter++)
+				term->NotifyCharInput(cmd.at(iter));
+			term->NotifyCharInput(13);
+		}
+		else if (chdir(arg.c_str()) != 0) {
+			LOGINFO("Unable to change dir to %s\n", arg.c_str());
+			res = false;
+		}
+	}
+	else {
+		res = false;
+		LOGINFO("Unable to switch to Terminal\n");
+	}
+	if (res)
+		gui_changePage("terminalcommand");
+	return 0;
+}
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 24e9d24724..9ef1b65289 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -371,6 +371,7 @@ class GUIAction : public GUIObject, public ActionObject
 	int uninstalltwrpsystemapp(std::string arg);
 	int repackimage(std::string arg);
 	int fixabrecoverybootloop(std::string arg);
+	int changeterminal(std::string arg);
 
 	int simulate;
 };
@@ -805,6 +806,8 @@ class GUITerminal : public GUIScrollList, public InputObject
 	virtual size_t GetItemCount();
 	virtual void RenderItem(size_t itemindex, int yPos, bool selected);
 	virtual void NotifySelect(size_t item_selected);
+	bool status();
+	void stop();
 protected:
 	void InitAndResize();
 
diff --git a/gui/pages.cpp b/gui/pages.cpp
index 366bc39363..989da9a5ec 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -63,6 +63,7 @@ extern "C" {
 #define TW_THEME_VER_ERR -2
 
 extern int gGuiRunning;
+GUITerminal* term = NULL;
 
 std::map<std::string, PageSet*> PageManager::mPageSets;
 PageSet* PageManager::mCurrentSet;
@@ -385,6 +386,7 @@ bool Page::ProcessNode(xml_node<>* page, std::vector<xml_node<>*> *templates, in
 			mRenders.push_back(element);
 			mActions.push_back(element);
 			mInputs.push_back(element);
+			term = element;
 		}
 		else if (type == "button")
 		{
diff --git a/gui/terminal.cpp b/gui/terminal.cpp
index a4fed91047..79262eb2d0 100755
--- a/gui/terminal.cpp
+++ b/gui/terminal.cpp
@@ -46,7 +46,6 @@ extern "C" {
 #endif
 
 extern int g_pty_fd; // in gui.cpp where the select is
-
 /*
 Pseudoterminal handler.
 */
@@ -142,7 +141,7 @@ class Pseudoterminal
 			return -1;
 		}
 		int rc = ::write(fdMaster, buffer, size);
-		debug_printf("pty write: %d bytes -> %d\n", size, rc);
+		debug_printf("pty write: %zu bytes -> %d\n", size, rc);
 		if (rc < 0) {
 			LOGERR("pty write failed: %d\n", errno);
 			// assume child has died
@@ -386,6 +385,14 @@ class TerminalEngine
 				output(buffer[i]);
 	}
 
+	bool status() {
+		return pty.started();
+	}
+
+	void stop() {
+		pty.stop();
+	}
+
 	void clear()
 	{
 		cursorX = cursorY = 0;
@@ -899,6 +906,17 @@ void GUITerminal::NotifySelect(size_t item_selected __unused)
 	// do nothing - terminal ignores selections
 }
 
+bool GUITerminal::status()
+{
+	return engine->status();
+}
+
+void GUITerminal::stop()
+{
+	engine->stop();
+	engine->clear();
+}
+
 void GUITerminal::InitAndResize()
 {
 	// make sure the shell is started
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 010e08e969..17977e2cd4 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -4122,6 +4122,13 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_width">
+				<condition var1="tw_fm_isfolder" var2="1"/>
+				<placement x="%col2_x_right%" y="%row15a_y%"/>
+				<text>{@fm_open_terminal_btn=Open Terminal Here}</text>
+				<action function="changeterminal">%tw_filename1%</action>
+			</button>
+
 			<button style="main_button_half_width">
 				<placement x="%col2_x_right%" y="%row11_y%"/>
 				<text>{@fm_delete_btn=Delete}</text>
@@ -4743,6 +4750,7 @@
 				<actions>
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">home</action>
+					<action function="changeterminal"/>
 				</actions>
 			</button>
 
@@ -4830,6 +4838,7 @@
 				<actions>
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">home</action>
+					<action function="changeterminal"/>
 				</actions>
 			</button>
 
@@ -4868,6 +4877,7 @@
 				<actions>
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">advanced</action>
+					<action function="changeterminal"/>
 				</actions>
 			</button>
 
@@ -4963,6 +4973,7 @@
 				<actions>
 					<action function="page">main</action>
 					<action function="set">tw_hide_kb=0</action>
+					<action function="changeterminal"/>
 				</actions>
 			</action>
 
@@ -4971,6 +4982,7 @@
 				<actions>
 					<action function="page">advanced</action>
 					<action function="set">tw_hide_kb=0</action>
+					<action function="changeterminal"/>
 				</actions>
 			</action>
 
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index e29ffafe06..497d088b3d 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -459,6 +459,7 @@
 		<string name="fm_set_perms_hdr">Set Permissions</string>
 		<string name="fm_perms">Permissions:</string>
 		<string name="fm_complete">File Operation Complete</string>
+		<string name="fm_open_terminal_btn">Open Terminal Here</string>
 		<string name="decrypt_data_hdr">Decrypt Data</string>
 		<string name="decrypt_data_enter_pass">Enter Password.</string>
 		<string name="decrypt_data_failed">Password failed, please try again!</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index b78191d531..ea52af8088 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -4187,6 +4187,13 @@
 				<text>%tw_filename1%</text>
 			</text>
 
+			<button style="main_button_half_height">
+				<condition var1="tw_fm_isfolder" var2="1"/>
+				<placement x="%center_x%" y="%row12a_y%"/>
+				<text>{@fm_open_terminal_btn=Open Terminal Here}</text>
+				<action function="changeterminal">%tw_filename1%</action>
+			</button>
+
 			<button style="main_button_half_height">
 				<condition var1="tw_fm_isfolder" var2="0"/>
 				<placement x="%indent%" y="%row15a_y%"/>
@@ -4871,6 +4878,7 @@
 				<actions>
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">home</action>
+					<action function="changeterminal"/>
 				</actions>
 			</button>
 
@@ -4906,6 +4914,7 @@
 				<actions>
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">back</action>
+					<action function="changeterminal"/>
 				</actions>
 			</button>
 
@@ -4914,6 +4923,7 @@
 				<actions>
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">main</action>
+					<action function="changeterminal"/>
 				</actions>
 			</action>
 
@@ -4922,6 +4932,7 @@
 				<actions>
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">advanced</action>
+					<action function="changeterminal"/>
 				</actions>
 			</action>
 

From d3242ebf21906cf8f0d5cb8a058cfce73aebe348 Mon Sep 17 00:00:00 2001
From: nebrassy <nebras30@gmail.com>
Date: Fri, 12 Feb 2021 23:36:44 +0100
Subject: [PATCH 138/207] Include nano in TWRP by default

Use 'TW_EXCLUDE_NANO := true' to exclude from build

Will be excluded by default if 'TW_OEM_BUILD := true' is set

Change-Id: I812399ef9f3f5d3c7d4baf981924d49255c16e5a
---
 Android.mk                |  6 ++++++
 etc/Android.mk            |  9 +++++++++
 etc/init.rc               |  1 +
 etc/init.recovery.nano.rc |  3 +++
 prebuilt/Android.mk       | 18 ++++++++++++++++++
 5 files changed, 37 insertions(+)
 create mode 100644 etc/init.recovery.nano.rc

diff --git a/Android.mk b/Android.mk
index f5821cc9e2..1cc73eb8e8 100755
--- a/Android.mk
+++ b/Android.mk
@@ -177,6 +177,7 @@ ifeq ($(TW_OEM_BUILD),true)
     TW_USE_TOOLBOX := true
     TW_EXCLUDE_MTP := true
     TW_EXCLUDE_TZDATA := true
+    TW_EXCLUDE_NANO := true
 endif
 
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
@@ -529,6 +530,11 @@ endif
 ifneq ($(TW_EXCLUDE_TZDATA), true)
     TWRP_REQUIRED_MODULES += tzdata_twrp
 endif
+ifneq ($(TW_EXCLUDE_NANO), true)
+    TWRP_REQUIRED_MODULES += \
+        nano_twrp \
+        init.recovery.nano.rc
+endif
 # Allow devices to specify device-specific recovery dependencies
 ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
     TWRP_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
diff --git a/etc/Android.mk b/etc/Android.mk
index ece8bd695d..ff9d8b181f 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -14,6 +14,15 @@
 
 LOCAL_PATH := $(call my-dir)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := init.recovery.nano.rc
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
 ifneq ($(TW_EXCLUDE_DEFAULT_USB_INIT), true)
 
 include $(CLEAR_VARS)
diff --git a/etc/init.rc b/etc/init.rc
index fc32bb8953..a2bef2b206 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -1,6 +1,7 @@
 import /init.recovery.logd.rc
 import /init.recovery.ldconfig.rc
 import /init.recovery.mksh.rc
+import /init.recovery.nano.rc
 import /init.recovery.usb.rc
 import /init.recovery.service.rc
 import /init.recovery.vold_decrypt.rc
diff --git a/etc/init.recovery.nano.rc b/etc/init.recovery.nano.rc
new file mode 100644
index 0000000000..c835be43c2
--- /dev/null
+++ b/etc/init.recovery.nano.rc
@@ -0,0 +1,3 @@
+on fs
+    export TERMINFO /etc/terminfo
+    export TERM pcansi
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 0cdf5c20ee..44bf7ed671 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -405,6 +405,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 27; echo $$?),0)
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/liblogwrap.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext2_misc.so
 endif
+ifneq ($(TW_EXCLUDE_NANO), true)
+    RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/nano
+    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libncurses.so
+    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libssh.so
+    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libssl.so
+endif
 
 TW_BB_SYMLINKS :=
 ifneq ($(TW_USE_TOOLBOX), true)
@@ -622,3 +628,15 @@ ifneq ($(TW_EXCLUDE_TZDATA), true)
     endif
     include $(BUILD_PHONY_PACKAGE)
 endif
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := nano_twrp
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
+LOCAL_REQUIRED_MODULES := nano libncurses
+LOCAL_POST_INSTALL_CMD += \
+    cp -rf $(TARGET_OUT_ETC)/nano $(TARGET_RECOVERY_ROOT_OUT)/etc/; \
+    cp -rf external/libncurses/lib/terminfo $(TARGET_RECOVERY_ROOT_OUT)/etc/;
+include $(BUILD_PHONY_PACKAGE)
+

From 3b55610da2afef2da574bb531f000ffd8fb9d72d Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 12 Feb 2021 19:32:36 -0500
Subject: [PATCH 139/207] nano: Add File Manager option to edit selected file

Change-Id: Ie7d940545569e6de976d2a51666b692f3fc23798
---
 Android.mk                        |  3 +++
 data.cpp                          |  6 ++++++
 gui/Android.mk                    |  3 +++
 gui/action.cpp                    | 15 +++++++++++++++
 gui/objects.hpp                   |  3 +++
 gui/theme/common/landscape.xml    | 13 +++++++++++++
 gui/theme/common/languages/en.xml |  1 +
 gui/theme/common/portrait.xml     | 13 +++++++++++++
 8 files changed, 57 insertions(+)

diff --git a/Android.mk b/Android.mk
index 1cc73eb8e8..2292a835ee 100755
--- a/Android.mk
+++ b/Android.mk
@@ -427,6 +427,9 @@ ifneq ($(TW_INCLUDE_LIBRESETPROP),)
         LOCAL_CFLAGS += -DTW_INCLUDE_LIBRESETPROP
     endif
 endif
+ifeq ($(TW_EXCLUDE_NANO), true)
+    LOCAL_CFLAGS += -DTW_EXCLUDE_NANO
+endif
 
 TWRP_REQUIRED_MODULES += \
     dump_image \
diff --git a/data.cpp b/data.cpp
index e6f1ac0ce0..593c29f2c8 100755
--- a/data.cpp
+++ b/data.cpp
@@ -909,6 +909,12 @@ void DataManager::SetDefaultValues()
 	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
+#ifndef TW_EXCLUDE_NANO
+	mConst.SetValue("tw_include_nano", "1");
+#else
+	LOGINFO("TW_EXCLUDE_NANO := true\n");
+	mConst.SetValue("tw_include_nano", "0");
+#endif
 
 	mData.SetValue("tw_enable_adb_backup", "0");
 
diff --git a/gui/Android.mk b/gui/Android.mk
index b9ff2666c1..c4d938ae70 100755
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -100,6 +100,9 @@ endif
 ifeq ($(TW_SCREEN_BLANK_ON_BOOT), true)
     LOCAL_CFLAGS += -DTW_SCREEN_BLANK_ON_BOOT
 endif
+ifeq ($(TW_EXCLUDE_NANO), true)
+    LOCAL_CFLAGS += -DTW_EXCLUDE_NANO
+endif
 
 LOCAL_C_INCLUDES += \
     bionic \
diff --git a/gui/action.cpp b/gui/action.cpp
index 1ab4ee44f0..ecb035ebb9 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -237,6 +237,9 @@ GUIAction::GUIAction(xml_node<>* node)
 		ADD_ACTION(uninstalltwrpsystemapp);
 		ADD_ACTION(repackimage);
 		ADD_ACTION(fixabrecoverybootloop);
+#ifndef TW_EXCLUDE_NANO
+		ADD_ACTION(editfile);
+#endif
 	}
 
 	// First, get the action
@@ -2253,3 +2256,15 @@ int GUIAction::changeterminal(std::string arg) {
 		gui_changePage("terminalcommand");
 	return 0;
 }
+#ifndef TW_EXCLUDE_NANO
+int GUIAction::editfile(std::string arg) {
+	if (term != NULL) {
+		for (uint8_t iter = 0; iter < arg.size(); iter++)
+			term->NotifyCharInput(arg.at(iter));
+		term->NotifyCharInput(13);
+	}
+	else
+		LOGINFO("Unable to switch to Terminal\n");
+	return 0;
+}
+#endif
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 9ef1b65289..b3cd8677e0 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -372,6 +372,9 @@ class GUIAction : public GUIObject, public ActionObject
 	int repackimage(std::string arg);
 	int fixabrecoverybootloop(std::string arg);
 	int changeterminal(std::string arg);
+#ifndef TW_EXCLUDE_NANO
+	int editfile(std::string arg);
+#endif
 
 	int simulate;
 };
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 17977e2cd4..5ffa146e3f 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -4085,6 +4085,19 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_width">
+edi				<conditions>
+					<condition var1="tw_include_nano" var2="1"/>
+					<condition var1="tw_fm_isfolder" var2="0"/>
+				</conditions>
+				<placement x="%col1_x_left%" y="%row15a_y%"/>
+				<text>{@fm_edit_file=Edit File}</text>
+				<actions>
+					<action function="editfile">nano "%tw_filename1%"</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</button>
+
 			<button style="main_button_half_width">
 				<placement x="%col2_x_left%" y="%row11_y%"/>
 				<text>{@fm_move_btn=Move}</text>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 497d088b3d..352bffa186 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -460,6 +460,7 @@
 		<string name="fm_perms">Permissions:</string>
 		<string name="fm_complete">File Operation Complete</string>
 		<string name="fm_open_terminal_btn">Open Terminal Here</string>
+		<string name="fm_edit_file">Edit File</string>
 		<string name="decrypt_data_hdr">Decrypt Data</string>
 		<string name="decrypt_data_enter_pass">Enter Password.</string>
 		<string name="decrypt_data_failed">Password failed, please try again!</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index ea52af8088..3a1117001f 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -4187,6 +4187,19 @@
 				<text>%tw_filename1%</text>
 			</text>
 
+			<button style="main_button_half_height">
+				<conditions>
+					<condition var1="tw_include_nano" var2="1"/>
+					<condition var1="tw_fm_isfolder" var2="0"/>
+				</conditions>
+				<placement x="%indent%" y="%row12a_y%"/>
+				<text>{@fm_edit_file=Edit File}</text>
+				<actions>
+					<action function="editfile">nano "%tw_filename1%"</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</button>
+
 			<button style="main_button_half_height">
 				<condition var1="tw_fm_isfolder" var2="1"/>
 				<placement x="%center_x%" y="%row12a_y%"/>

From 15430b6903f586325f66c9edcaa6910c1ce22d1e Mon Sep 17 00:00:00 2001
From: Ian Macdonald <ian@caliban.org>
Date: Sat, 23 Jan 2021 18:52:28 +0100
Subject: [PATCH 140/207] Include common names for Magisk app in list of
 flashable zip files.

We introduce a new XML element prfxfilter for file name prefix
filtering, e.g. Magisk- .

The file is first matched against the list of extensions and, if there's
no match, then matched against the list of prefixes. An extension or
prefix may be equal to the whole filename.

Change-Id: I46a985c7298799793911948bc74296bebb306d9e
(cherry picked from commit 88e9c6ef052cd0ec71658ca42e8d70f0aabe07ac)
---
 gui/fileselector.cpp           | 39 +++++++++++++++++++++++++++++++---
 gui/objects.hpp                |  1 +
 gui/theme/common/landscape.xml |  1 +
 gui/theme/common/portrait.xml  |  1 +
 gui/theme/common/watch.xml     |  1 +
 twrpDigestDriver.cpp           |  2 +-
 6 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp
index 2778f96055..a32743a584 100644
--- a/gui/fileselector.cpp
+++ b/gui/fileselector.cpp
@@ -69,6 +69,12 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) : GUIScrollList(node)
 		if (attr)
 			mShowNavFolders = atoi(attr->value());
 	}
+	child = FindNode(node, "prfxfilter");
+	if (child) {
+		attr = child->first_attribute("prfx");
+		if (attr)
+			mPrfx = attr->value();
+	}
 
 	// Handle the path variable
 	child = FindNode(node, "path");
@@ -261,6 +267,7 @@ int GUIFileSelector::GetFileList(const std::string folder)
 
 	while ((de = readdir(d)) != NULL) {
 		FileData data;
+		bool match = false;
 
 		data.fileName = de->d_name;
 		if (data.fileName == ".")
@@ -292,26 +299,52 @@ int GUIFileSelector::GetFileList(const std::string folder)
 			for (const std::string& mExtnElement : mExtnResults)
 			{
 				std::string mExtnName = android::base::Trim(mExtnElement);
-				if (mExtnName.empty() || (data.fileName.length() > mExtnName.length() && data.fileName.substr(data.fileName.length() - mExtnName.length()) == mExtnName)) {
+				if (mExtnName.empty() || (data.fileName.length() >= mExtnName.length() && data.fileName.substr(data.fileName.length() - mExtnName.length()) == mExtnName)) {
 					if (mExtnName == ".ab" && twadbbu::Check_ADB_Backup_File(path))
 						mFolderList.push_back(data);
 					else
 						mFileList.push_back(data);
+					match = true;
+					break;
+				}
 			}
+
+			if (!match) {
+				std::vector<std::string> mPrfxResults = android::base::Split(mPrfx, ";");
+				for (const std::string& mPrfxElement : mPrfxResults)
+				{
+					std::string mPrfxName = android::base::Trim(mPrfxElement);
+					if (!mPrfxName.empty() && data.fileName.length() >= mPrfxName.length() && data.fileName.substr(0, mPrfxName.length()) == mPrfxName) {
+						mFileList.push_back(data);
+					}
 #else //On android 5.1 we can't use android::base::Trim and Split so just use the first extension written in the list
 			std::size_t seppos = mExtn.find_first_of(";");
 			std::string mExtnf;
 			if (seppos!=std::string::npos){
 				mExtnf = mExtn.substr(0, seppos);
 			} else {
-			mExtnf = mExtn;
+				mExtnf = mExtn;
 			}
-			if (mExtnf.empty() || (data.fileName.length() > mExtnf.length() && data.fileName.substr(data.fileName.length() - mExtnf.length()) == mExtnf)) {
+			if (mExtnf.empty() || (data.fileName.length() >= mExtnf.length() && data.fileName.substr(data.fileName.length() - mExtnf.length()) == mExtnf)) {
 				if (mExtnf == ".ab" && twadbbu::Check_ADB_Backup_File(path))
 					mFolderList.push_back(data);
 				else
 					mFileList.push_back(data);
+				match = true;
+			}
+
+			if (!match) {
+				std::size_t seppos = mPrfx.find_first_of(";");
+				std::string mPrfxf;
+				if (seppos!=std::string::npos){
+					mPrfxf = mPrfx.substr(0, seppos);
+				} else {
+					mPrfxf = mPrfx;
+				}
+				if (!mPrfxf.empty() && data.fileName.length() >= mPrfxf.length() && data.fileName.substr(0, mPrfxf.length()) == mPrfxf) {
+					mFileList.push_back(data);
 #endif
+				}
 			}
 		}
 	}
diff --git a/gui/objects.hpp b/gui/objects.hpp
index b3cd8677e0..eaab2e7c52 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -611,6 +611,7 @@ class GUIFileSelector : public GUIScrollList
 	std::string mPathVar; // current path displayed, saved in the data manager
 	std::string mPathDefault; // default value for the path if none is set in mPathVar
 	std::string mExtn; // used for filtering the file list, for example, *.zip
+	std::string mPrfx; // used for filtering the file list, for example, Magisk-
 	std::string mVariable; // set when the user selects an item, pull path like /path/to/foo
 	std::string mSortVariable; // data manager variable used to change the sorting of files
 	std::string mSelection; // set when the user selects an item without the full path like selecting /path/to/foo would just be set to foo
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 5ffa146e3f..8221fa4b00 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -311,6 +311,7 @@
 				<placement x="%col2_x_left%" y="%row1a_y%" w="%fileselector_install_width%" h="%fileselector_install_height%"/>
 				<text>%tw_zip_location%</text>
 				<filter extn=".zip;.ozip;.ZIP;.OZIP" folders="0" files="1"/>
+				<prfxfilter prfx="Magisk-;Magisk.apk;app-release.apk;app-debug.apk" folders="1" files="1"/>
 				<path name="tw_zip_location" default="/sdcard"/>
 				<data name="tw_filename"/>
 				<selection name="tw_file"/>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 3a1117001f..d5318fb719 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -268,6 +268,7 @@
 				<placement x="%indent%" y="%row3_y%" w="%content_width%" h="%fileselector_install_height%"/>
 				<text>%tw_zip_location%</text>
 				<filter extn=".zip;.ozip;.ZIP;.OZIP" folders="1" files="1"/>
+				<prfxfilter prfx="Magisk-;Magisk.apk;app-release.apk;app-debug.apk" folders="1" files="1"/>
 				<path name="tw_zip_location" default="/sdcard"/>
 				<data name="tw_filename"/>
 				<selection name="tw_file"/>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 7debf3aa0a..5a7c22508a 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -399,6 +399,7 @@
 				<placement x="%indent%" y="%row2_header_y%" w="%content_width%" h="%fileselector_install_height%"/>
 				<text>%tw_zip_location%</text>
 				<filter extn=".zip;.ozip;.ZIP;.OZIP" folders="1" files="1"/>
+				<prfxfilter prfx="Magisk-;Magisk.apk;app-release.apk;app-debug.apk" folders="1" files="1"/>
 				<path name="tw_zip_location" default="/sdcard"/>
 				<data name="tw_filename"/>
 				<selection name="tw_file"/>
diff --git a/twrpDigestDriver.cpp b/twrpDigestDriver.cpp
index 074b6c3df5..0ab94df39c 100755
--- a/twrpDigestDriver.cpp
+++ b/twrpDigestDriver.cpp
@@ -70,7 +70,7 @@ bool twrpDigestDriver::Check_File_Digest(const string& Filename) {
 
 	if (!TWFunc::Path_Exists(digestfile)) {
 		delete digest;
-		if (Filename.find(".zip") == std::string::npos && Filename.find(".map") == std::string::npos) {
+		if (Filename.find(".zip") == std::string::npos && Filename.find(".apk") == std::string::npos && Filename.find(".map") == std::string::npos) {
 			gui_msg(Msg(msg::kError, "no_digest_found=No digest file found for '{1}'. Please unselect Enable Digest verification to restore.")(Filename));
 		} else {
 			return true;

From 261350c7593efae7f48180adc491ae905b4ec198 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sat, 20 Feb 2021 19:55:47 -0500
Subject: [PATCH 141/207] nano: copy files directly from source folder

Fixes system/etc/nano not found build error

Change-Id: I5661c766e6a1c959e090b0474d389124291a186f
---
 etc/init.recovery.nano.rc |  2 +-
 prebuilt/Android.mk       | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/etc/init.recovery.nano.rc b/etc/init.recovery.nano.rc
index c835be43c2..f57f656406 100644
--- a/etc/init.recovery.nano.rc
+++ b/etc/init.recovery.nano.rc
@@ -1,3 +1,3 @@
 on fs
-    export TERMINFO /etc/terminfo
+    export TERMINFO /system/etc/terminfo
     export TERM pcansi
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 44bf7ed671..a28cde0cd3 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -635,8 +635,16 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
 LOCAL_REQUIRED_MODULES := nano libncurses
-LOCAL_POST_INSTALL_CMD += \
-    cp -rf $(TARGET_OUT_ETC)/nano $(TARGET_RECOVERY_ROOT_OUT)/etc/; \
-    cp -rf external/libncurses/lib/terminfo $(TARGET_RECOVERY_ROOT_OUT)/etc/;
+ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+    LOCAL_POST_INSTALL_CMD += \
+        mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/nano; \
+        cp -rf external/nano/etc/* external/nano/syntax/*.nanorc $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/nano/; \
+        cp -rf external/libncurses/lib/terminfo $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/;
+else
+    LOCAL_POST_INSTALL_CMD += \
+        mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc/nano; \
+        cp -rf external/nano/etc/* external/nano/syntax/*.nanorc $(TARGET_RECOVERY_ROOT_OUT)/system/etc/nano/; \
+        cp -rf external/libncurses/lib/terminfo $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
+endif
 include $(BUILD_PHONY_PACKAGE)
 

From 98053c323b6c512bc54b80d6c0732e252e72f237 Mon Sep 17 00:00:00 2001
From: epicX <souravgain605@gmail.com>
Date: Mon, 4 Jan 2021 13:01:31 +0530
Subject: [PATCH 142/207] Add support to change TWRP Folder

Change-Id: Id3b3b46d492bf83d1d9d3f535c880ea9d15b4107
---
 data.cpp                          |  18 ++++--
 data.hpp                          |   5 +-
 gui/action.cpp                    |  34 ++++++++++
 gui/objects.hpp                   |   1 +
 gui/theme/common/landscape.xml    | 101 +++++++++++++++++++++++++++++
 gui/theme/common/languages/en.xml |   4 ++
 gui/theme/common/portrait.xml     | 103 ++++++++++++++++++++++++++++++
 gui/theme/common/watch.xml        |  98 ++++++++++++++++++++++++++++
 partitionmanager.cpp              |   1 +
 twrp-functions.cpp                |  93 +++++++++++++++++++++++++++
 twrp-functions.hpp                |   1 +
 twrp.cpp                          |   1 +
 variables.h                       |   5 +-
 13 files changed, 459 insertions(+), 6 deletions(-)

diff --git a/data.cpp b/data.cpp
index 593c29f2c8..71f903527d 100755
--- a/data.cpp
+++ b/data.cpp
@@ -526,7 +526,7 @@ void DataManager::SetBackupFolder()
 {
 	string str = GetCurrentStoragePath();
 	TWPartition* partition = PartitionManager.Find_Partition_By_Path(str);
-	str += "/TWRP/BACKUPS/";
+	str += TWFunc::Check_For_TwrpFolder() + "/BACKUPS/";
 
 	string dev_id;
 	GetValue("device_id", dev_id);
@@ -613,9 +613,11 @@ void DataManager::SetDefaultValues()
 	mConst.SetValue(TW_SHOW_DUMLOCK, "0");
 #endif
 
+	mData.SetValue(TW_RECOVERY_FOLDER_VAR, TW_DEFAULT_RECOVERY_FOLDER);
+
 	str = GetCurrentStoragePath();
 	mPersist.SetValue(TW_ZIP_LOCATION_VAR, str);
-	str += "/TWRP/BACKUPS/";
+	str += DataManager::GetStrValue(TW_RECOVERY_FOLDER_VAR) + "/BACKUPS/";
 
 	string dev_id;
 	mConst.GetValue("device_id", dev_id);
@@ -1101,8 +1103,8 @@ void DataManager::ReadSettingsFile(void)
 
 	memset(mkdir_path, 0, sizeof(mkdir_path));
 	memset(settings_file, 0, sizeof(settings_file));
-	sprintf(mkdir_path, "%s/TWRP", GetSettingsStoragePath().c_str());
-	sprintf(settings_file, "%s/.twrps", mkdir_path);
+	sprintf(mkdir_path, "%s%s", GetSettingsStoragePath().c_str(), GetStrValue(TW_RECOVERY_FOLDER_VAR).c_str());
+	sprintf(settings_file, "%s/%s", mkdir_path, TW_SETTINGS_FILE);
 
 	if (!PartitionManager.Mount_Settings_Storage(false))
 	{
@@ -1142,3 +1144,11 @@ void DataManager::Vibrate(const string& varName)
 	}
 #endif
 }
+
+
+void DataManager::LoadTWRPFolderInfo(void)
+{
+	string mainPath = GetCurrentStoragePath();
+	SetValue(TW_RECOVERY_FOLDER_VAR, TWFunc::Check_For_TwrpFolder());
+	mBackingFile = mainPath + GetStrValue(TW_RECOVERY_FOLDER_VAR) + '/' + TW_SETTINGS_FILE;
+}
\ No newline at end of file
diff --git a/data.hpp b/data.hpp
index bb73c415c4..843bef2076 100755
--- a/data.hpp
+++ b/data.hpp
@@ -32,6 +32,7 @@ class DataManager
 	static int LoadValues(const string& filename);
 	static int LoadPersistValues(void);
 	static int Flush();
+	static void LoadTWRPFolderInfo(void);
 
 	// Core get routines
 	static int GetValue(const string& varName, string& value);
@@ -63,8 +64,10 @@ class DataManager
 	static string GetCurrentStoragePath(void);
 	static string GetSettingsStoragePath(void);
 
-protected:
+public:
 	static string mBackingFile;
+
+protected:
 	static int mInitialized;
 	static InfoManager mPersist;
 	static InfoManager mData;
diff --git a/gui/action.cpp b/gui/action.cpp
index ecb035ebb9..c48fd5d2fe 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -237,6 +237,7 @@ GUIAction::GUIAction(xml_node<>* node)
 		ADD_ACTION(uninstalltwrpsystemapp);
 		ADD_ACTION(repackimage);
 		ADD_ACTION(fixabrecoverybootloop);
+		ADD_ACTION(applycustomtwrpfolder);
 #ifndef TW_EXCLUDE_NANO
 		ADD_ACTION(editfile);
 #endif
@@ -2268,3 +2269,36 @@ int GUIAction::editfile(std::string arg) {
 	return 0;
 }
 #endif
+
+int GUIAction::applycustomtwrpfolder(string arg __unused)
+{
+	operation_start("ChangingTWRPFolder");
+	string storageFolder = DataManager::GetSettingsStoragePath();
+	string newFolder = storageFolder + '/' + arg;
+	string newBackupFolder = newFolder + "/BACKUPS/" + DataManager::GetStrValue("device_id");
+	string prevFolder = storageFolder + DataManager::GetStrValue(TW_RECOVERY_FOLDER_VAR);
+	bool ret = false;
+
+	if (TWFunc::Path_Exists(newFolder)) {
+		gui_msg(Msg(msg::kError, "tw_folder_exists=A folder with that name already exists!"));
+	} else {
+		ret = true;
+	}
+
+	if (newFolder != prevFolder && ret) {
+		ret = TWFunc::Exec_Cmd("mv -f \"" + prevFolder + "\" \"" + newFolder + '\"') != 0 ? false : true;
+	} else {
+		gui_msg(Msg(msg::kError, "tw_folder_exists=A folder with that name already exists!"));
+	}
+
+	if (ret) ret = TWFunc::Recursive_Mkdir("\"" + newBackupFolder + "\"") ? true : false;
+
+
+	if (ret) {
+		DataManager::SetValue(TW_RECOVERY_FOLDER_VAR, '/' + arg);
+		DataManager::SetValue(TW_BACKUPS_FOLDER_VAR, newBackupFolder);
+		DataManager::mBackingFile = newFolder + '/' + TW_SETTINGS_FILE;
+	}
+	operation_end((int)!ret);
+	return 0;
+}
diff --git a/gui/objects.hpp b/gui/objects.hpp
index eaab2e7c52..78ed94d489 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -375,6 +375,7 @@ class GUIAction : public GUIObject, public ActionObject
 #ifndef TW_EXCLUDE_NANO
 	int editfile(std::string arg);
 #endif
+	int applycustomtwrpfolder(std::string arg);
 
 	int simulate;
 };
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 8221fa4b00..5d3f5eab4f 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -3476,6 +3476,10 @@
 
 			<listbox style="advanced_listbox">
 				<placement x="%center_x%" y="%row2_y%" w="%content_half_width%" h="%fileselector_install_height%"/>
+				<listitem name="{@change_twrp_folder_btn=Change TWRP folder}">
+					<condition var1="tw_is_encrypted" var2="0"/>
+					<action function="page">changeTwrpFolder</action>
+				</listitem>
 				<listitem name="{@decrypt_users=Decrypt Users}">
 					<conditions>
 						<condition var1="tw_is_fbe" var2="1"/>
@@ -5561,5 +5565,102 @@ edi				<conditions>
 				<action function="page">advanced</action>
 			</action>
 		</page>
+
+		<page name="changeTwrpFolder">
+			<template name="page"/>
+
+			<text style="text_l">
+				<placement x="%col1_x_header%" y="%row3_header_y%"/>
+				<text>{@advanced_hdr=Advanced}</text>
+			</text>
+
+			<text style="text_m">
+				<placement x="%col1_x_header%" y="%row4_header_y%"/>
+				<text>{@change_twrp_folder_btn=Change TWRP folder}</text>
+			</text>
+
+			<text style="text_m_accent">
+				<placement x="%col1_x_left%" y="%row2_y%"/>
+				<text>{@name=Name:}</text>
+			</text>
+
+			<input>
+				<placement x="%col1_x_left%" y="%row2_input_y%" w="%content_width%" h="%input_height%"/>
+				<text>%tw_custom_folder%</text>
+				<data name="tw_custom_folder"/>
+				<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"/>
+				<actions>
+					<action function="set">tw_back=changeTwrpFolder</action>
+					<action function="set">tw_action=applycustomtwrpfolder</action>
+					<action function="set">tw_action_param=%tw_custom_folder%</action>
+					<action function="set">tw_text1={@confirm_action=Confirm}</action>
+					<action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+					<action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+					<action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} %tw_custom_folder%</action>
+					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+					<action function="set">tw_filecheck=/sdcard/%tw_custom_folder%</action>
+					<action function="set">tw_existpage=changeTwrpFolder</action>
+					<action function="set">tw_notexistpage=confirm_action</action>
+					<action function="page">filecheck</action>
+				</actions>
+			</input>
+
+			<fill color="%accent_color%">
+				<placement x="%col1_x_left%" y="row4_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<fill color="%text_fail_color%">
+				<condition var1="tw_fileexists" var2="1"/>
+				<placement x="%col1_x_left%" y="row4_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<text style="text_m_fail">
+				<condition var1="tw_fileexists" var2="1"/>
+				<placement x="%col1_x_left%" y="%row4_y%"/>
+				<text>{@tw_folder_exists=A folder with that name already exists!}</text>
+			</text>
+
+			<button style="main_button_half_width_low">
+				<placement x="%indent%" y="%row5_y%"/>
+				<text>{@cancel_btn=Cancel}</text>
+				<action function="page">advanced</action>
+			</button>
+
+			<button style="main_button_half_width_low">
+				<condition var1="tw_recovery_folder" op="!=" var2="/TWRP"/>
+				<placement x="%date_button_x%" y="%row5_y%"/>
+				<text>{@restore_defaults_btn=Restore Defaults}</text>
+				<actions>
+					<action function="set">tw_back=changeTwrpFolder</action>
+					<action function="set">tw_action=applycustomtwrpfolder</action>
+					<action function="set">tw_action_param=TWRP</action>
+					<action function="set">tw_text1={@confirm_action=Confirm}</action>
+					<action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+					<action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+					<action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} TWRP</action>
+					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+					<action function="set">tw_filecheck=/sdcard/TWRP</action>
+					<action function="set">tw_existpage=changeTwrpFolder</action>
+					<action function="set">tw_notexistpage=confirm_action</action>
+					<action function="page">filecheck</action>
+				</actions>
+			</button>
+
+			<template name="keyboardtemplate"/>
+
+			<action>
+				<touch key="home"/>
+				<actions>
+					<action function="page">main</action>
+				</actions>
+			</action>
+
+			<action>
+				<touch key="back"/>
+				<actions>
+					<action function="page">advanced</action>
+				</actions>
+			</action>
+		</page>
 	</pages>
 </recovery>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 352bffa186..868dbea497 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -743,5 +743,9 @@
 		<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
 		<string name="ozip_decrypt_finish">Ozip Decryption Finished!</string>
 		<string name="restore_system_context">Unable to get default context for {1} -- Android may not boot.</string>
+		<string name="change_twrp_folder_btn">Change TWRP folder</string>
+		<string name="change_twrp_folder_on_process">Changing TWRP folder</string>
+		<string name="change_twrp_folder_after_process">TWRP folder changed to</string>
+		<string name="tw_folder_exists">A folder with that name already exists!</string>
 	</resources>
 </language>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index d5318fb719..ae6fd91ebb 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3598,6 +3598,10 @@
 
 			<listbox style="advanced_listbox">
 				<placement x="%indent%" y="%row13a_y%" w="%content_width%" h="%listbox_advanced_height%"/>
+				<listitem name="Change TWRP Folder">
+					<condition var1="tw_is_encrypted" var2="0"/>
+					<action function="page">changeTwrpFolder</action>
+				</listitem>
 				<listitem name="{@decrypt_users=Decrypt Users}">
 					<conditions>
 						<condition var1="tw_is_fbe" var2="1"/>
@@ -5289,5 +5293,104 @@
 				<action function="page">advanced</action>
 			</action>
 		</page>
+
+		<page name="changeTwrpFolder">
+			<template name="page"/>
+
+			<text style="text_l">
+				<placement x="%col1_x_header%" y="%row3_header_y%"/>
+				<text>{@advanced_hdr=Advanced}</text>
+			</text>
+
+			<text style="text_m">
+				<placement x="%col1_x_header%" y="%row4_header_y%"/>
+				<text>{@change_twrp_folder_btn=Change TWRP folder}</text>
+			</text>
+
+			<text style="text_m_accent">
+				<placement x="%indent%" y="%row2_y%"/>
+				<text>{@name=Name:}</text>
+			</text>
+
+			<input>
+				<placement x="%indent%" y="%row2_input_y%" w="%content_width%" h="%input_height%"/>
+				<text>%tw_custom_folder%</text>
+				<data name="tw_custom_folder"/>
+				<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"/>
+				<actions>
+					<action function="set">tw_back=changeTwrpFolder</action>
+					<action function="set">tw_action=applycustomtwrpfolder</action>
+					<action function="set">tw_action_param=%tw_custom_folder%</action>
+					<action function="set">tw_text1={@confirm_action=Confirm}</action>
+					<action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+					<action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+					<action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} %tw_custom_folder%</action>
+					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+					<action function="set">tw_filecheck=/sdcard/%tw_custom_folder%</action>
+					<action function="set">tw_existpage=changeTwrpFolder</action>
+					<action function="set">tw_notexistpage=confirm_action</action>
+					<action function="page">filecheck</action>
+				</actions>
+			</input>
+
+			<fill color="%accent_color%">
+				<placement x="%indent%" y="row4_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<fill color="%text_fail_color%">
+				<condition var1="tw_fileexists" var2="1"/>
+				<placement x="%indent%" y="row4_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<text style="text_m_fail">
+				<condition var1="tw_fileexists" var2="1"/>
+				<placement x="%indent%" y="%row4a_y%"/>
+				<text>{@tw_folder_exists=A folder with that name already exists!}</text>
+			</text>
+
+			<button style="main_button_half_height">
+				<placement x="%indent%" y="%row10_y%"/>
+				<text>{@cancel_btn=Cancel}</text>
+				<actions>
+					<action function="page">advanced</action>
+				</actions>
+			</button>
+
+			<button style="main_button_half_height">
+				<condition var1="tw_recovery_folder" op="!=" var2="/TWRP"/>
+				<placement x="%center_x%" y="%row10_y%"/>
+				<text>{@restore_defaults_btn=Restore Defaults}</text>
+				<actions>
+					<action function="set">tw_back=changeTwrpFolder</action>
+					<action function="set">tw_action=applycustomtwrpfolder</action>
+					<action function="set">tw_action_param=TWRP</action>
+					<action function="set">tw_text1={@confirm_action=Confirm}</action>
+					<action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+					<action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+					<action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} TWRP</action>
+					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+					<action function="set">tw_filecheck=/sdcard/TWRP</action>
+					<action function="set">tw_existpage=changeTwrpFolder</action>
+					<action function="set">tw_notexistpage=confirm_action</action>
+					<action function="page">filecheck</action>
+				</actions>
+			</button>
+
+			<template name="keyboardtemplate"/>
+
+			<action>
+				<touch key="home"/>
+				<actions>
+					<action function="page">main</action>
+				</actions>
+			</action>
+
+			<action>
+				<touch key="back"/>
+				<actions>
+					<action function="page">advanced</action>
+				</actions>
+			</action>
+		</page>
 	</pages>
 </recovery>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 5a7c22508a..4ff783a1e0 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -4226,6 +4226,10 @@
 
 			<listbox style="advanced_listbox">
 				<placement x="%indent%" y="%row2_header_y%" w="%content_width%" h="%fileselector_install_height%"/>
+				<listitem name="{@change_twrp_folder_btn=Change TWRP folder}">
+					<condition var1="tw_is_encrypted" var2="0"/>
+					<action function="page">changeTwrpFolder</action>
+				</listitem>
 				<listitem name="{@decrypt_users=Decrypt Users}">
 					<conditions>
 						<condition var1="tw_is_fbe" var2="1"/>
@@ -5851,5 +5855,99 @@
 				<action function="page">advanced</action>
 			</action>
 		</page>
+
+		<page name="changeTwrpFolder">
+			<template name="page"/>
+
+			<template name="statusbar"/>
+
+			<text style="text_m">
+				<placement x="%col1_x_left%" y="%row1_header_y%"/>
+				<text>{@change_twrp_folder_btn=Change TWRP folder}</text>
+			</text>
+
+			<text style="text_m_accent">
+				<placement x="%col1_x_left%" y="%row1_y%"/>
+				<text>{@name=Name:}</text>
+			</text>
+
+			<input>
+				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%input_height%"/>
+				<text>%tw_custom_folder%</text>
+				<data name="tw_custom_folder"/>
+				<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"/>
+				<actions>
+					<action function="set">tw_back=changeTwrpFolder</action>
+					<action function="set">tw_action=applycustomtwrpfolder</action>
+					<action function="set">tw_action_param=%tw_custom_folder%</action>
+					<action function="set">tw_text1={@confirm_action=Confirm}</action>
+					<action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+					<action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+					<action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} %tw_custom_folder%</action>
+					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+					<action function="set">tw_filecheck=/sdcard/%tw_custom_folder%</action>
+					<action function="set">tw_existpage=changeTwrpFolder</action>
+					<action function="set">tw_notexistpage=confirm_action</action>
+					<action function="page">filecheck</action>
+				</actions>
+			</input>
+
+			<fill color="%accent_color%">
+				<placement x="%col1_x_left%" y="%row3_input_y%" w="%content_width%" h="%input_line_width%" placement="1"/>
+			</fill>
+
+			<fill color="%text_fail_color%">
+				<condition var1="tw_fileexists" var2="1"/>
+				<placement x="%col1_x_left%" y="%row3_input_y%" w="%content_width%" h="%input_line_width%" placement="1"/>
+			</fill>
+
+			<text style="text_m_fail">
+				<condition var1="tw_fileexists" var2="1"/>
+				<placement x="%col1_x_left%" y="%row3_input_y%"/>
+				<text>{@tw_folder_exists=A folder with that name already exists!}</text>
+			</text>
+
+			<button style="main_button_half_width_low">
+				<placement x="%col1_x_left%" y="%row4_y%"/>
+				<text>{@cancel_btn=Cancel}</text>
+				<action function="page">advanced2</action>
+			</button>
+
+			<button style="main_button_half_height">
+				<condition var1="tw_recovery_folder" op="!=" var2="/TWRP"/>
+				<placement x="%col1_x_right%" y="%row4_y%"/>
+				<text>{@restore_defaults_btn=Restore Defaults}</text>
+				<actions>
+					<action function="set">tw_back=changeTwrpFolder</action>
+					<action function="set">tw_action=applycustomtwrpfolder</action>
+					<action function="set">tw_action_param=TWRP</action>
+					<action function="set">tw_text1={@confirm_action=Confirm}</action>
+					<action function="set">tw_text2={@rename_backup_confirm2=This cannot be undone!}</action>
+					<action function="set">tw_action_text1={@change_twrp_folder_on_process=Changing TWRP folder}</action>
+					<action function="set">tw_complete_text1={@change_twrp_folder_after_process=TWRP folder changed to} TWRP</action>
+					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+					<action function="set">tw_filecheck=/sdcard/TWRP</action>
+					<action function="set">tw_existpage=changeTwrpFolder</action>
+					<action function="set">tw_notexistpage=confirm_action</action>
+					<action function="page">filecheck</action>
+				</actions>
+			</button>
+
+			<template name="keyboardtemplate"/>
+
+			<action>
+				<touch key="home"/>
+				<actions>
+					<action function="page">main</action>
+				</actions>
+			</action>
+
+			<action>
+				<touch key="back"/>
+				<actions>
+					<action function="page">advanced2</action>
+				</actions>
+			</action>
+		</page>
 	</pages>
 </recovery>
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index b55defc043..555723faa1 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1701,6 +1701,7 @@ void TWPartitionManager::Post_Decrypt(const string& Block_Device) {
 			DataManager::SetValue("tw_settings_path", "/data/media/0");
 			dat->UnMount(false);
 		}
+		DataManager::LoadTWRPFolderInfo();
 		Update_System_Details();
 		Output_Partition(dat);
 		UnMount_Main_Partitions();
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index cefaf918b8..f48f44d5b8 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1412,4 +1412,97 @@ bool TWFunc::Set_Encryption_Policy(std::string path, const ext4_encryption_polic
 #endif
 	return true;
 }
+
+string TWFunc::Check_For_TwrpFolder(){
+	string oldFolder = "";
+	vector<string> customTWRPFolders;
+	string mainPath = DataManager::GetCurrentStoragePath();
+	DIR* d;
+	struct dirent* de;
+
+	if(DataManager::GetIntValue(TW_IS_ENCRYPTED)){
+		goto exit;
+	}
+
+
+	d = opendir(mainPath.c_str());
+	if (d == NULL) {
+		goto exit;
+	}
+
+	while ((de = readdir(d)) != NULL) {
+		string name = de->d_name;
+		string fullPath = mainPath + '/' + name;
+		unsigned char type = de->d_type;
+
+		if(name == "." || name == "..") continue;
+
+		if(type == DT_UNKNOWN){
+			type = Get_D_Type_From_Stat(fullPath);
+		}
+
+		if(type == DT_DIR && Path_Exists(fullPath + '/' + TW_SETTINGS_FILE)){
+			if('/' + name == TW_DEFAULT_RECOVERY_FOLDER){
+				oldFolder = name;
+			}else{
+				customTWRPFolders.push_back(name);
+			}
+		}
+	}
+
+	closedir(d);
+
+	if(oldFolder == "" && customTWRPFolders.empty()){
+		LOGINFO("No recovery folder found. Using default folder.\n");
+		goto exit;
+	}else if(customTWRPFolders.empty()){
+		LOGINFO("No custom recovery folder found. Using TWRP as default.\n");
+		goto exit;
+	}else{
+		if(customTWRPFolders.size() > 1){
+			LOGINFO("More than one custom recovery folder found. Using first one from the list.\n");
+		}else{
+			LOGINFO("One custom recovery folder found.\n");
+		}
+		string customPath =  '/' + customTWRPFolders.at(0);
+
+		if(Path_Exists(mainPath + TW_DEFAULT_RECOVERY_FOLDER)){
+			string oldBackupFolder = mainPath + TW_DEFAULT_RECOVERY_FOLDER + "/BACKUPS/" + DataManager::GetStrValue("device_id");
+			string newBackupFolder = mainPath + customPath + "/BACKUPS/" + DataManager::GetStrValue("device_id");
+
+			if(Path_Exists(oldBackupFolder)){
+				vector<string> backups;
+				d = opendir(oldBackupFolder.c_str());
+
+				if (d != NULL) {
+					while ((de = readdir(d)) != NULL) {
+						string name = de->d_name;
+						unsigned char type = de->d_type;
+
+						if(name == "." || name == "..") continue;
+
+						if(type == DT_UNKNOWN){
+							type = Get_D_Type_From_Stat(mainPath + '/' + name);
+						}
+
+						if(type == DT_DIR){
+							backups.push_back(name);
+						}
+					}
+					closedir(d);
+				}
+
+				for(auto it = backups.begin(); it != backups.end(); it++){
+					Exec_Cmd("mv -f \"" + oldBackupFolder + '/' + *it + "\" \"" + newBackupFolder + '/' + *it + (Path_Exists(newBackupFolder + '/' + *it) ? "_new\"" : "\""));
+				}
+			}
+			Exec_Cmd("rm -rf \"" + mainPath + TW_DEFAULT_RECOVERY_FOLDER + '\"');
+		}
+
+		return customPath;
+	}
+
+exit:
+	return TW_DEFAULT_RECOVERY_FOLDER;
+}
 #endif // ndef BUILD_TWRPTAR_MAIN
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 3e013c3854..38cdd3b27f 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -122,6 +122,7 @@ class TWFunc
 	static int Property_Override(string Prop_Name, string Prop_Value); // Override properties (including ro. properties)
 	static bool Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path); // return encryption policy for path
 	static bool Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy); // set encryption policy for path
+	static string Check_For_TwrpFolder();
 
 private:
 	static void Copy_Log(string Source, string Destination);
diff --git a/twrp.cpp b/twrp.cpp
index dbc024b395..96d995895f 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -330,6 +330,7 @@ int main(int argc, char **argv) {
 
 	// Read the settings file
 	TWFunc::Update_Log_File();
+	DataManager::LoadTWRPFolderInfo();
 	DataManager::ReadSettingsFile();
 	PageManager::LoadLanguage(DataManager::GetStrValue("tw_language"));
 	GUIConsole::Translate_Now();
diff --git a/variables.h b/variables.h
index 8ef82886ee..57b6485381 100644
--- a/variables.h
+++ b/variables.h
@@ -19,7 +19,9 @@
 
 #define TW_MAIN_VERSION_STR       "3.5.0_9"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
-
+#define TW_SETTINGS_FILE            ".twrps"
+#define TW_RECOVERY_NAME            "TWRP"
+#define TW_DEFAULT_RECOVERY_FOLDER  "/" TW_RECOVERY_NAME
 #define TW_USE_COMPRESSION_VAR      "tw_use_compression"
 #define TW_FILENAME                 "tw_filename"
 #define TW_ZIP_INDEX                "tw_zip_index"
@@ -78,6 +80,7 @@
 #define TW_RM_RF_VAR                "tw_rm_rf"
 
 #define TW_BACKUPS_FOLDER_VAR       "tw_backups_folder"
+#define TW_RECOVERY_FOLDER_VAR      "tw_recovery_folder"
 
 #define TW_SDEXT_SIZE               "tw_sdext_size"
 #define TW_SWAP_SIZE                "tw_swap_size"

From 8ed561523733b5902a665cd053c00e27af3ee1ff Mon Sep 17 00:00:00 2001
From: DarthJabba9 <darthjabba9@gmail.com>
Date: Sat, 20 Feb 2021 19:17:01 -0500
Subject: [PATCH 143/207] bash: add to TWRP

Change-Id: Ie1826df01ad5fe2480e96d56b2c4fd1c91449cc2
---
 Android.mk          |  7 +++++++
 prebuilt/Android.mk | 30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/Android.mk b/Android.mk
index 2292a835ee..a7218859bf 100755
--- a/Android.mk
+++ b/Android.mk
@@ -178,6 +178,7 @@ ifeq ($(TW_OEM_BUILD),true)
     TW_EXCLUDE_MTP := true
     TW_EXCLUDE_TZDATA := true
     TW_EXCLUDE_NANO := true
+    TW_EXCLUDE_BASH := true
 endif
 
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
@@ -538,6 +539,12 @@ ifneq ($(TW_EXCLUDE_NANO), true)
         nano_twrp \
         init.recovery.nano.rc
 endif
+ifneq ($(TW_EXCLUDE_BASH), true)
+    ifneq ($(wildcard external/bash/.),)
+        TWRP_REQUIRED_MODULES += \
+            bash_twrp
+    endif
+endif
 # Allow devices to specify device-specific recovery dependencies
 ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
     TWRP_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index a28cde0cd3..5b1d873d23 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -411,6 +411,9 @@ ifneq ($(TW_EXCLUDE_NANO), true)
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libssh.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libssl.so
 endif
+ifneq ($(TW_EXCLUDE_BASH), true)
+    RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/bash
+endif
 
 TW_BB_SYMLINKS :=
 ifneq ($(TW_USE_TOOLBOX), true)
@@ -648,3 +651,30 @@ else
 endif
 include $(BUILD_PHONY_PACKAGE)
 
+ifneq ($(TW_EXCLUDE_BASH), true)
+	include $(CLEAR_VARS)
+	LOCAL_MODULE := bash_twrp
+	LOCAL_MODULE_TAGS := optional
+	LOCAL_MODULE_CLASS := ETC
+	LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
+	LOCAL_REQUIRED_MODULES := bash
+
+    ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+        LOCAL_POST_INSTALL_CMD += \
+            mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash; \
+            cp -rf external/bash/etc/* $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/; \
+            sed -i 's/ro.cm.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/bashrc; \
+            sed -i 's/ro.lineage.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/bashrc; \
+            sed -i 's/ro.omni.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/bashrc; \
+            sed -i '/export TERM/d' $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/bashrc;
+    else
+        LOCAL_POST_INSTALL_CMD += \
+            mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash; \
+            cp -rf external/bash/etc/* $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/; \
+            sed -i 's/ro.cm.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/bashrc; \
+            sed -i 's/ro.lineage.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/bashrc; \
+            sed -i 's/ro.omni.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/bashrc; \
+            sed -i '/export TERM/d' $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/bashrc;
+    endif
+	include $(BUILD_PHONY_PACKAGE)
+endif

From df224ce8bebb279df60546543f29e4432a3f2afc Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Fri, 26 Feb 2021 19:36:07 -0500
Subject: [PATCH 144/207] SAR: don't follow symbolic links for system slot

Change-Id: I8ea5606007d72d8b2127a14709b2e33976ad963b
---
 partition.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/partition.cpp b/partition.cpp
index b31b228c45..f108087b75 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -359,7 +359,8 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 				return false;
 			} else {
 				Primary_Block_Device = ptr;
-				Find_Real_Block_Device(Primary_Block_Device, Display_Error);
+				if (PartitionManager.Get_Android_Root_Path() != "/system_root")
+					Find_Real_Block_Device(Primary_Block_Device, Display_Error);
 			}
 			item_index++;
 		} else if (item_index > 2) {

From fb6103868091003f3b1cb75780443719aff8a970 Mon Sep 17 00:00:00 2001
From: epicX <souravgain605@gmail.com>
Date: Mon, 1 Mar 2021 00:02:57 +0530
Subject: [PATCH 145/207] Fixes for Add support to change TWRP Folder

Change-Id: I66a66cc6b952c1aae45c50a8f40c00febce69462
---
 gui/action.cpp     |  2 +-
 twrp-functions.cpp | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gui/action.cpp b/gui/action.cpp
index c48fd5d2fe..29fa945e85 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -2291,7 +2291,7 @@ int GUIAction::applycustomtwrpfolder(string arg __unused)
 		gui_msg(Msg(msg::kError, "tw_folder_exists=A folder with that name already exists!"));
 	}
 
-	if (ret) ret = TWFunc::Recursive_Mkdir("\"" + newBackupFolder + "\"") ? true : false;
+	if (ret) ret = TWFunc::Recursive_Mkdir(newBackupFolder) ? true : false;
 
 
 	if (ret) {
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index f48f44d5b8..e77d1eb9d3 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1420,7 +1420,7 @@ string TWFunc::Check_For_TwrpFolder(){
 	DIR* d;
 	struct dirent* de;
 
-	if(DataManager::GetIntValue(TW_IS_ENCRYPTED)){
+	if (DataManager::GetIntValue(TW_IS_ENCRYPTED)) {
 		goto exit;
 	}
 
@@ -1435,16 +1435,16 @@ string TWFunc::Check_For_TwrpFolder(){
 		string fullPath = mainPath + '/' + name;
 		unsigned char type = de->d_type;
 
-		if(name == "." || name == "..") continue;
+		if (name == "." || name == "..") continue;
 
-		if(type == DT_UNKNOWN){
+		if (type == DT_UNKNOWN) {
 			type = Get_D_Type_From_Stat(fullPath);
 		}
 
-		if(type == DT_DIR && Path_Exists(fullPath + '/' + TW_SETTINGS_FILE)){
-			if('/' + name == TW_DEFAULT_RECOVERY_FOLDER){
+		if (type == DT_DIR && Path_Exists(fullPath + '/' + TW_SETTINGS_FILE)) {
+			if ('/' + name == TW_DEFAULT_RECOVERY_FOLDER) {
 				oldFolder = name;
-			}else{
+			} else {
 				customTWRPFolders.push_back(name);
 			}
 		}
@@ -1452,25 +1452,25 @@ string TWFunc::Check_For_TwrpFolder(){
 
 	closedir(d);
 
-	if(oldFolder == "" && customTWRPFolders.empty()){
+	if (oldFolder == "" && customTWRPFolders.empty()) {
 		LOGINFO("No recovery folder found. Using default folder.\n");
 		goto exit;
-	}else if(customTWRPFolders.empty()){
+	} else if (customTWRPFolders.empty()) {
 		LOGINFO("No custom recovery folder found. Using TWRP as default.\n");
 		goto exit;
-	}else{
-		if(customTWRPFolders.size() > 1){
+	} else {
+		if (customTWRPFolders.size() > 1) {
 			LOGINFO("More than one custom recovery folder found. Using first one from the list.\n");
-		}else{
+		} else {
 			LOGINFO("One custom recovery folder found.\n");
 		}
 		string customPath =  '/' + customTWRPFolders.at(0);
 
-		if(Path_Exists(mainPath + TW_DEFAULT_RECOVERY_FOLDER)){
+		if (Path_Exists(mainPath + TW_DEFAULT_RECOVERY_FOLDER)) {
 			string oldBackupFolder = mainPath + TW_DEFAULT_RECOVERY_FOLDER + "/BACKUPS/" + DataManager::GetStrValue("device_id");
 			string newBackupFolder = mainPath + customPath + "/BACKUPS/" + DataManager::GetStrValue("device_id");
 
-			if(Path_Exists(oldBackupFolder)){
+			if (Path_Exists(oldBackupFolder)) {
 				vector<string> backups;
 				d = opendir(oldBackupFolder.c_str());
 
@@ -1479,20 +1479,20 @@ string TWFunc::Check_For_TwrpFolder(){
 						string name = de->d_name;
 						unsigned char type = de->d_type;
 
-						if(name == "." || name == "..") continue;
+						if (name == "." || name == "..") continue;
 
-						if(type == DT_UNKNOWN){
+						if (type == DT_UNKNOWN) {
 							type = Get_D_Type_From_Stat(mainPath + '/' + name);
 						}
 
-						if(type == DT_DIR){
+						if (type == DT_DIR) {
 							backups.push_back(name);
 						}
 					}
 					closedir(d);
 				}
 
-				for(auto it = backups.begin(); it != backups.end(); it++){
+				for (auto it = backups.begin(); it != backups.end(); it++) {
 					Exec_Cmd("mv -f \"" + oldBackupFolder + '/' + *it + "\" \"" + newBackupFolder + '/' + *it + (Path_Exists(newBackupFolder + '/' + *it) ? "_new\"" : "\""));
 				}
 			}

From 3b3bd12be11bd859a5f65bb1e8c71136044b3ad3 Mon Sep 17 00:00:00 2001
From: Adrian DC <radian.dc@gmail.com>
Date: Tue, 5 Jan 2021 22:34:21 +0100
Subject: [PATCH 146/207] ors: Implement 'twrp format data' to format the data
 partition

Change-Id: Ic01685602a47d0b468616e3d5c3f26a44313cdc8
---
 openrecoveryscript.cpp | 8 ++++++++
 orscmd/orscmd.cpp      | 1 +
 2 files changed, 9 insertions(+)

diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index 7a211ac9e4..d89ab8bea0 100755
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -165,6 +165,14 @@ int OpenRecoveryScript::run_script_file(void) {
 					LOGERR("Error with wipe command value: '%s'\n", value);
 					ret_val = 1;
 				}
+			} else if (strcmp(command, "format") == 0) {
+				// Format
+				if (strcmp(value, "data") == 0 || strcmp(value, "/data") == 0 || strcmp(value, "factory") == 0 || strcmp(value, "factoryreset") == 0) {
+					PartitionManager.Format_Data();
+				} else {
+					LOGERR("Error with format command value: '%s'\n", value);
+					ret_val = 1;
+				}
 			} else if (strcmp(command, "backup") == 0) {
 				// Backup
 				DataManager::SetValue("tw_action_text2", gui_parse_text("{@backing}"));
diff --git a/orscmd/orscmd.cpp b/orscmd/orscmd.cpp
index 0a12a08664..62fefd4453 100644
--- a/orscmd/orscmd.cpp
+++ b/orscmd/orscmd.cpp
@@ -43,6 +43,7 @@ void print_usage(void) {
 	printf("  backup <SDCRBAEM> [backupname]\n");
 	printf("  restore <SDCRBAEM> [backupname]\n");
 	printf("  wipe <partition name>\n");
+	printf("  format data\n");
 	printf("  sideload\n");
 	printf("  set <variable> [value]\n");
 	printf("  decrypt <password> [USER ID]\n");

From a112cb526320ee5afafce7fb6ca0c60bfaf0d3a8 Mon Sep 17 00:00:00 2001
From: Ian Macdonald <ian@caliban.org>
Date: Mon, 1 Mar 2021 17:20:12 +0100
Subject: [PATCH 147/207] Strip strings containing '--' before conversion to
 XML comments.

Otherwise, the script bombs out when it tries to write the illegal XML.

Change-Id: Iaf0e9f6c82a57886ff56cdd4d1fc1c402776b29b
(cherry picked from commit 764c59a1957c79b1b48ae9600709bb5ec4d0338d)
---
 scripts/language_helper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/language_helper.py b/scripts/language_helper.py
index 9fa956b2d1..67bd20120c 100644
--- a/scripts/language_helper.py
+++ b/scripts/language_helper.py
@@ -129,7 +129,7 @@ def toprettyxml(xdoc, encoding):
 						break
 				if found == False:
 					print "'%s' present in English and not in %s" % (child.attributes['name'].value.encode("utf-8"), otherlang)
-					notfound_err = "NOT FOUND " + child.toxml()
+					notfound_err = "NOT FOUND " + child.toxml().replace('--', '\-\-')
 					notfound_comment = doc.createComment(notfound_err)
 					resources.appendChild(notfound_comment)
 		elif child.nodeType == child.COMMENT_NODE:

From d259b372d8aa310a0e5ff091a22dcba1337e5b98 Mon Sep 17 00:00:00 2001
From: Ian Macdonald <ian@caliban.org>
Date: Mon, 1 Mar 2021 21:31:07 +0100
Subject: [PATCH 148/207] Fix unlocalised string.

Change-Id: I583df33125092bef205f0f8710225b9dbfbe7602
(cherry picked from commit de647a1423b8f41dff5dfb771d87c86b68988fc7)
---
 gui/theme/common/portrait.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index ae6fd91ebb..4bcaf5775e 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3598,7 +3598,7 @@
 
 			<listbox style="advanced_listbox">
 				<placement x="%indent%" y="%row13a_y%" w="%content_width%" h="%listbox_advanced_height%"/>
-				<listitem name="Change TWRP Folder">
+				<listitem name="{@change_twrp_folder_btn=Change TWRP folder}">
 					<condition var1="tw_is_encrypted" var2="0"/>
 					<action function="page">changeTwrpFolder</action>
 				</listitem>

From b733737db0aa88729841864ab71d3c9fad0f33fe Mon Sep 17 00:00:00 2001
From: epicX <souravgain605@gmail.com>
Date: Wed, 24 Feb 2021 23:12:08 +0530
Subject: [PATCH 149/207] Added support for flash image in both slots

Change-Id: Iafda62a5f77f7c1f564f1a2ec0a59aefaf5e1266
---
 data.cpp                          |  3 +++
 gui/Android.mk                    |  3 +++
 gui/action.cpp                    | 33 +++++++++++++++++++++++++++----
 gui/partitionlist.cpp             |  4 ++++
 gui/theme/common/landscape.xml    | 29 ++++++++++++++++++++++++++-
 gui/theme/common/languages/en.xml |  1 +
 gui/theme/common/portrait.xml     | 29 ++++++++++++++++++++++++++-
 gui/theme/common/watch.xml        | 29 ++++++++++++++++++++++++++-
 8 files changed, 124 insertions(+), 7 deletions(-)

diff --git a/data.cpp b/data.cpp
index 71f903527d..b05bc0463e 100755
--- a/data.cpp
+++ b/data.cpp
@@ -918,6 +918,9 @@ void DataManager::SetDefaultValues()
 	mConst.SetValue("tw_include_nano", "0");
 #endif
 
+	mData.SetValue("tw_flash_both_slots", "0");
+	mData.SetValue("tw_is_slot_part", "0");
+
 	mData.SetValue("tw_enable_adb_backup", "0");
 
 	if (TWFunc::Path_Exists("/sbin/magiskboot"))
diff --git a/gui/Android.mk b/gui/Android.mk
index c4d938ae70..32c0d5b1f2 100755
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -103,6 +103,9 @@ endif
 ifeq ($(TW_EXCLUDE_NANO), true)
     LOCAL_CFLAGS += -DTW_EXCLUDE_NANO
 endif
+ifeq ($(AB_OTA_UPDATER),true)
+    LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
+endif
 
 LOCAL_C_INCLUDES += \
     bionic \
diff --git a/gui/action.cpp b/gui/action.cpp
index 29fa945e85..2ca21614dd 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1817,16 +1817,41 @@ int GUIAction::stopmtp(std::string arg __unused)
 int GUIAction::flashimage(std::string arg __unused)
 {
 	int op_status = 0;
+	bool flag = true;
 
 	operation_start("Flash Image");
 	string path, filename;
 	DataManager::GetValue("tw_zip_location", path);
 	DataManager::GetValue("tw_file", filename);
-	if (PartitionManager.Flash_Image(path, filename))
-		op_status = 0; // success
-	else
-		op_status = 1; // fail
 
+#ifdef AB_OTA_UPDATER
+	string target = DataManager::GetStrValue("tw_flash_partition");
+	unsigned int pos = target.find_last_of(';');
+	string mount_point = pos != string::npos ? target.substr(0, pos) : "";
+	TWPartition* t_part = PartitionManager.Find_Partition_By_Path(mount_point);
+	bool flash_in_both_slots = DataManager::GetIntValue("tw_flash_both_slots") ? true : false;
+
+	if (t_part != NULL && (flash_in_both_slots && t_part->SlotSelect)) 
+	{
+		string current_slot = PartitionManager.Get_Active_Slot_Display();
+		bool pre_op_status = PartitionManager.Flash_Image(path, filename);
+
+		PartitionManager.Set_Active_Slot(current_slot == "A" ? "B" : "A");
+		op_status = (int) !(pre_op_status && PartitionManager.Flash_Image(path, filename));
+		PartitionManager.Set_Active_Slot(current_slot);
+
+		DataManager::SetValue("tw_flash_both_slots", 0);
+		flag = false;
+	}
+#endif
+	if (flag)
+	{
+		if (PartitionManager.Flash_Image(path, filename))
+			op_status = 0; // success
+		else
+			op_status = 1; // fail
+	}
+	
 	operation_end(op_status);
 	return 0;
 }
diff --git a/gui/partitionlist.cpp b/gui/partitionlist.cpp
index 16e09977ef..9c5b58e7d0 100644
--- a/gui/partitionlist.cpp
+++ b/gui/partitionlist.cpp
@@ -179,6 +179,8 @@ void GUIPartitionList::MatchList(void) {
 		pos = variablelist.find(searchvalue);
 		if (pos != string::npos) {
 			mList.at(i).selected = 1;
+			TWPartition* t_part = PartitionManager.Find_Partition_By_Path(mList.at(i).Mount_Point);
+			DataManager::SetValue("tw_is_slot_part", t_part != NULL ? (int) t_part->SlotSelect : 0);
 		} else {
 			mList.at(i).selected = 0;
 		}
@@ -272,6 +274,8 @@ void GUIPartitionList::NotifySelect(size_t item_selected)
 					mList.at(item_selected).selected = 0;
 				else
 					mList.at(item_selected).selected = 1;
+					TWPartition* t_part = PartitionManager.Find_Partition_By_Path(mList.at(item_selected).Mount_Point);
+					DataManager::SetValue("tw_is_slot_part", t_part != NULL ? (int) t_part->SlotSelect : 0);
 
 				int i;
 				string variablelist;
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 5d3f5eab4f..4be49ea4af 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -372,7 +372,10 @@
 					<condition var1="tw_selectimage" var2="1"/>
 					<condition var1="tw_filename" op="modified"/>
 				</conditions>
-				<action function="page">flashimage_confirm</action>
+				<actions>
+					<action function="set">tw_is_slot_part=0</action>
+					<action function="page">flashimage_confirm</action>
+				</actions>
 			</action>
 
 			<action>
@@ -711,6 +714,30 @@
 				<listtype name="flashimg"/>
 			</partitionlist>
 
+			<button style="checkbox">
+				<conditions>
+					<condition var1="tw_is_slot_part" op="=" var2="1"/>
+					<condition var1="tw_flash_both_slots" op="=" var2="0"/>
+					<condition var1="tw_has_boot_slots" var2="1"/>
+				</conditions>
+				<placement x="%col1_x_left%" y="%row14a_y%" textplacement="6"/>
+				<text>{@flash_ab_both_slots=Flash to both slots}</text>
+				<image resource="checkbox_false"/>
+				<action function="set">tw_flash_both_slots=1</action>
+			</button>
+
+			<button style="checkbox">
+				<conditions>
+					<condition var1="tw_is_slot_part" op="=" var2="1"/>
+					<condition var1="tw_flash_both_slots" op="=" var2="1"/>
+					<condition var1="tw_has_boot_slots" var2="1"/>
+				</conditions>
+				<placement x="%col1_x_left%" y="%row14a_y%" textplacement="6"/>
+				<text>{@flash_ab_both_slots=Flash to both slots}</text>
+				<image resource="checkbox_true"/>
+				<action function="set">tw_flash_both_slots=0</action>
+			</button>
+
 			<slider>
 				<text>{@swipe_flash=Swipe to confirm Flash}</text>
 				<actions>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 868dbea497..a6074fd5a3 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -740,6 +740,7 @@
 		<string name="unmount_system_err">Failed unmounting System</string>
 		<string name="flash_ab_inactive">Flashing A/B zip to inactive slot: {1}</string>
 		<string name="flash_ab_reboot">To flash additional zips, please reboot recovery to switch to the updated slot.</string>
+		<string name="flash_ab_both_slots">Flash to both slots</string>
 		<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
 		<string name="ozip_decrypt_finish">Ozip Decryption Finished!</string>
 		<string name="restore_system_context">Unable to get default context for {1} -- Android may not boot.</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 4bcaf5775e..80ee07d13d 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -329,7 +329,10 @@
 					<condition var1="tw_selectimage" var2="1"/>
 					<condition var1="tw_filename" op="modified"/>
 				</conditions>
-				<action function="page">flashimage_confirm</action>
+				<actions>
+					<action function="set">tw_is_slot_part=0</action>
+					<action function="page">flashimage_confirm</action>
+				</actions>
 			</action>
 
 			<action>
@@ -662,6 +665,30 @@
 				<listtype name="flashimg"/>
 			</partitionlist>
 
+			<button style="checkbox">
+				<conditions>
+					<condition var1="tw_is_slot_part" op="=" var2="1"/>
+					<condition var1="tw_flash_both_slots" op="=" var2="0"/>
+					<condition var1="tw_has_boot_slots" var2="1"/>
+				</conditions>
+				<placement x="%indent%" y="%row19a_y%" textplacement="6"/>
+				<text>{@flash_ab_both_slots=Flash to both slots}</text>
+				<image resource="checkbox_false"/>
+				<action function="set">tw_flash_both_slots=1</action>
+			</button>
+
+			<button style="checkbox">
+				<conditions>
+					<condition var1="tw_is_slot_part" op="=" var2="1"/>
+					<condition var1="tw_flash_both_slots" op="=" var2="1"/>
+					<condition var1="tw_has_boot_slots" var2="1"/>
+				</conditions>
+				<placement x="%indent%" y="%row19a_y%" textplacement="6"/>
+				<text>{@flash_ab_both_slots=Flash to both slots}</text>
+				<image resource="checkbox_true"/>
+				<action function="set">tw_flash_both_slots=0</action>
+			</button>
+
 			<slider>
 				<text>{@swipe_flash=Swipe to confirm Flash}</text>
 				<actions>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 4ff783a1e0..8b8fdd75b1 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -442,7 +442,10 @@
 					<condition var1="tw_selectimage" var2="1"/>
 					<condition var1="tw_filename" op="modified"/>
 				</conditions>
-				<action function="page">flashimage_type</action>
+				<actions>
+					<action function="set">tw_is_slot_part=0</action>
+					<action function="page">flashimage_type</action>
+				</actions>
 			</action>
 
 			<action>
@@ -860,6 +863,30 @@
 				<listtype name="flashimg"/>
 			</partitionlist>
 
+			<button style="checkbox">
+				<conditions>
+					<condition var1="tw_is_slot_part" op="=" var2="1"/>
+					<condition var1="tw_flash_both_slots" op="=" var2="0"/>
+					<condition var1="tw_has_boot_slots" var2="1"/>
+				</conditions>
+				<placement x="%col2_x_left%" y="%row11_y%" textplacement="6"/>
+				<text>{@flash_ab_both_slots=Flash to both slots}</text>
+				<image resource="checkbox_false"/>
+				<action function="set">tw_flash_both_slots=1</action>
+			</button>
+
+			<button style="checkbox">
+				<conditions>
+					<condition var1="tw_is_slot_part" op="=" var2="1"/>
+					<condition var1="tw_flash_both_slots" op="=" var2="1"/>
+					<condition var1="tw_has_boot_slots" var2="1"/>
+				</conditions>
+				<placement x="%col2_x_left%" y="%row11_y%" textplacement="6"/>
+				<text>{@flash_ab_both_slots=Flash to both slots}</text>
+				<image resource="checkbox_true"/>
+				<action function="set">tw_flash_both_slots=0</action>
+			</button>
+
 			<button>
 				<placement x="%col1_x_left%" y="%row11_y%"/>
 				<highlight color="%highlight_color%"/>

From e24817135ce95e81e81cf6be1bb00f74c6233749 Mon Sep 17 00:00:00 2001
From: Ian Macdonald <ian@caliban.org>
Date: Sat, 6 Mar 2021 12:19:41 +0100
Subject: [PATCH 150/207] New, missing and improved strings for Dutch
 translation.

Change-Id: I216889667c959bb2a0fb1cb59bb6216946974b89
(cherry picked from commit 0ba80255c4692b66587b80fed836d846968390ce)
---
 gui/theme/common/languages/nl.xml | 114 +++++++++++++++++++-----------
 1 file changed, 73 insertions(+), 41 deletions(-)

diff --git a/gui/theme/common/languages/nl.xml b/gui/theme/common/languages/nl.xml
index e100bfe9f9..a913d9da5f 100644
--- a/gui/theme/common/languages/nl.xml
+++ b/gui/theme/common/languages/nl.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <language>
 	<display>Nederlands</display>
-
 	<resources>
 		<!-- Font overrides - only change these if your language requires special characters -->
-		<resource name="font_l" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="100" />
-		<resource name="font_m" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="100" />
-		<resource name="font_s" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="100" />
-		<resource name="fixed" type="fontoverride" filename="DroidSansMono.ttf" scale="100" />
-
+		<resource filename="RobotoCondensed-Regular.ttf" name="font_l" scale="100" type="fontoverride"/>
+		<resource filename="RobotoCondensed-Regular.ttf" name="font_m" scale="100" type="fontoverride"/>
+		<resource filename="RobotoCondensed-Regular.ttf" name="font_s" scale="100" type="fontoverride"/>
+		<resource filename="DroidSansMono.ttf" name="fixed" scale="100" type="fontoverride"/>
 		<!-- Partition display names -->
 		<string name="system">System</string>
 		<string name="system_image">System-image</string>
@@ -31,7 +28,6 @@
 		<string name="adopted_data">Geadopteerde Data</string>
 		<string name="adopted_storage">Geadopteerde opslag</string>
 		<string name="autostorage">Opslag</string>
-
 		<!-- GUI XML strings -->
 		<string name="twrp_header">Team Win Recovery Project</string>
 		<string name="twrp_watch_header">TWRP %tw_version%</string>
@@ -50,7 +46,6 @@
 		<string name="tab_screen">SCHERM</string>
 		<string name="tab_vibration">TRILLEN</string>
 		<string name="tab_language">TAAL</string>
-
 		<string name="install_btn">Installeren</string>
 		<string name="wipe_btn">Wissen</string>
 		<string name="backup_btn">Back-uppen</string>
@@ -82,9 +77,9 @@
 		<string name="zip_back_clear">Klik op Terug om de wachtrij leeg te maken.</string>
 		<string name="folder">Map:</string>
 		<string name="file">Bestand:</string>
-		<string name="zip_sig_chk">Verificatie van de ondertekening van het zipbestand</string>
-		<string name="inject_twrp_chk">TWRP inlassen na installatie</string>
-		<string name="install_reboot_chk">Herstarten na installatie</string>
+		<string name="zip_sig_chk">Ondertekening zipbestand verifiëren</string>
+		<string name="inject_twrp_chk">TWRP injecteren na installatie</string>
+		<string name="install_reboot_chk">Apparaat herstarten na installatie</string>
 		<string name="options_hdr">Opties</string>
 		<string name="confirm_flash_hdr">Flashen bevestigen</string>
 		<string name="zip_queue">Wachtrij:</string>
@@ -126,10 +121,10 @@
 		<string name="reboot_install_app_system">Installeren als System-app</string>
 		<string name="reboot_installing_app">App wordt geïnstalleerd...</string>
 		<string name="swipe_to_install_app">Veeg om TWRP-app te installeren</string>
-		<string name="uninstall_twrp_system_app">TWRP-app deïnstalleren van System</string>
-		<string name="uninstall_twrp_system_app_confirm">TWRP-app deïnstalleren van System?</string>
-		<string name="uninstalling_twrp_system_app">TWRP-app wordt gedeïnstalleerd van System...</string>
-		<string name="uninstall_twrp_system_app_complete">Deïnstallatie TWRP-app van System voltooid</string>
+		<string name="uninstall_twrp_system_app">TWRP-app verwijderen van System</string>
+		<string name="uninstall_twrp_system_app_confirm">TWRP-app verwijderen van System?</string>
+		<string name="uninstalling_twrp_system_app">TWRP-app wordt verwijderd van System...</string>
+		<string name="uninstall_twrp_system_app_complete">TWRP-app verwijderd</string>
 		<string name="swipe_flash">Veeg om te installeren</string>
 		<string name="confirm_action">Actie bevestigen</string>
 		<string name="back_cancel">Klik op Terug om te annuleren.</string>
@@ -141,6 +136,7 @@
 		<string name="factory_reset2">(exclusief interne opslag)</string>
 		<string name="factory_reset3">Meestal kan worden volstaan</string>
 		<string name="factory_reset4">met dit type opschoning.</string>
+		<string name="factory_reset5">(exclusief gebruikers/vergrendelscherm)</string>
 		<string name="factory_resetting">Fabrieksinstellingen worden hersteld...</string>
 		<string name="advanced_wipe_hdr">Geavanceerd wissen</string>
 		<string name="advanced_wipe_btn">Geavanceerd wissen</string>
@@ -166,7 +162,7 @@
 		<string name="format_data_wtc1">Data formatteren verwijdert al uw apps,</string>
 		<string name="format_data_wtc2">back-ups en media. Dit kan niet ongedaan worden gemaakt.</string>
 		<string name="format_data_undo">Dit kan niet ongedaan worden gemaakt.</string>
-		<string name="format_data_complete">Formattering van Data voltooid</string>
+		<string name="format_data_complete">Formatteren van Data voltooid</string>
 		<!-- Translator note: the word "yes" must remain English! -->
 		<string name="yes_continue">Typ 'yes' om verder te gaan. Klik op Terug om te annuleren.</string>
 		<string name="part_opt_hdr">Opties voor partitioneren: %tw_partition_name%</string>
@@ -261,7 +257,7 @@
 		<string name="restore_try_decrypt_s">Poging tot ontsleutelen</string>
 		<string name="restore_backup_date">Back-up gemaakt op %tw_restore_file_date%</string>
 		<string name="restore_sel_part">Partitie(s) selecteren om te herstellen:</string>
-		<string name="restore_enable_digest_chk" version="2">Digestcontrole van back-upbestanden inschakelen</string>
+		<string name="restore_enable_digest_chk" version="2">Digestcontrole back-upbestanden inschakelen</string>
 		<string name="restore_complete">Herstellen voltooid</string>
 		<string name="swipe_restore">Veeg om te herstellen</string>
 		<string name="swipe_restore_s">   Herstellen</string>
@@ -275,8 +271,8 @@
 		<string name="confirm_hdr">Bevestigen</string>
 		<string name="mount_hdr">Koppelen</string>
 		<string name="mount_sel_part">Partitie(s) selecteren om te koppelen:</string>
-		<string name="mount_sys_ro_chk">System-partitie in niet-beschrijfbaar-modus koppelen</string>
-		<string name="mount_sys_ro_s_chk">System-partitie niet beschrijfbaar</string>
+		<string name="mount_sys_ro_chk">System-partitie in onbeschrijfbaar-modus koppelen</string>
+		<string name="mount_sys_ro_s_chk">System-partitie onbeschrijfbaar</string>
 		<string name="decrypt_data_btn">Data ontsleutelen</string>
 		<string name="disable_mtp_btn">MTP uitschakelen</string>
 		<string name="enable_mtp_btn">MTP inschakelen</string>
@@ -307,17 +303,17 @@
 		<string name="sys_rol2">TWRP kan het overschrijven van zichzelf door de oorspronkelijke ROM niet voorkomen en zal ook niet aanbieden het apparaat te rooten.</string>
 		<string name="sys_rol3">Het installeren van zipbestanden en het gebruik van adb kunnen de System-partitie alsnog doen veranderen.</string>
 		<string name="sys_ro_never_show_chk">Dit scherm niet meer weergeven tijdens het opstarten</string>
-		<string name="sys_ro_keep_ro_btn">Niet-beschrijfbaar laten</string>
+		<string name="sys_ro_keep_ro_btn">Onbeschrijfbaar laten</string>
 		<string name="swipe_allow_mod">Veeg om wijzigingen toe te staan</string>
 		<string name="swipe_allow_mod_s">Wijzigingen toestaan</string>
 		<string name="settings_hdr">Instellingen</string>
 		<string name="settings_gen_hdr">Algemeen</string>
 		<string name="settings_gen_s_hdr">Algemeen</string>
 		<string name="settings_gen_btn">Algemeen</string>
-		<string name="use_rmrf_chk">'rm -rf' gebruiken in plaats van formatteren</string>
+		<string name="use_rmrf_chk">'rm -rf' uitvoeren i.p.v. formatteren</string>
 		<string name="use24clock_chk">24-uurs klok</string>
 		<string name="rev_navbar_chk">Omgekeerde volgorde navbar-knoppen</string>
-		<string name="simact_chk">Simuleren van acties t.b.v. testen van thema</string>
+		<string name="simact_chk">Simuleren acties t.b.v. testen thema</string>
 		<string name="simfail_chk">Mislukken van acties simuleren</string>
 		<string name="ctr_navbar_rdo">Navbar-knoppen centreren</string>
 		<string name="lft_navbar_rdo">Navbar-knoppen links uitlijnen</string>
@@ -388,7 +384,7 @@
 		<string name="advanced_hdr">Geavanceerd</string>
 		<string name="copy_log_confirm">Logbestand naar SD-kaart kopiëren?</string>
 		<string name="copying_log" version="2">Log naar SD-kaart kopiëren...</string>
-		<string name="copy_log_complete" version="2">Kopiëren logbestand voltooid</string>
+		<string name="copy_log_complete" version="2">Logbestand gekopieerd</string>
 		<string name="fix_context_btn">Contexten repareren</string>
 		<string name="part_sd_btn">SD-kaart partitioneren</string>
 		<string name="part_sd_s_btn">SD-kaart</string>
@@ -397,10 +393,10 @@
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Thema herladen</string>
 		<string name="dumlock_btn">HTC Dumlock</string>
-		<string name="inject_twrp_btn">TWRP inlassen</string>
-		<string name="inject_twrp_confirm">TWRP opnieuw inlassen?</string>
-		<string name="injecting_twrp">TWRP opnieuw inlassen...</string>
-		<string name="inject_twrp_complete">Inlassen TWRP voltooid</string>
+		<string name="inject_twrp_btn">TWRP injecteren</string>
+		<string name="inject_twrp_confirm">TWRP opnieuw injecteren?</string>
+		<string name="injecting_twrp">TWRP opnieuw injecteren...</string>
+		<string name="inject_twrp_complete">TWRP geïnjecteerd</string>
 		<string name="swipe_to_confirm">Veeg om te bevestigen</string>
 		<string name="part_sd_hdr">SD-kaart partitioneren</string>
 		<string name="invalid_partsd_sel">U moet een verwisselbaar apparaat selecteren</string>
@@ -417,10 +413,10 @@
 		<string name="partitioning_sd2">Dit duurt een paar minuten.</string>
 		<string name="part_sd_complete">Partitioneren voltooid</string>
 		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Oorspronkelijke bootimage herstellen</string>
-		<string name="dumlock_restore_confirm">Oorspronkelijke bootimage herstellen?</string>
-		<string name="dumlock_restoring">Oorspronkelijke bootimage wordt hersteld...</string>
-		<string name="dumlock_restore_complete">Oorspronkelijke bootimage hersteld</string>
+		<string name="dumlock_restore_btn">Oorspronkelijk bootimage herstellen</string>
+		<string name="dumlock_restore_confirm">Oorspronkelijk bootimage herstellen?</string>
+		<string name="dumlock_restoring">Oorspronkelijk bootimage wordt hersteld...</string>
+		<string name="dumlock_restore_complete">Oorspronkelijk bootimage hersteld</string>
 		<string name="dumlock_reflash_btn">Recovery opnieuw flashen</string>
 		<string name="dumlock_reflash_confirm">Recovery opnieuw naar boot flashen?</string>
 		<string name="dumlock_reflashing">Recovery wordt naar boot geflasht...</string>
@@ -458,6 +454,8 @@
 		<string name="fm_set_perms_hdr">Machtigingen instellen</string>
 		<string name="fm_perms">Machtigingen:</string>
 		<string name="fm_complete">Bestandsbewerking voltooid</string>
+		<string name="fm_open_terminal_btn">Terminal hier openen</string>
+		<string name="fm_edit_file">Bestand bewerken</string>
 		<string name="decrypt_data_hdr">Data-partitie ontsleutelen</string>
 		<string name="decrypt_data_enter_pass">Wachtwoord invoeren.</string>
 		<string name="decrypt_data_failed">Wachtwoord mislukt. Probeer opnieuw!</string>
@@ -507,11 +505,23 @@
 		<string name="repack_image_hdr">Image selecteren</string>
 		<string name="fix_recovery_loop">Herstellen van oneindige lus tijdens opstarten recovery</string>
 		<string name="fix_recovery_loop_confirm">Herstellen van oneindige recoverylus?</string>
-		<string name="fixing_recovery_loop">Oneindige recoverylus wordt hersteld...</string>
-		<string name="fix_recovery_loop_complete">Herstellen van recoverylus voltooid</string>
+		<string name="fixing_recovery_loop">Oneindige recoverylus wordt doorbroken...</string>
+		<string name="fix_recovery_loop_complete">Oneindige lus opgelost</string>
 		<string name="fixing_recovery_loop_patch">Kernel wordt gepatcht...</string>
 		<string name="fix_recovery_loop_patch_error">Fout tijdens patchen kernel.</string>
-
+		<string name="decrypt_users">Gebruikers ontsleutelen</string>
+		<string name="decrypt_users_selection">Selecteer een gebruiker ID om te ontsleutelen</string>
+		<string name="select_user">Selecteer gebruiker</string>
+		<string name="backup_storage_undecrypt_warning">Back-up zonder sommige bestanden van gebruiker {1}: gebruiker niet ontsleuteld.</string>
+		<string name="decrypting_user_fbe">Ontsleutelen van FBE voor gebruiker {1}...</string>
+		<string name="decrypt_user_success_fbe">FBE gebruiker {1} ontsleuteld</string>
+		<string name="decrypt_user_fail_fbe">Ontsleuteling FBE gebruiker {1} mislukt</string>
+		<string name="decrypt_data_enter_pass_fbe">Voer wachtwoord in voor gebruiker [%tw_crypto_user_id%]</string>
+		<string name="decrypt_data_enter_pattern_fbe">Voer patroon in voor gebruiker [%tw_crypto_user_id%]</string>
+		<string name="multiuser_warning1">Niet alle gebruikers ontsleuteld!</string>
+		<string name="multiuser_warning2">Back-up/Herstelbewerkingen kunnen mislukken!</string>
+		<string name="multiuser_warning_accept">Toch doorgaan</string>
+		<string name="multiuser_warning_hdr">Multigebruiker Waarschuwing</string>
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Kernel ondersteunt het lezen van SELinux-contexten niet.</string>
 		<string name="full_selinux">Volledige SELinux-ondersteuning is aanwezig.</string>
@@ -574,7 +584,7 @@
 		<string name="unable_to_mount_storage">Kan opslag niet koppelen</string>
 		<string name="fail_decrypt">Ontsleutelen gegevens mislukt.</string>
 		<string name="no_crypto_support">Geen ondersteuning voor crypto aanwezig.</string>
-		<string name="decrypt_success_dev">Data ontsleuteld. Nieuw block device: {1}</string>
+		<string name="decrypt_success_dev">Data ontsleuteld. Nieuw blok-device: {1}</string>
 		<string name="decrypt_success_nodev">Data ontsleuteld</string>
 		<string name="done">Gereed.</string>
 		<string name="start_partition_sd">SD-kaart wordt gepartitioneerd...</string>
@@ -653,7 +663,7 @@
 		<string name="done_ors">Uitvoeren scriptbestand voltooid</string>
 		<string name="injecttwrp">TWRP wordt in het bootimage ingelast...</string>
 		<string name="zip_err">Fout bij het installeren van zipbestand '{1}'</string>
-		<string name="installing_zip">Zip-bestand '{1}' wordt geïnstalleerd</string>
+		<string name="installing_zip">Zipbestand '{1}' wordt geïnstalleerd</string>
 		<string name="select_backup_opt">Instellen van back-upopties:</string>
 		<string name="compression_on">Compressie staat aan</string>
 		<string name="digest_off" version="2">Het genereren van een digest staat uit</string>
@@ -663,7 +673,6 @@
 		<string name="recovery_commands_complete">Recoverycommando's voltooid</string>
 		<string name="running_ors">OpenRecoveryScript wordt uitgevoerd</string>
 		<string name="ors_complete">OpenRecoveryScript voltooid</string>
-		<string name="no_updater_binary">Kan '{1}' niet vinden in zipbestand.</string>
 		<string name="check_for_digest" version="2">Digestbestand wordt gecontroleerd...</string>
 		<string name="invalid_zip_format">Beschadigd zipbestand!</string>
 		<string name="fail_sysmap">Toewijzen van bestand '{1}' mislukt</string>
@@ -688,7 +697,7 @@
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">%llu van %llu bestanden, %i%%</string>
 		<string name="size_progress">%llu MB van %llu MB, %i%%</string>
-		<string name="decrypt_cmd">Er wordt geprobeerd de Data-partitie te ontsleutelen via de commandoregel.</string>
+		<string name="decrypt_cmd" version="2">Er wordt geprobeerd de Data-partitie te ontsleutelen via de commandoregel.</string>
 		<string name="base_pkg_err">Fout bij het laden van de basispakketten.</string>
 		<string name="simulating">Acties worden gesimuleerd...</string>
 		<string name="backup_cancel">Back-up geannuleerd</string>
@@ -712,7 +721,7 @@
 		<string name="theme_ver_err">Versie maatwerkthema past niet bij deze versie van TWRP. Standaardthema wordt gebruikt.</string>
 		<string name="up_a_level">(Niveau omhoog)</string>
 		<string name="install_reboot" version="2">Herstarten over %tw_sleep% seconden</string>
-		<string name="adbbackup_error">Fout bij ADB-back-up. Afgebroken..."</string>
+		<string name="adbbackup_error">Fout bij ADB-back-up. Afgebroken...&quot;</string>
 		<string name="adbbackup_control_error">Kan niet schrijven naar adb-beheerskanaal</string>
 		<string name="twrp_adbbu_option">--twrp optie vereist voor inschakelen twrp adb-backup</string>
 		<string name="partition_not_found">pad: {1} niet gevonden in partitielijst</string>
@@ -720,6 +729,29 @@
 		<string name="include_kernel_log">Kernellog bijvoegen</string>
 		<string name="sha2_chk">SHA2 gebruiken voor hashen</string>
 		<string name="unable_set_boot_slot">Fout tijdens aanpassen opstartslot bootloader in {1}</string>
-		<string name="backup_part_name">Partitie: %tw_partition%</string>
+		<string name="unmount_sys_install">Ontkoppel System vóór installatie zipbestand</string>
+		<string name="unmount_system">System wordt ontkoppeld...</string>
+		<string name="unmount_system_err">Ontkoppelen System mislukt</string>
+		<string name="flash_ab_inactive">A/B zipbestand wordt geflasht naar inactieve slot: {1}</string>
+		<string name="flash_ab_reboot">Om meer zipbestanden te flashen dient u eerst te herstarten in Recovery om naar de bijgewerkte slot te schakelen.</string>
+		<string name="flash_ab_both_slots">Beide slots flashen</string>
+		<string name="ozip_decrypt_decryption">Ozip-ontsleutelen...</string>
+		<string name="ozip_decrypt_finish">Ozip-ontsleutelen gereed!</string>
+		<string name="fbe_wipe_msg">WAARSCHUWING: {1} gewist. FBE-apparaat dient opgestart te worden in Android, niet Recovery, om initieel FBE-beleid in werking te zetten na het wissen.</string>
+		<string name="fastboot_button">Fastboot</string>
+		<string name="enable_adb">ADB inschakelen</string>
+		<string name="enable_fastboot">Fastboot inschakelen</string>
+		<string name="fastboot_console_msg">In Fastboot modus...</string>
+		<!-- Android Rescue Party trigger -->
+		<string name="rescue_party0">Android Rescue Party trigger! Mogelijke oplossingen? Of:</string>
+		<string name="rescue_party1"> 1. Cachemappen wissen, en/of</string>
+		<string name="rescue_party2"> 2. Data formatteren, en/of</string>
+		<string name="rescue_party3"> 3. Uw ROM schoon flashen.</string>
+		<string name="rescue_party4">Het gemelde probleem is: </string>
+		<string name="restore_system_context">Kan standaardcontext voor {1} niet achterhalen -- Android start mogelijk niet op.</string>
+		<string name="change_twrp_folder_btn">TWRP-map wijzigen</string>
+		<string name="change_twrp_folder_on_process">TWRP-map wordt gewijzigd</string>
+		<string name="change_twrp_folder_after_process">TWRP-map gewijzigd in</string>
+		<string name="tw_folder_exists">Er bestaat al een map met die naam!</string>
 	</resources>
 </language>

From 5f0845ceaeadbf5a694e9372ca1844e1ee274043 Mon Sep 17 00:00:00 2001
From: Ian Macdonald <ian@caliban.org>
Date: Sat, 6 Mar 2021 18:48:43 +0100
Subject: [PATCH 151/207] Fix ungrammatical sentence.

Change-Id: Id76269c81618adc966f63d80cb6a2da318a8d25c
(cherry picked from commit dc3da054d508df63b0f7cc81b5d9784c344e113a)
---
 gui/theme/common/languages/en.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index a6074fd5a3..1b1502c179 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -517,7 +517,7 @@
 		<string name="decrypt_users">Decrypt Users</string>
 		<string name="decrypt_users_selection">Select a user ID to decrypt</string>
 		<string name="select_user">Select User</string>
-		<string name="backup_storage_undecrypt_warning">Backup not include some files of user {1}, because the user is not decrypted.</string>
+		<string name="backup_storage_undecrypt_warning">Backup will not include some files of user {1}, because the user is not decrypted.</string>
 		<string name="decrypting_user_fbe">Attempting to decrypt FBE for user {1}...</string>
 		<string name="decrypt_user_success_fbe">User {1} Decrypted Successfully</string>
 		<string name="decrypt_user_fail_fbe">Failed to decrypt user {1}</string>

From 02b4f2f87c1b7aee9d14d76cf7272b5611e2983f Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sat, 6 Mar 2021 12:21:46 -0500
Subject: [PATCH 152/207] twrp release: 3.5.1_9

Change-Id: I13dfadea507d7050cec35d00d5cfabdf25462b15
---
 variables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.h b/variables.h
index 57b6485381..58adc9c68f 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.5.0_9"
+#define TW_MAIN_VERSION_STR       "3.5.1_9"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 #define TW_SETTINGS_FILE            ".twrps"
 #define TW_RECOVERY_NAME            "TWRP"

From 327684abbfa1c6eb5a3a1a22588b9ef9a9a234e8 Mon Sep 17 00:00:00 2001
From: epicX <souravgain605@gmail.com>
Date: Fri, 12 Mar 2021 18:14:23 +0530
Subject: [PATCH 153/207] Allow all extension while checking for digest
 verification

Change-Id: Ie17582f144e0a5b5a68e2c6d88c26cb9f5a29ee6
---
 gui/action.cpp       |  2 +-
 twinstall.cpp        | 12 +++++++-----
 twinstall.h          |  2 +-
 twrpDigestDriver.cpp |  6 +-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/gui/action.cpp b/gui/action.cpp
index 2ca21614dd..aa96072a7b 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -398,7 +398,7 @@ int GUIAction::flash_zip(std::string filename, int* wipe_cache)
 	if (simulate) {
 		simulate_progress_bar();
 	} else {
-		ret_val = TWinstall_zip(filename.c_str(), wipe_cache);
+		ret_val = TWinstall_zip(filename.c_str(), wipe_cache, (bool) DataManager::GetIntValue(TW_SKIP_DIGEST_CHECK_VAR));
 
 		// Now, check if we need to ensure TWRP remains installed...
 		struct stat st;
diff --git a/twinstall.cpp b/twinstall.cpp
index 427a9347af..8c3c957b69 100755
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -339,7 +339,7 @@ static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zi
 	return INSTALL_SUCCESS;
 }
 
-int TWinstall_zip(const char* path, int* wipe_cache) {
+int TWinstall_zip(const char* path, int* wipe_cache, bool check_for_digest) {
 	int ret_val, zip_verify = 1, unmount_system = 1;
 
 	if (strcmp(path, "error") == 0) {
@@ -352,11 +352,13 @@ int TWinstall_zip(const char* path, int* wipe_cache) {
 		string digest_str;
 		string Full_Filename = path;
 
-		gui_msg("check_for_digest=Checking for Digest file...");
+		if (check_for_digest) {
+			gui_msg("check_for_digest=Checking for Digest file...");
 
-		if (*path != '@' && !twrpDigestDriver::Check_File_Digest(Full_Filename)) {
-			LOGERR("Aborting zip install: Digest verification failed\n");
-			return INSTALL_CORRUPT;
+			if (*path != '@' && !twrpDigestDriver::Check_File_Digest(Full_Filename)) {
+				LOGERR("Aborting zip install: Digest verification failed\n");
+				return INSTALL_CORRUPT;
+			}
 		}
 	}
 
diff --git a/twinstall.h b/twinstall.h
index f60dd26ce0..406ab6fb93 100644
--- a/twinstall.h
+++ b/twinstall.h
@@ -1,6 +1,6 @@
 #ifndef RECOVERY_TWINSTALL_H_
 #define RECOVERY_TWINSTALL_H_
 
-int TWinstall_zip(const char* path, int* wipe_cache);
+int TWinstall_zip(const char* path, int* wipe_cache, bool check_for_digest = false);
 
 #endif  // RECOVERY_TWINSTALL_H_
diff --git a/twrpDigestDriver.cpp b/twrpDigestDriver.cpp
index 0ab94df39c..0f8eb63f4e 100755
--- a/twrpDigestDriver.cpp
+++ b/twrpDigestDriver.cpp
@@ -70,11 +70,7 @@ bool twrpDigestDriver::Check_File_Digest(const string& Filename) {
 
 	if (!TWFunc::Path_Exists(digestfile)) {
 		delete digest;
-		if (Filename.find(".zip") == std::string::npos && Filename.find(".apk") == std::string::npos && Filename.find(".map") == std::string::npos) {
-			gui_msg(Msg(msg::kError, "no_digest_found=No digest file found for '{1}'. Please unselect Enable Digest verification to restore.")(Filename));
-		} else {
-			return true;
-		}
+		gui_msg(Msg(msg::kError, "no_digest_found=No digest file found for '{1}'. Please unselect Enable Digest verification to restore.")(Filename));
 		return false;
 	}
 

From 050a22a861e0e35a1bea49a3db713848a7b62b8d Mon Sep 17 00:00:00 2001
From: megafon929 <yarikpopkov1@gmail.com>
Date: Thu, 18 Mar 2021 18:37:37 +0500
Subject: [PATCH 154/207] Updated Russian language

Change-Id: I0951175abdef591fe6b2089660ac822c2fbc9cce
---
 gui/theme/common/languages/ru.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index 6e46b5e515..2646ce9159 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -740,5 +740,13 @@
         <string name="flash_ab_reboot">Для прошивки дополнительных ZIP перезагрузите рекавери для переключения на обновлённый слот.</string>
 		<string name="ozip_decrypt_decryption">Начало расшифровки Ozip...</string>
 		<string name="ozip_decrypt_finish">Расшифровка Ozip завершена!</string>
+		<string name="change_twrp_folder_btn">Изменить папку TWRP</string>
+		<string name="change_twrp_folder_on_process">Изменение папки TWRP</string>
+		<string name="change_twrp_folder_after_process">Папка TWRP изменена на</string>
+		<string name="tw_folder_exists">Папка с таким именем уже существует!</string>
+		<string name="fm_open_terminal_btn">Открыть терминал здесь</string>
+		<string name="fm_edit_file">Изменить файл</string>
+		<string name="flash_ab_both_slots">Прошить на оба слота</string>
+		<string name="restore_system_context">Невозможно получить контекст по умолчанию для {1} -- Android может не загрузиться.</string>
 	</resources>
 </language>

From 40b7f7a109d6cda83c189ac739b0d5d508ab3643 Mon Sep 17 00:00:00 2001
From: epicX <souravgain605@gmail.com>
Date: Sat, 20 Mar 2021 21:58:17 +0530
Subject: [PATCH 155/207] Normalized digest check before installing zip

Change-Id: I5a3e82f103e7a80800be7790f1c8dc33c76413da
---
 data.cpp                          |  1 +
 gui/action.cpp                    |  2 +-
 gui/theme/common/landscape.xml    | 47 +++++++++++++++++++------------
 gui/theme/common/languages/en.xml |  1 +
 gui/theme/common/portrait.xml     | 47 +++++++++++++++++++------------
 gui/theme/common/watch.xml        | 47 +++++++++++++++++++------------
 gui/theme/landscape_hdpi/ui.xml   |  1 +
 gui/theme/landscape_mdpi/ui.xml   |  1 +
 gui/theme/portrait_hdpi/ui.xml    |  1 +
 gui/theme/portrait_mdpi/ui.xml    |  1 +
 gui/theme/watch_mdpi/ui.xml       |  1 +
 twrpDigestDriver.cpp              |  4 +--
 variables.h                       |  1 +
 13 files changed, 98 insertions(+), 57 deletions(-)

diff --git a/data.cpp b/data.cpp
index b05bc0463e..bfa7bc9dee 100755
--- a/data.cpp
+++ b/data.cpp
@@ -747,6 +747,7 @@ void DataManager::SetDefaultValues()
 	mPersist.SetValue(TW_GUI_SORT_ORDER, "1");
 	mPersist.SetValue(TW_RM_RF_VAR, "0");
 	mPersist.SetValue(TW_SKIP_DIGEST_CHECK_VAR, "0");
+	mPersist.SetValue(TW_SKIP_DIGEST_CHECK_ZIP_VAR, "1");
 	mPersist.SetValue(TW_SKIP_DIGEST_GENERATE_VAR, "0");
 	mPersist.SetValue(TW_SDEXT_SIZE, "0");
 	mPersist.SetValue(TW_SWAP_SIZE, "0");
diff --git a/gui/action.cpp b/gui/action.cpp
index aa96072a7b..c8ee34c099 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -398,7 +398,7 @@ int GUIAction::flash_zip(std::string filename, int* wipe_cache)
 	if (simulate) {
 		simulate_progress_bar();
 	} else {
-		ret_val = TWinstall_zip(filename.c_str(), wipe_cache, (bool) DataManager::GetIntValue(TW_SKIP_DIGEST_CHECK_VAR));
+		ret_val = TWinstall_zip(filename.c_str(), wipe_cache, (bool) !DataManager::GetIntValue(TW_SKIP_DIGEST_CHECK_ZIP_VAR));
 
 		// Now, check if we need to ensure TWRP remains installed...
 		struct stat st;
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 4be49ea4af..cdaf229cb8 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -175,6 +175,15 @@
 			<font resource="font_m" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%accent_color%"/>
 		</style>
 
+		<style name="options_listbox">
+			<highlight color="%fileselector_highlight_color%"/>
+			<fastscroll linecolor="%fileselector_linecolor%" rectcolor="%accent_color%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+			<separator color="%background_color%" height="%fileselector_separatorheight%"/>
+			<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%"/>
+			<background color="%background_color%"/>
+			<font resource="font_m" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%accent_color%"/>
+		</style>
+
 		<style name="slider">
 			<placement x="%col2_x_right%" y="%row17a_y%"/>
 			<font resource="font_m" color="%text_color%"/>
@@ -442,24 +451,23 @@
 				<text>{@options=Options:}</text>
 			</text>
 
-			<checkbox>
-				<placement x="%col1_x_right%" y="%row9_y%"/>
-				<text>{@zip_sig_chk=Zip signature verification}</text>
-				<data variable="tw_signed_zip_verify"/>
-			</checkbox>
-
-			<checkbox>
-				<condition var1="tw_has_injecttwrp" var2="1"/>
-				<placement x="%col1_x_right%" y="%row10a_y%"/>
-				<text>{@inject_twrp_chk=Inject TWRP after install}</text>
-				<data variable="tw_inject_after_zip"/>
-			</checkbox>
-
-			<checkbox>
-				<placement x="%col1_x_right%" y="%row12_y%"/>
-				<text>{@install_reboot_chk=Reboot after installation is complete}</text>
-				<data variable="tw_install_reboot"/>
-			</checkbox>
+			<listbox style="options_listbox">
+				<placement x="%col1_x_right%" y="%row9_y%" w="%content_half_width%" h="%listbox_options_height%"/>
+				<icon selected="checkbox_true" unselected="checkbox_false"/>
+				<listitem name="{@zip_sig_chk=Zip signature verification}">
+					<data variable="tw_signed_zip_verify"/>
+				</listitem>
+				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
+					<data variable="tw_skip_digest_check_zip"/>
+				</listitem>
+				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">
+					<data variable="tw_install_reboot"/>
+				</listitem>
+				<listitem name="{@inject_twrp_chk=Inject TWRP after install}">
+					<condition var1="tw_has_injecttwrp" var2="1"/>
+					<data variable="tw_inject_after_zip"/>
+				</listitem>
+			</listbox>
 
 			<button style="main_button_half_width">
 				<placement x="%col1_x_left%" y="%row15a_y%"/>
@@ -3055,6 +3063,9 @@
 				<listitem name="{@restore_enable_digest_chk=Enable Digest verification of backup files}">
 					<data variable="tw_skip_digest_check"/>
 				</listitem>
+				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
+					<data variable="tw_skip_digest_check_zip"/>
+				</listitem>
 				<listitem name="{@use24clock_chk=Use 24-hour clock}">
 					<data variable="tw_military_time"/>
 				</listitem>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 1b1502c179..74d35fab24 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -226,6 +226,7 @@
 		<string name="enable_backup_comp_chk">Enable compression</string>
 		<string name="skip_digest_backup_chk" version="2">Skip Digest generation during backup</string>
 		<string name="disable_backup_space_chk" version="2">Disable free space check before backup</string>
+		<string name="skip_digest_zip_chk">Skip Digest check before installing zip</string>
 		<string name="current_boot_slot">Current Slot: %tw_active_slot%</string>
 		<string name="boot_slot_a">Slot A</string>
 		<string name="boot_slot_b">Slot B</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 80ee07d13d..6c6ce47e47 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -146,6 +146,15 @@
 			<font resource="font_m" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%accent_color%"/>
 		</style>
 
+		<style name="options_listbox">
+			<highlight color="%fileselector_highlight_color%"/>
+			<fastscroll linecolor="%fileselector_linecolor%" rectcolor="%accent_color%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+			<separator color="%background_color%" height="%fileselector_separatorheight%"/>
+			<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%"/>
+			<background color="%background_color%"/>
+			<font resource="font_m" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%accent_color%"/>
+		</style>
+
 		<style name="slider">
 			<placement x="%center_x%" y="%row23_y%"/>
 			<font resource="font_s" color="%text_color%"/>
@@ -394,24 +403,23 @@
 				<text>%tw_file%</text>
 			</text>
 
-			<checkbox>
-				<placement x="%indent%" y="%row12_y%"/>
-				<text>{@zip_sig_chk=Zip signature verification}</text>
-				<data variable="tw_signed_zip_verify"/>
-			</checkbox>
-
-			<checkbox>
-				<placement x="%indent%" y="%row13a_y%"/>
-				<text>{@install_reboot_chk=Reboot after installation is complete}</text>
-				<data variable="tw_install_reboot"/>
-			</checkbox>
-
-			<checkbox>
-				<condition var1="tw_has_injecttwrp" var2="1"/>
-				<placement x="%indent%" y="%row15_y%"/>
-				<text>{@inject_twrp_chk=Inject TWRP after install}</text>
-				<data variable="tw_inject_after_zip"/>
-			</checkbox>
+			<listbox style="options_listbox">
+				<placement x="%indent%" y="%row12_y%" w="%content_width%" h="%listbox_options_height%"/>
+				<icon selected="checkbox_true" unselected="checkbox_false"/>
+				<listitem name="{@zip_sig_chk=Zip signature verification}">
+					<data variable="tw_signed_zip_verify"/>
+				</listitem>
+				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
+					<data variable="tw_skip_digest_check_zip"/>
+				</listitem>
+				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">
+					<data variable="tw_install_reboot"/>
+				</listitem>
+				<listitem name="{@inject_twrp_chk=Inject TWRP after install}">
+					<condition var1="tw_has_injecttwrp" var2="1"/>
+					<data variable="tw_inject_after_zip"/>
+				</listitem>
+			</listbox>
 
 			<button style="main_button_half_height">
 				<placement x="%indent%" y="%row18a_y%"/>
@@ -3226,6 +3234,9 @@
 				<listitem name="{@restore_enable_digest_chk=Enable Digest verification of backup files}">
 					<data variable="tw_skip_digest_check"/>
 				</listitem>
+				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
+					<data variable="tw_skip_digest_check_zip"/>
+				</listitem>
 				<listitem name="{@use24clock_chk=Use 24-hour clock}">
 					<data variable="tw_military_time"/>
 				</listitem>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 8b8fdd75b1..bb5951168b 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -176,6 +176,15 @@
 			<font resource="font_m" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%accent_color%"/>
 		</style>
 
+		<style name="options_listbox">
+			<highlight color="%fileselector_highlight_color%"/>
+			<fastscroll linecolor="%fileselector_linecolor%" rectcolor="%accent_color%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+			<separator color="%background_color%" height="%fileselector_separatorheight%"/>
+			<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%"/>
+			<background color="%background_color%"/>
+			<font resource="font_m" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%accent_color%"/>
+		</style>
+
 		<style name="slider">
 			<placement x="%center_x%" y="%slider_y%"/>
 			<font resource="font_l" color="%text_color%"/>
@@ -550,24 +559,23 @@
 				<text>{@install_zip_hdr=Install Zip} &gt; {@options_hdr=Options}</text>
 			</text>
 
-			<checkbox>
-				<placement x="%indent%" y="%row1_y%"/>
-				<text>{@zip_sig_chk=Zip file signature verification}</text>
-				<data variable="tw_signed_zip_verify"/>
-			</checkbox>
-
-			<checkbox>
-				<condition var1="tw_has_injecttwrp" var2="1"/>
-				<placement x="%indent%" y="%row2a_y%"/>
-				<text>{@inject_twrp_chk=Inject TWRP after install}</text>
-				<data variable="tw_inject_after_zip"/>
-			</checkbox>
-
-			<checkbox>
-				<placement x="%indent%" y="%row4_y%"/>
-				<text>{@install_reboot_chk=Reboot after installation is complete}</text>
-				<data variable="tw_install_reboot"/>
-			</checkbox>
+			<listbox style="options_listbox">
+				<placement x="%indent%" y="%row1_y%" w="%content_width%" h="%listbox_options_height%"/>
+				<icon selected="checkbox_true" unselected="checkbox_false"/>
+				<listitem name="{@zip_sig_chk=Zip signature verification}">
+					<data variable="tw_signed_zip_verify"/>
+				</listitem>
+				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
+					<data variable="tw_skip_digest_check_zip"/>
+				</listitem>
+				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">
+					<data variable="tw_install_reboot"/>
+				</listitem>
+				<listitem name="{@inject_twrp_chk=Inject TWRP after install}">
+					<condition var1="tw_has_injecttwrp" var2="1"/>
+					<data variable="tw_inject_after_zip"/>
+				</listitem>
+			</listbox>
 
 			<button>
 				<placement x="%col1_x_left%" y="%row11_y%"/>
@@ -3732,6 +3740,9 @@
 				<listitem name="{@restore_enable_digest_chk=Enable Digest verification of backup files}">
 					<data variable="tw_skip_digest_check"/>
 				</listitem>
+				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
+					<data variable="tw_skip_digest_check_zip"/>
+				</listitem>
 				<listitem name="{@use24clock_chk=Use 24-hour clock}">
 					<data variable="tw_military_time"/>
 				</listitem>
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index 5357f5bf70..172788715a 100755
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -198,6 +198,7 @@
 		<variable name="partitionlist_backup_height" value="528"/>
 		<variable name="listbox_timezone_height" value="768"/>
 		<variable name="listbox_settings_height" value="648"/>
+		<variable name="listbox_options_height" value="304"/>
 		<variable name="fastscroll_w" value="18"/>
 		<variable name="fastscroll_linew" value="2"/>
 		<variable name="fastscroll_rectw" value="18"/>
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index 3a4126258c..b1b6dac890 100755
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -198,6 +198,7 @@
 		<variable name="partitionlist_backup_height" value="198"/>
 		<variable name="listbox_timezone_height" value="306"/>
 		<variable name="listbox_settings_height" value="243"/>
+		<variable name="listbox_options_height" value="110"/>
 		<variable name="fastscroll_w" value="7"/>
 		<variable name="fastscroll_linew" value="1"/>
 		<variable name="fastscroll_rectw" value="7"/>
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index abb1960c5a..95c227a56f 100644
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -203,6 +203,7 @@
 		<variable name="listbox_timezone_height" value="756"/>
 		<variable name="listbox_settings_height" value="960"/>
 		<variable name="listbox_advanced_height" value="700"/>
+		<variable name="listbox_options_height" value="384"/>
 		<variable name="fastscroll_w" value="24"/>
 		<variable name="fastscroll_linew" value="2"/>
 		<variable name="fastscroll_rectw" value="24"/>
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index 3de99ceea2..c2cbd44d2a 100755
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -203,6 +203,7 @@
 		<variable name="listbox_timezone_height" value="306"/>
 		<variable name="listbox_settings_height" value="400"/>
 		<variable name="listbox_advanced_height" value="290"/>
+		<variable name="listbox_options_height" value="160"/>
 		<variable name="fastscroll_w" value="10"/>
 		<variable name="fastscroll_linew" value="2"/>
 		<variable name="fastscroll_rectw" value="10"/>
diff --git a/gui/theme/watch_mdpi/ui.xml b/gui/theme/watch_mdpi/ui.xml
index 491de1c43c..2af1249d84 100644
--- a/gui/theme/watch_mdpi/ui.xml
+++ b/gui/theme/watch_mdpi/ui.xml
@@ -160,6 +160,7 @@
 		<variable name="partitionlist_wipe_height" value="160"/>
 		<variable name="listbox_timezone_height" value="248"/>
 		<variable name="listbox_settings_height" value="248"/>
+		<variable name="listbox_options_height" value="160"/>
 		<variable name="fastscroll_w" value="10"/>
 		<variable name="fastscroll_linew" value="1"/>
 		<variable name="fastscroll_rectw" value="10"/>
diff --git a/twrpDigestDriver.cpp b/twrpDigestDriver.cpp
index 0f8eb63f4e..af3141794c 100755
--- a/twrpDigestDriver.cpp
+++ b/twrpDigestDriver.cpp
@@ -70,8 +70,8 @@ bool twrpDigestDriver::Check_File_Digest(const string& Filename) {
 
 	if (!TWFunc::Path_Exists(digestfile)) {
 		delete digest;
-		gui_msg(Msg(msg::kError, "no_digest_found=No digest file found for '{1}'. Please unselect Enable Digest verification to restore.")(Filename));
-		return false;
+		gui_msg(Msg(msg::kWarning, "no_digest=Skipping Digest check: no Digest file found"));
+		return true;
 	}
 
 
diff --git a/variables.h b/variables.h
index 58adc9c68f..aba0cf2995 100644
--- a/variables.h
+++ b/variables.h
@@ -74,6 +74,7 @@
 #define TW_FORCE_DIGEST_CHECK_VAR   "tw_force_digest_check"
 #define TW_SKIP_DIGEST_CHECK_VAR    "tw_skip_digest_check"
 #define TW_SKIP_DIGEST_GENERATE_VAR "tw_skip_digest_generate"
+#define TW_SKIP_DIGEST_CHECK_ZIP_VAR    "tw_skip_digest_check_zip"
 #define TW_SIGNED_ZIP_VERIFY_VAR    "tw_signed_zip_verify"
 #define TW_INSTALL_REBOOT_VAR       "tw_install_reboot"
 #define TW_TIME_ZONE_VAR            "tw_time_zone"

From 2bc3eccd13069b5d463519ae344c907862eff60f Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sun, 4 Apr 2021 10:18:42 -0400
Subject: [PATCH 156/207] twrp release: 3.5.2 a9

Change-Id: I17430ee5f9cf73c7ac7f6a216eafc0ee50885661
---
 variables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.h b/variables.h
index aba0cf2995..a58484f88c 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.5.1_9"
+#define TW_MAIN_VERSION_STR       "3.5.2_9"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 #define TW_SETTINGS_FILE            ".twrps"
 #define TW_RECOVERY_NAME            "TWRP"

From 63e5a5f285a76a27b4037c48cf748f5b49d7fd89 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Wed, 7 Apr 2021 13:54:08 -0400
Subject: [PATCH 157/207] ext4crypt: add missing endlines for keymaster 4

Change-Id: I41422ee4a7e88116fe4977682c929fd4f959748b
---
 crypto/ext4crypt/Keymaster4.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/ext4crypt/Keymaster4.cpp b/crypto/ext4crypt/Keymaster4.cpp
index 6507bb1806..3a0ec5984e 100644
--- a/crypto/ext4crypt/Keymaster4.cpp
+++ b/crypto/ext4crypt/Keymaster4.cpp
@@ -158,11 +158,11 @@ km::ErrorCode Keymaster::exportKey(km::KeyFormat format, KeyBuffer& kmKey, const
     };
     auto error = mDevice->exportKey(format, kmKeyBlob, kmClientId, kmAppData, hidlCb);
     if (!error.isOk()) {
-        LOG(ERROR) << "export_key failed: " << error.description();
+        LOG(ERROR) << "export_key failed: " << error.description() << std::endl;
         return km::ErrorCode::UNKNOWN_ERROR;
     }
     if (km_error != km::ErrorCode::OK) {
-        LOG(ERROR) << "export_key failed, code " << int32_t(km_error);
+        LOG(ERROR) << "export_key failed, code " << int32_t(km_error) << std::endl;
         return km_error;
     }
     return km::ErrorCode::OK;
@@ -174,11 +174,11 @@ bool Keymaster::deleteKey(const std::string& key) {
     auto keyBlob = km::support::blob2hidlVec(key);
     auto error = mDevice->deleteKey(keyBlob);
     if (!error.isOk()) {
-        LOG(ERROR) << "delete_key failed: " << error.description();
+        LOG(ERROR) << "delete_key failed: " << error.description() << std::endl;
         return false;
     }
     if (error != km::ErrorCode::OK) {
-        LOG(ERROR) << "delete_key failed, code " << int32_t(km::ErrorCode(error));
+        LOG(ERROR) << "delete_key failed, code " << int32_t(km::ErrorCode(error)) << std::endl;
         return false;
     }
     return true;

From a5a124141f9af569d32cd5ef1c5b5a3b8c3cddce Mon Sep 17 00:00:00 2001
From: Xdisk <okyjellyone@gmail.com>
Date: Mon, 19 Apr 2021 19:55:54 -0400
Subject: [PATCH 158/207] languages: add indonesian language

Change-Id: I49732e59711cdc2ff0900cd8d3d7b1a0ea1d2011
(cherry picked from commit 1a7bc78a32c65f99fb8d40eb0fe8695f83c7e7b0)
---
 gui/theme/common/languages/id.xml | 763 ++++++++++++++++++++++++++++++
 1 file changed, 763 insertions(+)
 create mode 100755 gui/theme/common/languages/id.xml

diff --git a/gui/theme/common/languages/id.xml b/gui/theme/common/languages/id.xml
new file mode 100755
index 0000000000..d20697896d
--- /dev/null
+++ b/gui/theme/common/languages/id.xml
@@ -0,0 +1,763 @@
+<?xml version="1.0"?>
+
+<language>
+	<display>Indonesia</display>
+
+	<resources>
+		<!-- Penggantian font - hanya ubah ini jika bahasa Anda memerlukan karakter khusus -->
+		<resource name="font_l" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="100" />
+		<resource name="font_m" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="100" />
+		<resource name="font_s" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="100" />
+		<resource name="fixed" type="fontoverride" filename="DroidSansMono.ttf" scale="100" />
+
+		<!-- Nama tampilan partisi -->
+		<string name="system">Sistem</string>
+		<string name="system_image">Image Sistem</string>
+		<string name="vendor">Vendor</string>
+		<string name="vendor_image">Image Vendor</string>
+		<string name="boot">Boot</string>
+		<string name="recovery">Recovery</string>
+		<string name="cache">Cache</string>
+		<string name="data">Data</string>
+		<string name="data_backup">Data (excl. Penyimpanan)</string>
+		<string name="sdcard">Kartu SD</string>
+		<string name="internal">Penyimpanan Internal</string>
+		<string name="microsd">Micro SD</string>
+		<string name="usbotg">USB OTG</string>
+		<string name="android_secure">Keamanan Android</string>
+		<string name="dalvik">Dalvik / ART Cache</string>
+		<!-- Ini adalah partisi yang jarang digunakan pada Micro SD untuk sistem app2sd yang sangat lama -->
+		<string name="sdext">SD-EXT</string>
+		<string name="adopted_data">Data teradopsi</string>
+		<string name="adopted_storage">Penyimpanan teradopsi</string>
+		<string name="autostorage">Penyimpanan</string>
+
+		<!-- String XML GUI -->
+		<string name="twrp_header">Team Win Recovery Project</string>
+		<string name="twrp_watch_header">TWRP %tw_version%</string>
+		<string name="cpu_temp">CPU: %tw_cpu_temp% &#xB0;C</string>
+		<string name="battery_pct">Baterai: %tw_battery%</string>
+		<string name="sort_by_name">Urut Sesuai Nama</string>
+		<string name="sort_by_date">Urut Sesuai Tanggal</string>
+		<string name="sort_by_size">Urut Sesuai Ukuran</string>
+		<string name="sort_by_name_only">Nama</string>
+		<string name="sort_by_date_only">Tanggal</string>
+		<string name="sort_by_size_only">Ukuran</string>
+		<string name="tab_general">UMUM</string>
+		<string name="tab_options">PILIHAN</string>
+		<string name="tab_backup">CADANGAN</string>
+		<string name="tab_time_zone">ZONA WAKTU</string>
+		<string name="tab_screen">TAMPILAN</string>
+		<string name="tab_vibration">GETAR</string>
+		<string name="tab_language">BAHASA</string>
+
+		<string name="install_btn">Instalasi</string>
+		<string name="wipe_btn">Format</string>
+		<string name="backup_btn">Cadangkan</string>
+		<string name="restore_btn">Pulihkan</string>
+		<string name="mount_btn">Mount</string>
+		<string name="settings_btn">Pengaturan</string>
+		<string name="advanced_btn">Lainnya</string>
+		<string name="reboot_btn">Reboot</string>
+		<string name="files_btn">File</string>
+		<string name="copy_log_btn">Salin log</string>
+		<string name="select_type_hdr">Pilih jenis</string>
+		<string name="install_zip_hdr">Instal zip</string>
+		<string name="install_zip_btn">Instal zip</string>
+		<string name="install_image_hdr">Instal Image</string>
+		<string name="install_image_btn">Instal Image</string>
+		<string name="install_select_file_hdr">Pilih File</string>
+		<string name="file_selector_folders_hdr">Folder</string>
+		<string name="select_file_from_storage">Pilih dari %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
+		<string name="adb_sideload_btn">ADB Sideload</string>
+		<string name="install_hdr">Instal</string>
+		<string name="select_storage_hdr">Pilih Penyimpanan</string>
+		<string name="select_storage_btn">Pilih Penyimpanan</string>
+		<string name="queue_hdr">Antrian</string>
+		<string name="zip_queue_count">%tw_zip_queue_count% dari maks 10 antrian file</string>
+		<string name="zip_queue_count_s">File %tw_zip_queue_count% dari 10:</string>
+		<string name="zip_warn1">Jika program yang Anda instal tidak kompatibel</string>
+		<string name="zip_warn2">dapat menyebabkan perangkat tidak dapat digunakan.</string>
+		<string name="zip_back_cancel">Tekan tombol kembali untuk membatalkan.</string>
+		<string name="zip_back_clear">Tekan tombol kembali untuk hapus antrian.</string>
+		<string name="folder">Folder:</string>
+		<string name="file">File:</string>
+		<string name="zip_sig_chk">Verifikasi tanda tangan zip</string>
+		<string name="inject_twrp_chk">Suntikan TWRP setelah menginstal</string>
+		<string name="install_reboot_chk">Reboot setelah instalasi selesai</string>
+		<string name="options_hdr">Pilihan</string>
+		<string name="confirm_flash_hdr">Konfirmasi Flash</string>
+		<string name="zip_queue">Antrian:</string>
+		<string name="options">Pilihan:</string>
+		<string name="swipe_confirm">   Konfirmasi</string>
+		<string name="zip_add_btn">Tambah zip lainnya</string>
+		<string name="zip_clear_btn">Hapus antrian zip</string>
+		<string name="install_zip_count_hdr">Instal zip %tw_zip_index% dari %tw_zip_queue_count%</string>
+		<string name="installing_zip_xml">Menginstal Zip: %tw_file%</string>
+		<string name="failed">Gagal.</string>
+		<string name="successful">Berhasil.</string>
+		<string name="install_failed">Instalasi gagal.</string>
+		<string name="install_successful">Instalasi berhasil.</string>
+		<string name="wipe_cache_dalvik_btn">Hapus Cache/Dalvik</string>
+		<string name="wipe_dalvik_btn">Hapus Dalvik</string>
+		<string name="reboot_system_btn">Reboot Sistem</string>
+		<string name="install_sel_target">Pilih partisi tujuan</string>
+		<string name="flash_image_select">Pilih partisi untuk flash image:</string>
+		<string name="target_partition">Partisi tujuan:</string>
+		<string name="flashing_image">Memflash image...</string>
+		<string name="image_flashed">Flash image selesai.</string>
+		<string name="wipe_cache_dalvik_confirm">Hapus Cache &amp; Dalvik?</string>
+		<string name="wipe_dalvik_confirm">Hapus Dalvik?</string>
+		<string name="wiping_cache_dalvik">Menghapus Cache &amp; Dalvik...</string>
+		<string name="wipe_cache_dalvik_complete">Cache &amp; Dalvik berhasil dihapus.</string>
+		<string name="wipe_dalvik_complete">Dalvik berhasil dihapus.</string>
+		<string name="swipe_wipe">Geser untuk Hapus</string>
+		<string name="swipe_wipe_s">   Hapus</string>
+		<string name="no_os1">Tidak ada OS terinstal! Apakah Anda</string>
+		<string name="no_osrb">yakin untuk reboot?</string>
+		<string name="no_ospo">yakin untuk matikan perangkat?</string>
+		<string name="rebooting">Mereboot...</string>
+		<string name="swipe_reboot">Geser untuk Reboot</string>
+		<string name="swipe_reboot_s">   Reboot</string>
+		<string name="reboot_install_app_hdr">Instal aplikasi TWRP</string>
+		<string name="reboot_install_app1">Apakah Anda ingin memasang Aplikasi TWRP resmi?</string>
+		<string name="reboot_install_app2">Aplikasi dapat memeriksa versi TWRP terbaru.</string>
+		<string name="reboot_install_app_prompt_install">Instal aplikasi TWRP jika belum tersedia</string>
+		<string name="reboot_install_app_system">Instal sebagai aplikasi sistem</string>
+		<string name="reboot_installing_app">Menginstal aplikasi...</string>
+		<string name="swipe_to_install_app">Geser untuk Instal</string>
+		<string name="uninstall_twrp_system_app">Hapus aplikasi TWRP dari sistem</string>
+		<string name="uninstall_twrp_system_app_confirm">Hapus aplikasi TWRP dari sistem?</string>
+		<string name="uninstalling_twrp_system_app">Menghapus aplikasi TWRP dari sistem ...</string>
+		<string name="uninstall_twrp_system_app_complete">Aplikasi TWRP berhasil dihapus</string>
+		<string name="swipe_flash">Geser untuk Flash</string>
+		<string name="confirm_action">Konfirmasi Tindakan</string>
+		<string name="back_cancel">Tekan tombol kembali untuk membatalkan.</string>
+		<string name="cancel_btn">Batal</string>
+		<string name="wipe_hdr">Hapus</string>
+		<string name="factory_reset_hdr">Reset Pabrik</string>
+		<string name="factory_reset_btn">Reset Pabrik</string>
+		<string name="factory_reset1">Hapus Data, Cache, dan Dalvik</string>
+		<string name="factory_reset2">(tidak termasuk penyimpanan internal)</string>
+		<string name="factory_reset3">Ini adalah satu-satunya fitur format</string>
+		<string name="factory_reset4">yang paling Anda perlukan.</string>
+		<string name="factory_reset5">(tidak termasuk pengguna/layar kunci)</string>
+		<string name="factory_resetting">Mereset Pabrik...</string>
+		<string name="advanced_wipe_hdr">Hapus Lainnya</string>
+		<string name="advanced_wipe_btn">Hapus Lainnya</string>
+		<string name="wipe_enc_confirm">Hapus enkripsi dari data?</string>
+		<string name="formatting_data">Memformat Data...</string>
+		<string name="swipe_format_data">Geser untuk Format</string>
+		<string name="swipe_format_data_s">   Format Data</string>
+		<string name="factory_reset_complete">Reset pabrik selesai.</string>
+		<string name="sel_part_hdr">Pilih partisi</string>
+		<string name="wipe_sel_confirm">Hapus partisi terpilih(s)?</string>
+		<string name="wiping_part">Menghapus partisi(s)...</string>
+		<string name="wipe_complete">Berhasil dihapus.</string>
+		<string name="sel_part_wipe">Hapus partisi:</string>
+		<string name="invalid_part_sel">Partisi yang dipilih tidak valid</string>
+		<string name="format_data_hdr">Format Data</string>
+		<string name="format_data_btn">Format Data</string>
+		<string name="format_data_ptr1">Format Data akan menghapus semua aplikasi,</string>
+		<string name="format_data_ptr2">cadangan, gambar, video, media, dan</string>
+		<string name="format_data_ptr3">menghapus enkripsi pada penyimpanan internal Anda.</string>
+		<string name="format_data_adopted">Tidak termasuk penyimpanan teradopsi</string>
+		<string name="format_data_lcp1">Format Data akan menghapus semua aplikasi, cadangan, gambar, video, media, dan</string>
+		<string name="format_data_lcp2">menghapus enkripsi pada penyimpanan internal Anda.</string>
+		<string name="format_data_wtc1">Format Data akan menghapus semua aplikasi,</string>
+		<string name="format_data_wtc2">cadangan dan media. Ini tidak dapat dibatalkan.</string>
+		<string name="format_data_undo">Ini tidak dapat dibatalkan.</string>
+		<string name="format_data_complete">Format data berhasil.</string>
+		<!-- Catatan Terjemahan: kata "yes" harus tetap Inggris! -->
+		<string name="yes_continue">Ketik "yes" untuk melanjutkan.</string>
+		<string name="part_opt_hdr">Pilihan partisi untuk: %tw_partition_name%</string>
+		<string name="sel_act_hdr">Pilih Tindakan</string>
+		<string name="file_sys_opt">Pilihan File Sistem</string>
+		<string name="partition">Partisi: %tw_partition_name%</string>
+		<string name="part_mount_point">Titik Mount: %tw_partition_mount_point%</string>
+		<string name="part_curr_fs">File sistem: %tw_partition_file_system%</string>
+		<string name="part_present_yes">Ditampilkan: Ya</string>
+		<string name="part_present_no">Ditampilkan: Tidak</string>
+		<string name="part_removable_yes">Dapat Dilepas: Yes</string>
+		<string name="part_removable_no">Dapat Dilepas: Tidak</string>
+		<string name="part_size">Ukuran: %tw_partition_size%MB</string>
+		<string name="part_used">Terpakai: %tw_partition_used%MB</string>
+		<string name="part_free">Tersedia: %tw_partition_free%MB</string>
+		<string name="part_backup_size">Ukuran cadangan: %tw_partition_backup_size%MB</string>
+		<string name="resize_btn">Ubah Ukuran File</string>
+		<string name="resize_btn_s">Ubah Ukuran</string>
+		<string name="resize_confirm">Ubah ukuran %tw_partition_name%?</string>
+		<string name="resizing">Mengubah ukuran...</string>
+		<string name="resize_complete">Ubah ukuran selesai.</string>
+		<string name="swipe_resize">Geser untuk Ubah</string>
+		<string name="swipe_resize_s">   Ubah Ukuran</string>
+		<string name="repair_btn">Perbaiki File Sistem</string>
+		<string name="repair_btn_s">Perbaiki</string>
+		<string name="repair_confirm">Perbaiki %tw_partition_name%?</string>
+		<string name="repairing">Memperbaiki...</string>
+		<string name="repair_complete">Berhasil Memperbaiki</string>
+		<string name="swipe_repair">Geser untuk Perbaiki</string>
+		<string name="swipe_repair_s">   Perbaiki</string>
+		<string name="change_fs_btn">Ubah File Sistem</string>
+		<string name="change_fs_btn_s">Ubah</string>
+		<string name="change_fs_for_hdr">Ubah file sistem untuk: %tw_partition_name%</string>
+		<string name="change_fs_for_hdr_s">Partisi: %tw_partition_name% &gt; Pilih file sistem</string>
+		<string name="change_fs_warn1">Beberapa ROM atau Kernel mungkin tidak</string>
+		<string name="change_fs_warn2">mendukung file sistem. Lakukan dengan hati-hati!</string>
+		<string name="change_fs_confirm">Ubah %tw_partition_name%?</string>
+		<string name="formatting">Memformat...</string>
+		<string name="format_complete">Format berhasil.</string>
+		<string name="swipe_change_fs">Geser untuk Mengubah</string>
+		<string name="swipe_change_s">   Ubah</string>
+		<string name="back_btn">Kembali</string>
+		<string name="wipe_enc_btn">Hapus enkripsi</string>
+		<string name="swipe_factory_reset">Geser untuk Reset Pabrik</string>
+		<string name="repair_change_btn">Perbaiki atau ubah file sistem</string>
+		<string name="storage_hdr">Penyimpanan: %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
+		<string name="backup_hdr">Cadangan</string>
+		<string name="backup_confirm_hdr">Konfirmasi pencadangan</string>
+		<string name="encryption_tab">ENKRIPSI</string>
+		<string name="encryption">Enkripsi:</string>
+		<string name="name">Nama:</string>
+		<string name="sel_part_backup">Pilih partisi untuk dicadangkan:</string>
+		<string name="storage">Penyimpanan:</string>
+		<string name="enc_disabled">nonaktif - atur sandi untuk mengaktifkan</string>
+		<string name="enc_enabled">aktif</string>
+		<string name="enable_backup_comp_chk">Aktifkan kompresi</string>
+		<string name="skip_digest_backup_chk" version="2">Lewati pembuatan digest selama mencadangkan</string>
+		<string name="disable_backup_space_chk" version="2">Matikan cek sisa ruang sebelum mencadangkan</string>
+		<string name="skip_digest_zip_chk">Lewati pemeriksa digest sebelum menginstal zip</string>
+		<string name="current_boot_slot">Slot Saat Ini: %tw_active_slot%</string>
+		<string name="boot_slot_a">Slot A</string>
+		<string name="boot_slot_b">Slot B</string>
+		<string name="changing_boot_slot">Mengubah slot boot</string>
+		<string name="changing_boot_slot_complete">Mengubah slot boot selesai.</string>
+		<string name="refresh_sizes_btn">Refresh Ukuran</string>
+		<string name="swipe_backup">Geser untuk Cadangkan</string>
+		<string name="append_date_btn">Lampirkan Tanggal</string>
+		<string name="backup_name_exists">Nama cadangan sudah ada!</string>
+		<string name="encrypt_backup">Enkripsi cadangan Anda?</string>
+		<string name="enter_pass">Masukkan Sandi:</string>
+		<string name="enter_pass2">Masukkan Sandi Lagi:</string>
+		<string name="pass_not_match">Sandi tidak cocok!</string>
+		<string name="partitions">Partisi:</string>
+		<string name="disabled">Nonaktif</string>
+		<string name="enabled">Aktif</string>
+		<string name="backup_name_hdr">Atur nama cadangan</string>
+		<string name="progress">Memproses:</string>
+		<string name="backup_complete">Pencadangan berhasil.</string>
+		<string name="restore_hdr">Pulihkan</string>
+		<string name="sel_backup_hdr">Pulihkan Cadangan</string>
+		<string name="restore_sel_store_hdr">Pilih dari %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
+		<string name="restore_sel_pack_fs">Pilih paket untuk dipulihkan:</string>
+		<string name="restore_enc_backup_hdr">Cadangan terenkripsi</string>
+		<string name="restore_dec_fail">Sandi salah, coba lagi!</string>
+		<string name="del_backup_btn">Hapus Cadangan</string>
+		<string name="del_backup_confirm">Hapus cadangan?</string>
+		<string name="del_backup_confirm2">Ini tidak dapat dibatalkan!</string>
+		<string name="deleting_backup">Menghapus cadangan...</string>
+		<string name="backup_deleted">Cadangan berhasil dihapus.</string>
+		<string name="swipe_delete">Geser untuk Hapus</string>
+		<string name="swipe_delete_s">   Hapus</string>
+		<string name="restore_try_decrypt">Cadangan terenkripsi - Mencoba mendeskripsikan</string>
+		<string name="restore_try_decrypt_s">Mencoba mendeskripsikan</string>
+		<string name="restore_backup_date">Cadangan dibuat pada %tw_restore_file_date%</string>
+		<string name="restore_sel_part">Pilih partisi untuk dipulihkan:</string>
+		<string name="restore_enable_digest_chk" version="2">Aktifkan verifikasi digest pada file cadangan</string>
+		<string name="restore_complete">Pemulihan selesai.</string>
+		<string name="swipe_restore">Geser untuk Memulihkan</string>
+		<string name="swipe_restore_s">   Pulihkan</string>
+		<string name="rename_backup_hdr">Ubah nama cadangan</string>
+		<string name="rename_backup_confirm">Ubah nama cadangan?</string>
+		<string name="rename_backup_confirm2">Ini tidak dapat dibatalkan!</string>
+		<string name="renaming_backup">Mengubah nama cadangan...</string>
+		<string name="rename_backup_complete">Nama cadangan berhasil diubah.</string>
+		<string name="swipe_to_rename">Geser untuk Ubah Nama</string>
+		<string name="swipe_rename">   Ubah Nama</string>
+		<string name="confirm_hdr">Konfirmasi</string>
+		<string name="mount_hdr">Mount</string>
+		<string name="mount_sel_part">Pilih partisi untuk mount:</string>
+		<string name="mount_sys_ro_chk">Mount partisi sistem baca-saja</string>
+		<string name="mount_sys_ro_s_chk">Mount sistem RO</string>
+		<string name="decrypt_data_btn">Deskripsi data</string>
+		<string name="disable_mtp_btn">Nonaktifkan MTP</string>
+		<string name="enable_mtp_btn">Aktifkan MTP</string>
+		<string name="mount_usb_storage_btn">Mount USB</string>
+		<string name="usb_storage_hdr">Penyimpanan USB</string>
+		<string name="usb_stor_mnt1">Penyimpanan USB terpasang</string>
+		<string name="usb_stor_mnt2">Hati-hati saat melepaskan</string>
+		<string name="usb_stor_mnt3">perangkat dari komputer Anda!</string>
+		<string name="unmount_btn">Dilepas</string>
+		<string name="rb_system_btn">Sistem</string>
+		<string name="rb_poweroff_btn">Matikan Perangkat</string>
+		<string name="rb_recovery_btn">Recovery</string>
+		<string name="rb_bootloader_btn">Bootloader</string>
+		<string name="rb_download_btn">Download</string>
+		<string name="rb_edl_btn">Edl</string>
+		<string name="turning_off">Mematikan...</string>
+		<string name="swipe_power_off">Geser untuk Matikan</string>
+		<string name="swipe_power_off_s">Matikan Perangkat</string>
+		<string name="sys_ro_hdr">Partisi sistem tidak dimodifikasi</string>
+		<string name="sys_ro_keep">Tetapkan sistem Baca-Saja?</string>
+		<string name="sys_rop1">TWRP dapat membiarkan partisi sistem tidak dimodifikasi</string>
+		<string name="sys_rop2">untuk memudahkan Anda melakukan pembaruan resmi.</string>
+		<string name="sys_rop3">TWRP tidak dapat mencegah stok ROM mengubah TWRP dan</string>
+		<string name="sys_rop4">tidak akan menawarkan untuk melakukan root pada perangkat Anda.</string>
+		<string name="sys_rop5">Menginstal zip atau menjalankan operasi adb</string>
+		<string name="sys_rop6">akan selalu mengubah partisi sistem.</string>
+		<string name="sys_rol1">TWRP dapat membiarkan partisi sistem Anda tidak dimodifikasi untuk memudahkan Anda melakukan pembaruan resmi.</string>
+		<string name="sys_rol2">TWRP tidak dapat mencegah stok ROM mengubah TWRP dan tidak akan menawarkan untuk melakukan root pada perangkat Anda.</string>
+		<string name="sys_rol3">Menginstal zip atau menjalankan operasi adb akan selalu mengubah partisi sistem.</string>
+		<string name="sys_ro_never_show_chk">Jangan pernah tampilkan ini lagi saat boot</string>
+		<string name="sys_ro_keep_ro_btn">Tetap Baca Saja</string>
+		<string name="swipe_allow_mod">Geser untuk Izinkan</string>
+		<string name="swipe_allow_mod_s">Izinkan modifikasi</string>
+		<string name="settings_hdr">Pengaturan</string>
+		<string name="settings_gen_hdr">Umum</string>
+		<string name="settings_gen_s_hdr">Umum</string>
+		<string name="settings_gen_btn">Umum</string>
+		<string name="use_rmrf_chk">Gunakan rm -rf sebagai ganti pemformatan</string>
+		<string name="use24clock_chk">Gunakan format waktu 24 jam</string>
+		<string name="rev_navbar_chk">Tukar tata letak tombol navigasi</string>
+		<string name="simact_chk">Simulasikan tindakan untuk pengujian tema</string>
+		<string name="simfail_chk">Simulasikan kegagalan untuk tindakan</string>
+		<string name="ctr_navbar_rdo">Tombol navigasi tengah</string>
+		<string name="lft_navbar_rdo">Tombol navigasi rata kiri</string>
+		<string name="rht_navbar_rdo">Tombol navigasi rata kanan</string>
+		<string name="restore_defaults_btn">Reset</string>
+		<string name="settings_tz_btn">Zona Waktu</string>
+		<string name="settings_screen_btn">Tampilan</string>
+		<string name="settings_screen_bright_btn">Kecerahan</string>
+		<string name="vibration_disabled">Getar di nonaktifkan pada perangkat ini</string>
+		<string name="settings_vibration_btn">Getar</string>
+		<string name="settings_language_btn">Bahasa</string>
+		<string name="time_zone_hdr">Zona Waktu</string>
+		<string name="sel_tz_list">Pilih zona waktu:</string>
+		<!-- Catatan terjemahan: jangan ragu untuk mengubah lokasi yang terdaftar atau menghapus lokasi seluruhnya dan sebut saja UTC -6 -->
+		<string name="utcm11">(UTC -11) Samoa, Midway Island</string>
+		<string name="utcm10">(UTC -10) Hawaii</string>
+		<string name="utcm9">(UTC -9) Alaska</string>
+		<string name="utcm8">(UTC -8) Waktu Pasifik</string>
+		<string name="utcm7">(UTC -7) Waktu Pegunungan</string>
+		<string name="utcm6">(UTC -6) Waktu Tengah</string>
+		<string name="utcm5">(UTC -5) Waktu Timur</string>
+		<string name="utcm4">(UTC -4) Waktu Atlantik</string>
+		<string name="utcm3">(UTC -3) Brazil, Buenos Aires</string>
+		<string name="utcm2">(UTC -2) Atlantik-Tengah</string>
+		<string name="utcm1">(UTC -1) Azores, Cape Verde</string>
+		<string name="utc0">(UTC  0) London, Dublin, Lisbon</string>
+		<string name="utcp1">(UTC +1) Berlin, Brussels, Paris</string>
+		<string name="utcp2">(UTC +2) Athens, Istanbul, South Africa</string>
+		<string name="utcp3">(UTC +3) Moscow, Baghdad</string>
+		<string name="utcp4">(UTC +4) Abu Dhabi, Tbilisi, Muscat</string>
+		<string name="utcp5">(UTC +5) Yekaterinburg, Islamabad</string>
+		<string name="utcp6">(UTC +6) Almaty, Dhaka, Colombo</string>
+		<string name="utcp7">(UTC +7) Bangkok, Hanoi, Jakarta</string>
+		<string name="utcp8">(UTC +8) Beijing, Singapore, Hong Kong</string>
+		<string name="utcp9">(UTC +9) Tokyo, Seoul, Yakutsk</string>
+		<string name="utcp10">(UTC +10) Australia Timur, Guam</string>
+		<string name="utcp11">(UTC +11) Vladivostok, Solomon Islands</string>
+		<string name="utcp12">(UTC +12) Auckland, Wellington, Fiji</string>
+		<string name="sel_tz_offset">Pilih Penyeimbang (biasanya 0): %tw_time_zone_guioffset%</string>
+		<string name="tz_offset_none">Tidak ada</string>
+		<string name="tz_offset_0">0</string>
+		<string name="tz_offset_15">15</string>
+		<string name="tz_offset_30">30</string>
+		<string name="tz_offset_45">45</string>
+		<string name="use_dst_chk">Gunakan waktu musim panas (DST)</string>
+		<string name="curr_tz">Zona waktu saat ini: %tw_time_zone%</string>
+		<string name="curr_tz_s">Zona waktu saat Ini:</string>
+		<string name="set_tz_btn">Atur zona waktu</string>
+		<string name="settings_screen_hdr">Layar</string>
+		<string name="settings_screen_timeout_hdr">Waktu Redup Layar</string>
+		<string name="enable_timeout_chk">Aktifkan Waktu Redup Layar</string>
+		<string name="screen_to_slider">Layar redup dalam (detik):</string>
+		<string name="screen_to_slider_s">Layar redup dalam detik (0=disabled): %tw_screen_timeout_secs%</string>
+		<string name="screen_to_na">Pengaturan waktu redup layar tidak tersedia</string>
+		<string name="screen_bright_slider">Kecerahan: %tw_brightness_pct%%</string>
+		<string name="screen_bright_na">Pengaturan kecerahan tidak tersedia</string>
+		<string name="vibration_hdr">Getar</string>
+		<string name="button_vibration_hdr">Getaran tombol</string>
+		<string name="kb_vibration_hdr">Getaran papan ketik</string>
+		<string name="act_vibration_hdr">Getaran ketika disentuh</string>
+		<string name="button_vibration">Getaran tombol:</string>
+		<string name="kb_vibration">Getaran papan ketik:</string>
+		<string name="act_vibration">Getaran ketika disentuh:</string>
+		<string name="select_language">Pilih Bahasa:</string>
+		<string name="sel_lang_btn">Pilih Bahasa</string>
+		<string name="set_language_btn">Atur Bahasa</string>
+		<string name="advanced_hdr">Lainnya</string>
+		<string name="copy_log_confirm">Salin log ke kartu SD?</string>
+		<string name="copying_log" version="2">Menyalin log ke kartu SD...</string>
+		<string name="copy_log_complete" version="2">Log Berhasil disalin.</string>
+		<string name="fix_context_btn">Perbaiki Konteks</string>
+		<string name="part_sd_btn">Partisi Kartu SD</string>
+		<string name="part_sd_s_btn">Kartu SD</string>
+		<string name="file_manager_btn">File Manager</string>
+		<string name="language_hdr">Bahasa</string>
+		<string name="terminal_btn">Terminal</string>
+		<string name="reload_theme_btn">Reset Tema</string>
+		<string name="dumlock_btn">HTC Dumlock</string>
+		<string name="inject_twrp_btn">Suntik TWRP</string>
+		<string name="inject_twrp_confirm">Suntik ulang TWRP?</string>
+		<string name="injecting_twrp">Menyuntik ulang TWRP...</string>
+		<string name="inject_twrp_complete">Menyuntik TWRP Selesai</string>
+		<string name="swipe_to_confirm">Geser untuk Konfirmasi</string>
+		<string name="part_sd_hdr">Partisi Kartu SD</string>
+		<string name="invalid_partsd_sel">Anda harus memilih perangkat yang dapat dilepas</string>
+		<string name="part_sd_lose">Anda akan kehilangan semua file pada Kartu SD!</string>
+		<string name="part_sd_undo">Tindakan ini tidak dapat dibatalkan!</string>
+		<string name="part_sd_ext_sz">Ukuran EXT:</string>
+		<string name="part_sd_swap_sz">Ukuran Swap:</string>
+		<string name="part_sd_m">-</string>
+		<string name="part_sd_p">+</string>
+		<string name="file_system">File Sistem:</string>
+		<string name="swipe_part_sd">Geser untuk Mempartisi</string>
+		<string name="swipe_part_sd_s">Partisi</string>
+		<string name="partitioning_sd">Mempartisi kartu SD...</string>
+		<string name="partitioning_sd2">Ini membutuhkan waktu beberapa menit.</string>
+		<string name="part_sd_complete">Mempartisi selesai.</string>
+		<string name="dumlock_hdr">HTC Dumlock</string>
+		<string name="dumlock_restore_btn">Pulihkan boot original</string>
+		<string name="dumlock_restore_confirm">Pulihkan image boot original?</string>
+		<string name="dumlock_restoring">Memulihkan boot original...</string>
+		<string name="dumlock_restore_complete">Memulihkan boot original selesai</string>
+		<string name="dumlock_reflash_btn">Flash ulang recovery</string>
+		<string name="dumlock_reflash_confirm">Flash ulang recovery ke boot?</string>
+		<string name="dumlock_reflashing">Memflash recovery ke boot...</string>
+		<string name="dumlock_reflash_complete">Flash recovery ke boot selesai.</string>
+		<string name="dumlock_install_btn">Instal HTC Dumlock</string>
+		<string name="dumlock_install_confirm">Instal file HTC dumlock ke ROM?</string>
+		<string name="dumlock_installing">Menginstal HTC Dumlock...</string>
+		<string name="dumlock_install_complete">Instal HTC Dumlock selesai.</string>
+		<string name="swipe_to_unlock">Geser untuk Membuka</string>
+		<string name="swipe_unlock">   Buka</string>
+		<string name="fm_hdr">File Manager</string>
+		<string name="fm_sel_file">Pilih File atau Folder</string>
+		<string name="fm_type_folder">Folder</string>
+		<string name="fm_type_file">File</string>
+		<string name="fm_choose_act">Pilih Tindakan</string>
+		<string name="fm_selected">%tw_fm_type% dipilih:</string>
+		<string name="fm_copy_btn">Salin</string>
+		<string name="fm_copy_file_btn">Salin File</string>
+		<string name="fm_copy_folder_btn">Salin Folder</string>
+		<string name="fm_copying">Salin</string>
+		<string name="fm_move_btn">Pindah</string>
+		<string name="fm_moving">Pindahkan</string>
+		<string name="fm_chmod755_btn">chmod 755</string>
+		<string name="fm_chmod755ing">chmod 755</string>
+		<string name="fm_chmod_btn">chmod</string>
+		<string name="fm_delete_btn">Hapus</string>
+		<string name="fm_deleting">Menghapus</string>
+		<string name="fm_rename_btn">Ubah Nama</string>
+		<string name="fm_rename_file_btn">Ubah Nama File</string>
+		<string name="fm_rename_folder_btn">Ubah Nama Folder</string>
+		<string name="fm_renaming">Mengubah Nama</string>
+		<string name="fm_sel_dest">Pilih Folder Tujuan</string>
+		<string name="fm_sel_curr_folder">Pilih folder tujuan</string>
+		<string name="fm_rename_hdr">Ubah Nama</string>
+		<string name="fm_set_perms_hdr">Atur perizinan</string>
+		<string name="fm_perms">Perizinan:</string>
+		<string name="fm_complete">Operasi Berhasil</string>
+		<string name="fm_open_terminal_btn">Buka terminal disini</string>
+		<string name="fm_edit_file">Ubah File</string>
+		<string name="decrypt_data_hdr">Deskripsi Data</string>
+		<string name="decrypt_data_enter_pass">Masukkan sandi.</string>
+		<string name="decrypt_data_failed">Sandi salah, coba lagi!</string>
+		<string name="decrypt_data_failed_pattern">Pola salah, coba lagi!</string>
+		<string name="decrypt_data_enter_pattern">Masukkan pola.</string>
+		<string name="decrypt_data_trying">Mencoba mendeskripsikan</string>
+		<string name="decrypt_data_vold_os_missing">File yang hilang diperlukan untuk deskripsi vold: {1}</string>
+		<string name="term_hdr">Perintah terminal</string>
+		<string name="term_s_hdr">Terminal</string>
+		<string name="term_kill_btn">MATIKAN</string>
+		<string name="term_sel_folder_hdr">Telusuri ke folder awal</string>
+		<string name="adb_sideload_hdr">ADB Sideload</string>
+		<string name="sideload_wipe_dalvik_chk">Hapus Dalvik Cache</string>
+		<string name="sideload_wipe_cache_chk">Hapus Cache</string>
+		<string name="swipe_to_sideload">Geser untuk Mulai Sideload</string>
+		<string name="swipe_sideload">   Mulai</string>
+		<string name="sideload_confirm">ADB Sideload</string>
+		<string name="sideload_usage">Terpakai: adb sideload filename.zip</string>
+		<string name="sideload_complete">ADB Sideload Selesai</string>
+		<string name="fix_contexts_hdr">Perbaiki Konteks</string>
+		<string name="fix_contexts_note1">Peringatan: Memperbaiki konteks sangat jarang diperlukan.</string>
+		<string name="fix_contexts_note2">Memperbaiki konteks SELinux dapat menyebabkannya</string>
+		<string name="fix_contexts_note3">perangkat tidak dapat boot dengan benar.</string>
+		<string name="swipe_to_fix_contexts">Geser untuk Perbaiki</string>
+		<string name="swipe_fix_contexts">   Perbaiki Konteks</string>
+		<string name="fixing_contexts">Memperbaiki Konteks...</string>
+		<string name="fix_contexts_complete">Perbaiki konteks selesai.</string>
+		<string name="reboot_hdr">Reboot</string>
+		<string name="install_cancel">Jangan Instal</string>
+		<string name="sel_storage_list">Pilih Penyimpanan</string>
+		<string name="ok_btn">OK</string>
+		<string name="install_twrp_ramdisk">Instal recovery ramdisk</string>
+		<string name="install_kernel">Instal kernel</string>
+		<string name="repack_kernel_confirm_hdr">Instal kernel</string>
+		<string name="repack_ramdisk_confirm_hdr">Instal recovery</string>
+		<string name="repack_kernel_confirm">Instal kernel?</string>
+		<string name="repack_ramdisk_confirm">Instal recovery?</string>
+		<string name="repack_backup_first">Buat cadangan Image yang ada terlebih dahulu</string>
+		<string name="repack">Kemas ulang</string>
+		<string name="swipe_to_install">Geser untuk Instal</string>
+		<string name="installing">Menginstal...</string>
+		<string name="install_complete">Instal selesai.</string>
+		<string name="unpack_error">Kesalahan membongkar image.</string>
+		<string name="repack_error">Kesalahan mengemas image.</string>
+		<string name="unpacking_image">Membongkar {1}...</string>
+		<string name="repacking_image">Mengemas {1}...</string>
+		<string name="repack_image_hdr">Pilih Image</string>
+		<string name="fix_recovery_loop">Perbaiki recovery bootloop</string>
+		<string name="fix_recovery_loop_confirm">Perbaiki recovery bootloop?</string>
+		<string name="fixing_recovery_loop">Memperbaiki recovery bootloop...</string>
+		<string name="fix_recovery_loop_complete">Perbaiki recovery bootloop selesai.</string>
+		<string name="fixing_recovery_loop_patch">Menambal kernel ...</string>
+		<string name="fix_recovery_loop_patch_error">Kesalahan menambal kernel.</string>
+		<string name="decrypt_users">Deskripsi pengguna</string>
+		<string name="decrypt_users_selection">Pilih ID pengguna untuk mendeskripsi</string>
+		<string name="select_user">Pilih Pengguna</string>
+		<string name="backup_storage_undecrypt_warning">Cadangan tidak akan menyertakan beberapa file pengguna {1}, karena tidak di deskripsikan.</string>
+		<string name="decrypting_user_fbe">Mencoba mendekripsi FBE untuk pengguna {1}...</string>
+		<string name="decrypt_user_success_fbe">Pengguna {1} berhasil dideskripsi.</string>
+		<string name="decrypt_user_fail_fbe">Gagal mendekripsi pengguna {1}</string>
+		<string name="decrypt_data_enter_pass_fbe">Masukkan sandi pengguna [%tw_crypto_user_id%]</string>
+		<string name="decrypt_data_enter_pattern_fbe">Masukkan sandi pengguna [%tw_crypto_user_id%]</string>
+		<string name="multiuser_warning1">Tidak semua pengguna didekripsi!</string>
+		<string name="multiuser_warning2">Operasi pencadangan /recovery mungkin gagal!</string>
+		<string name="multiuser_warning_accept">Lanjutkan saja</string>
+		<string name="multiuser_warning_hdr">Peringatan multipengguna</string>
+
+		<!-- Berbagai pesan konsol - ini terdiri dari pesan yang ditampilkan pengguna, biasanya kesalahan -->
+		<string name="no_kernel_selinux">Kernel tidak memiliki dukungan untuk membaca konteks SELinux.</string>
+		<string name="full_selinux">Dukungan penuh SELinux aktif.</string>
+		<string name="no_selinux">Tidak ada dukungan SELinux (tidak ada libselinux).</string>
+		<string name="mtp_enabled">MTP Diaktifkan</string>
+		<string name="mtp_crash">MTP Macet, tidak dimulai saat boot.</string>
+		<string name="decrypt_success">Berhasil didekripsi dengan sandi default.</string>
+		<string name="unable_to_decrypt">Tidak dapat mendekripsi dengan sandi default. Anda mungkin perlu melakukan Format Data.</string>
+		<string name="generating_digest1" version="2">Membuat digest</string>
+		<!-- Pesan yang ditampilkan selama pencadangan jika kita membuat Digest, idealnya, biarkan awalan "*" untuk membantu menyelaraskan dan memisahkan teks ini dari teks konsol lain -->
+		<string name="generating_digest2" version="2"> * Membuat digest...</string>
+		<string name="digest_created" version="2"> * Digest dibuat.</string>
+		<string name="digest_error" version="2"> * Kesalahan digest!</string>
+		<string name="digest_compute_error" version="2"> * Kesalahan kalkulasi digest.</string>
+		<string name="current_date">(Waktu saat ini)</string>
+		<string name="auto_generate">(Buat otomatis)</string>
+		<string name="unable_to_locate_partition">Tidak dapat menemukan partisi '{1}' untuk kalkulasi cadangan.</string>
+		<string name="no_partition_selected">Tidak ada partisi yang dipilih untuk cadangan.</string>
+		<string name="total_partitions_backup"> * Jumlah total partisi yang akan dicadangkan: {1}</string>
+		<string name="total_backup_size"> * Ukuran total semua data: {1}MB</string>
+		<string name="available_space"> * Ruang tersedia: {1}MB</string>
+		<string name="unable_locate_storage">Tidak dapat menemukan perangkat penyimpanan.</string>
+		<string name="no_space">Ruang penyimpanan tidak cukup.</string>
+		<string name="backup_started">[PENCADANGAN DIMULAI]</string>
+		<string name="backup_folder"> * Folder cadangan: {1}</string>
+		<string name="fail_backup_folder">Gagal membuat folder cadangan.</string>
+		<string name="avg_backup_fs">Kecepatan rata-rata mencadangkan file: {1} MB/det</string>
+		<string name="avg_backup_img">Kecepatan rata-rata mencadangkan Image: {1} MB/det</string>
+		<string name="total_backed_size">[{1} MB TOTAL DICADANGKAN]</string>
+		<string name="backup_completed">[MENCADANGKAN SELESAI DALAM {1} DETIK]</string>
+		<string name="restore_started">[PEMULIHAN DIMULAI]</string>
+		<string name="restore_folder">Pulihkan folder: '{1}'</string>
+		<!-- {1} adalah nama tampilan partisi dan {2} adalah nilai detik -->
+		<string name="restore_part_done">[{1} berhasil ({2} detik)]</string>
+		<string name="verifying_digest" version="2">Verifikasi digest</string>
+		<string name="skip_digest" version="2">Melewati pemeriksaan digest berdasarkan pengaturan.</string>
+		<string name="calc_restore">Menghitung rincian pemulihan ...</string>
+		<string name="restore_read_only">Tidak dapat memulihkan {1} -- diatur hanya Baca-Saja.</string>
+		<string name="restore_unable_locate">Tidak dapat menemukan partisi '{1}' untuk dipulihkan.</string>
+		<string name="no_part_restore">Tidak ada partisi yang dipilih untuk dipulihkan.</string>
+		<string name="restore_part_count">Memulihkan partisi {1}...</string>
+		<string name="total_restore_size">Ukuran total pemulihan {1}MB</string>
+		<string name="updating_system_details">Memperbarui rincian sistem</string>
+		<string name="restore_completed">[PEMULIHAN SELESAI DALAM {1} DETIK]</string>
+		<!-- {1} adalah lokasi yang tidak bisa kami buka, {2} adalah keluaran strerror -->
+		<string name="error_opening_strerr">Kesalahan membuka: '{1}' ({2})</string>
+		<string name="unable_locate_part_backup_name">Tidak dapat menemukan partisi cadangan dengan nama: '{1}'</string>
+		<string name="unable_find_part_path">Tidak dapat menemukan partisi pada '{1}'</string>
+		<string name="update_part_details">Memperbarui rincian partisi...</string>
+		<string name="update_part_details_done">... berhasil.</string>
+		<string name="wiping_dalvik">Menghapus direktori Dalvik...</string>
+		<string name="cleaned">Dibersihkan: {1}...</string>
+		<string name="cache_dalvik_done">-- Menghapus direktori dalvik cache berhasil!</string>
+		<string name="dalvik_done">-- Menghapus direktori dalvik berhasil!</string>
+		<string name="no_andsec">Tidak ada partisi keamanan Android yang ditemukan.</string>
+		<string name="unable_to_locate">Tidak dapat menemukan {1}.</string>
+		<string name="wiping_datamedia">Menghapus penyimpanan internal -- /data/media...</string>
+		<string name="unable_to_mount">Tidak dapat mount {1}</string>
+		<string name="unable_to_mount_internal">Tidak dapat mount penyimpanan_internal</string>
+		<string name="unable_to_mount_storage">Tidak dapat mount penyimpanan</string>
+		<string name="fail_decrypt">Gagal mendeskripsikan data.</string>
+		<string name="no_crypto_support">Tidak ada dukungan crypto yang dikompilasi ke dalam build ini.</string>
+		<string name="decrypt_success_dev">Data berhasil didekripsi, blok baru perangkat: '{1}'</string>
+		<string name="decrypt_success_nodev">Data berhasil dideskripsi</string>
+		<string name="done">Berhasil.</string>
+		<string name="start_partition_sd">Mempartisi kartu SD...</string>
+		<string name="partition_sd_locate">Tidak dapat menemukan perangkat untuk partisi.</string>
+		<string name="ext_swap_size">EXT + Ukuran swap lebih besar dari ukuran kartu SD.</string>
+		<string name="remove_part_table">Menghapus tabel partisi...</string>
+		<string name="unable_rm_part">Tidak dapat menghapus tabel partisi.</string>
+		<string name="create_part">Membuat partisi {1}...</string>
+		<string name="unable_to_create_part">Tidak dapat membuat partisi {1}.</string>
+		<string name="format_sdext_as">Memformat sd-ext sebagai {1}...</string>
+		<string name="part_complete">Mempartisi selesai.</string>
+		<string name="unable_to_open">Tidak dapat membuka '{1}'.</string>
+		<string name="mtp_already_enabled">MTP telah diaktifkan</string>
+		<string name="mtp_fail">Gagal mengaktifkan MTP</string>
+		<string name="no_mtp">Dukungan MTP tidak tersedia</string>
+		<string name="image_flash_start">[FLASH IMAGE DIMULAI]</string>
+		<string name="img_to_flash">Image untuk flash: '{1}'</string>
+		<string name="flash_unable_locate">Tidak dapat menemukan partisi '{1}'.</string>
+		<string name="no_part_flash">Tidak ada partisi yang dipilih.</string>
+		<string name="too_many_flash">Terlalu banyak partisi yang dipilih.</string>
+		<string name="invalid_flash">Partisi flash yang dipilih tidak valid.</string>
+		<string name="flash_done">[FLASH IMAGE BERHASIL]</string>
+		<string name="wiping">Menghapus {1}</string>
+		<string name="repair_not_exist">{1} tidak ada! Tidak dapat memperbaiki!</string>
+		<string name="repairing_using">Memperbaiki {1} menggunakan {2}...</string>
+		<string name="unable_repair">Tidak dapat memperbaiki {1}.</string>
+		<string name="mount_data_footer">Tidak dapat mount /data dan tidak dapat menemukan footer kripto.</string>
+		<!-- {1} adalah nama folder yang tidak dapat dibuat, {2} adalah keluaran strerror -->
+		<string name="create_folder_strerr">Tidak dapat membuat folder '{1}' ({2}).</string>
+		<!-- {1} adalah nama folder yang tidak dapat kami pasang, {2} adalah keluaran strerror -->
+		<string name="fail_mount">Gagal mount '{1}' ({2})</string>
+		<!-- {1} adalah nama folder yang tidak dapat dilepas, {2} adalah keluaran strerror -->
+		<string name="fail_unmount">Gagal unmount '{1}' ({2})</string>
+		<string name="cannot_resize">Tidak dapat mengubah ukuran {1}.</string>
+		<string name="repair_resize">Memperbaiki {1} sebelum mengubah ukuran.</string>
+		<string name="unable_resize">Tidak dapat mengubah ukuran {1}.</string>
+		<string name="no_digest_found" version="2">Tidak ada file digest pada '{1}'. Batalkan pilihan aktifkan verifikasi digest untuk memulihkan.</string>
+		<string name="digest_fail_match" version="2">Digest tidak cocok untuk '{1}'.</string>
+		<string name="digest_matched" version="2">Digest cocok untuk '{1}'.</string>
+		<string name="fail_decrypt_tar">Gagal mendeskripsikan file tar '{1}'</string>
+		<string name="format_data_msg">Anda mungkin perlu mereboot recovery agar dapat menggunakan /data lagi.</string>
+		<string name="format_data_err">Tidak dapat melakukan format untuk hapus enkripsi.</string>
+		<string name="formatting_using">Memformat {1} menggunakan {2}...</string>
+		<string name="unable_to_wipe">Tidak dapat menghapus {1}.</string>
+		<string name="cannot_wipe">Partisi {1} tidak dapat dihapus.</string>
+		<string name="remove_all">Menghapus semua file di didalam '{1}'</string>
+		<string name="wiping_data">Menghapus data tanpa menghapus /data/media ...</string>
+		<string name="backing_up">Mencadangkan {1}...</string>
+		<string name="backup_storage_warning">Cadangan {1} tidak menyertakan berkas apa pun di penyimpanan internal seperti gambar atau unduhan.</string>
+		<string name="backing">Mencadangkan</string>
+		<string name="backup_size">Ukuran file cadangan untuk '{1}' adalah 0 bytes.</string>
+		<string name="datamedia_fs_restore">PERINGATAN: Pencadangan /data ini dibuat dengan file sistem {1} ! Cadangan mungkin tidak bisa boot kecuali Anda mengubah kembali ke {1}.</string>
+		<string name="restoring">Memulihkan {1}...</string>
+		<string name="restoring_hdr">Memulihkan</string>
+		<string name="recreate_folder_err">Tidak dapat membuat folder {1}.</string>
+		<string name="img_size_err">Ukuran Image lebih besar dari perangkat</string>
+		<string name="flashing">Memflash {1}...</string>
+		<string name="backup_folder_set">Folder cadangan disetel ke '{1}'</string>
+		<string name="locate_backup_err">Tidak dapat menemukan cadangan '{1}'</string>
+		<string name="set_restore_opt">Pengaturan opsi pemulihan: '{1}':</string>
+		<string name="digest_check_skip" version="2">Pengabaian pemeriksaan digest aktif</string>
+		<string name="ors_encrypt_restore_err">Tidak dapat menggunakan OpenRecoveryScript untuk memulihkan cadangan terenkripsi.</string>
+		<string name="mounting">Memasang</string>
+		<string name="unmounting">Melepas</string>
+		<string name="mounted">'{1}' Terpasang</string>
+		<string name="unmounted">'{1}' Dilepaskan</string>
+		<string name="setting">Pengaturan '{1}' ke '{2}'</string>
+		<string name="setting_empty">Pengaturan '{1}' tidak ada</string>
+		<string name="making_dir1">Membuat direktori</string>
+		<string name="making_dir2">Membuat direktori: '{1}'</string>
+		<string name="running_command">Menjalankan perintah</string>
+		<string name="sideload">ADB Sideload</string>
+		<string name="start_sideload">Memulai fitur ADB sideload...</string>
+		<string name="need_new_adb">Anda memerlukan adb 1.0.32 atau lebih baru pada perangkat ini.</string>
+		<string name="no_pwd">Sandi tidak tersedia.</string>
+		<string name="done_ors">Memproses file skripsi selesai.</string>
+		<string name="injecttwrp">Menyuntik TWRP kedalam image boot...</string>
+		<string name="zip_err">Kesalahan Menginstal file zip '{1}'</string>
+		<string name="installing_zip">Menginstal file zip '{1}'</string>
+		<string name="select_backup_opt">Pengaturan opsi pencadangan:</string>
+		<string name="compression_on">Kompresi aktif</string>
+		<string name="digest_off" version="2">Penghasil digest dinonaktifkan</string>
+		<string name="backup_fail">Pencadangan gagal</string>
+		<string name="backup_clean">Pencadangan gagal. Membersihkan folder cadangan.</string>
+		<string name="running_recovery_commands">Menjalankan perintah recovery</string>
+		<string name="recovery_commands_complete">Perintah recovery selesai.</string>
+		<string name="running_ors">Menjalankan OpenRecoveryScript</string>
+		<string name="ors_complete">OpenRecoveryScript selesai.</string>
+		<string name="check_for_digest" version="2">Memeriksa file digest...</string>
+		<string name="invalid_zip_format">Format file zip tidak valid!</string>
+		<string name="fail_sysmap">Gagal memetakan file '{1}'</string>
+		<string name="verify_zip_sig">Memverifikasi tanda tangan zip ...</string>
+		<string name="verify_zip_fail">Verifikasi gagal!</string>
+		<string name="verify_zip_done">Verifikasi berhasil.</string>
+		<string name="zip_corrupt">File zip rusak!</string>
+		<string name="no_digest" version="2">Melewati pemeriksa digest: tidak ada file digest yang ditemukan</string>
+		<string name="digest_fail" version="2">Digest tidak cocok</string>
+		<string name="digest_match" version="2">Digest cocok</string>
+		<string name="pid_signal">{1} proses diakhiri dengan sinyal: {2}</string>
+		<string name="pid_error">{1} proses diakhiri dengan kesalahan: {2}</string>
+		<string name="install_dumlock">Menginstal HTC Dumlock ke sistem...</string>
+		<string name="dumlock_restore">Memulihkan boot original...</string>
+		<string name="dumlock_reflash">Memlash ulang recovery ke boot...</string>
+		<string name="run_script">Menjalankan skripsi {1}...</string>
+		<string name="rename_stock">Ubah nama file stok recovery dalam /sistem untuk mencegah stok ROM mengubah TWRP.</string>
+		<string name="split_backup">Memecah file cadangan menjadi beberapa arsip ...</string>
+		<string name="backup_error">Kesalahan membuat cadangan.</string>
+		<string name="restore_error">Kesalahan saat proses pemulihan.</string>
+		<string name="split_thread">Memisah ID untaian {1} menjadi arsip {2}</string>
+		<!-- 2 item ini disimpan di pengelola data bukan pengelola sumber daya, jadi %llu, dll sesuai daripada {1} -->
+		<string name="file_progress">%llu dari file %llu, %i%%</string>
+		<string name="size_progress">%lluMB of %lluMB, %i%%</string>
+		<string name="decrypt_cmd" version="2">Mencoba mendekripsi partisi data atau pengguna melalui baris perintah.</string>
+		<string name="base_pkg_err">Gagal memuat paket dasar.</string>
+		<string name="simulating">Mensimulasikan tindakan...</string>
+		<string name="backup_cancel">Pencadangan dibatalkan.</string>
+		<string name="config_twrp">Mengkonfigurasi TWRP...</string>
+		<string name="config_twrp_err">Tidak dapat mengkonfigurasi TWRP dengan kernel ini.</string>
+		<string name="copy_log">Log pemulihan disalin ke {1}.</string>
+		<string name="max_queue">Antrian maksimum zip tercapai!</string>
+		<string name="min_queue">Antrian minimum zip tercapai!</string>
+		<string name="screenshot_saved">Screenshot disimpan ke {1}</string>
+		<string name="screenshot_err">Gagal mengambil screenshot!</string>
+		<string name="zip_wipe_cache">Satu atau lebih zip meminta penghapusan cache -- Hapus cache sekarang.</string>
+		<string name="and_sec_wipe_err">Tidak dapat menghapus keamanan Android</string>
+		<string name="dalvik_wipe_err">Gagal menghapus dalvik</string>
+		<string name="auto_gen">(Buat otomatis)</string>
+		<string name="curr_date">(Waktu saat ini)</string>
+		<string name="backup_name_len">Nama cadangan terlalu panjang.</string>
+		<string name="backup_name_invalid">Nama cadangan '{1}' terdapat karakter yang tidak valid: '{1}'</string>
+		<string name="no_real_sdcard">Perangkat ini tidak memiliki Kartu SD asli! Membatalkan!</string>
+		<string name="cancel_sideload">Membatalkan ADB sideload...</string>
+		<string name="change_fs_err">Kesalahan mengubah file sistem.</string>
+		<string name="theme_ver_err">Versi tema kustom tidak cocok dengan versi TWRP. Gunakan tema stok.</string>
+		<string name="up_a_level">(Kembali)</string>
+		<string name="install_reboot" version="2">Mereboot dalam %tw_sleep% detik(s)</string>
+		<string name="adbbackup_error">Kesalahan dengan pencadangan ADB. Mengeluarkan..."</string>
+		<string name="adbbackup_control_error">Tidak dapat menulis ke saluran kontrol adb</string>
+		<string name="twrp_adbbu_option">--opsi twrp diperlukan untuk mengaktifkan twrp adb backup</string>
+		<string name="partition_not_found">lokasi: {1} tidak ditemukan dalam daftar partisi</string>
+		<string name="copy_kernel_log">Salin log kernel ke {1}</string>
+		<string name="include_kernel_log">Termasuk log kernel</string>
+		<string name="sha2_chk">Gunakan SHA2 untuk mencirikan</string>
+		<string name="unable_set_boot_slot">Kesalahan mengubah boot bootloader ke {1}</string>
+		<string name="unmount_sys_install">Unmount sistem sebelum menginstal zip</string>
+		<string name="unmount_system">Unmount sistem...</string>
+		<string name="unmount_system_err">Gagal unmount sistem</string>
+		<string name="flash_ab_inactive">Memflash zip A / B ke slot tidak aktif: {1}</string>
+		<string name="flash_ab_reboot">Untuk memflash zip tambahan, silakan reboot recovery untuk beralih ke slot yang diperbarui.</string>
+		<string name="flash_ab_both_slots">Flash ke kedua slot</string>
+		<string name="ozip_decrypt_decryption">Mulai mendekripsi Ozip ...</string>
+		<string name="ozip_decrypt_finish">Mendeskripsi Ozip selesai!</string>
+		<string name="fbe_wipe_msg">PERINGATAN: {1} dihapus. Perangkat FBE harus di-boot ke Android dan bukan Recovery untuk mengatur kebijakan FBE awal setelah penghapusan.</string>
+		<string name="fastboot_button">Fastboot</string>
+		<string name="enable_adb">Aktifkan ADB</string>
+		<string name="enable_fastboot">Aktifkan Fastboot</string>
+		<string name="fastboot_console_msg">Memasuki mode Fastboot...</string>
+		<!-- Android Rescue Party trigger -->
+		<string name="rescue_party0">Memicu Pihak Penyelamat Android! Solusi memungkinkan? Antara:</string>
+		<string name="rescue_party1"> 1. Hapus cache, dan/atau</string>
+		<string name="rescue_party2"> 2. Format data, dan/atau</string>
+		<string name="rescue_party3"> 3. Bersihkan-flash ROM Anda.</string>
+		<string name="rescue_party4">Masalah yang dilaporkan adalah: </string>
+		<string name="restore_system_context">Tidak dapat memperoleh konteks default untuk {1} -- Android mungkin tidak bisa booting.</string>
+		<string name="change_twrp_folder_btn">Ubah folder TWRP</string>
+		<string name="change_twrp_folder_on_process">Mengubah folder TWRP</string>
+		<string name="change_twrp_folder_after_process">Folder TWRP diubah ke</string>
+		<string name="tw_folder_exists">Nama folder sudah ada!</string>
+	</resources>
+</language>

From 4a65b70fe001d810fb4bb8f94795eb82505357c3 Mon Sep 17 00:00:00 2001
From: Jarl-Penguin <jarlpenguin@outlook.com>
Date: Sun, 25 Apr 2021 18:56:32 +0300
Subject: [PATCH 159/207] bash: Relink libncurses.so

* bash depends on it (like nano does)
* Fixes linker error when attempting to run bash

Signed-off-by: Jarl-Penguin <jarlpenguin@outlook.com>
Change-Id: I42262aa1834b9146b58188061a1fc7f18076ac3c
---
 prebuilt/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 5b1d873d23..549a0c7324 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -413,6 +413,7 @@ ifneq ($(TW_EXCLUDE_NANO), true)
 endif
 ifneq ($(TW_EXCLUDE_BASH), true)
     RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/bash
+    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libncurses.so
 endif
 
 TW_BB_SYMLINKS :=

From 69e6e775b90cbfc3704a0256d91d518817b3d1fd Mon Sep 17 00:00:00 2001
From: Ctapchuk <pilipenko0409@gmail.com>
Date: Mon, 12 Jul 2021 15:14:19 +0700
Subject: [PATCH 160/207] Update Russian language, sync with en.xml

Change-Id: I8af2239735a800a7c883931ac3531440cc7f7758
(cherry picked from commit 5c102578654c7c7449541877e9283ab095274156)
---
 gui/theme/common/languages/ru.xml | 46 +++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index 2646ce9159..63878576a9 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -19,11 +19,11 @@
 		<string name="recovery">Recovery</string>
 		<string name="cache">Cache</string>
 		<string name="data">Data</string>
-		<string name="data_backup">Data (искл. Storage)</string>
-		<string name="sdcard">SDcard</string>
-		<string name="internal">Память устройства</string>
-		<string name="microsd">Micro SDCard</string>
-		<string name="usbotg">USB OTG</string>
+		<string name="data_backup">Data (искл. внутр.память)</string>
+		<string name="sdcard">SD-карта</string>
+		<string name="internal">Внутренняя память</string>
+		<string name="microsd">MicroSD-карта</string>
+		<string name="usbotg">USB-накопитель</string>
 		<string name="android_secure">Android Secure</string>
 		<string name="dalvik">Dalvik/ART Cache</string>
 		<!-- This is a rarely used partition on a Micro SD card for a very old app2sd system -->
@@ -224,8 +224,9 @@
 		<string name="enc_disabled">выключено - установите пароль для включения</string>
 		<string name="enc_enabled">включено</string>
 		<string name="enable_backup_comp_chk">Использовать сжатие</string>
-		<string name="skip_digest_backup_chk" version="2">Пропустить вычисление контрольных сумм</string>
+		<string name="skip_digest_backup_chk" version="2">Не создавать контрольные суммы</string>
 		<string name="disable_backup_space_chk" version="2">Отключить проверку свободного места</string>
+		<string name="skip_digest_zip_chk">Не проверять контрольные суммы ZIP</string>
 		<string name="current_boot_slot">Текущий слот: %tw_active_slot%</string>
 		<string name="boot_slot_a">Слот A</string>
 		<string name="boot_slot_b">Слот B</string>
@@ -292,7 +293,7 @@
 		<string name="rb_recovery_btn">Рекавери</string>
 		<string name="rb_bootloader_btn">Загрузчик</string>
 		<string name="rb_download_btn">Режим загрузки</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Выключение...</string>
 		<string name="swipe_power_off">Свайп для выключения</string>
 		<string name="swipe_power_off_s">Выключение</string>
@@ -392,7 +393,7 @@
 		<string name="copy_log_complete" version="2">Копирование лога завершено.</string>
 		<string name="fix_context_btn">Исправить контекст</string>
 		<string name="part_sd_btn">Разметка SD-карты</string>
-		<string name="part_sd_s_btn">Разм-ка SD</string>
+		<string name="part_sd_s_btn">Разметка SD</string>
 		<string name="file_manager_btn">Проводник</string>
 		<string name="language_hdr">Язык</string>
 		<string name="terminal_btn">Терминал</string>
@@ -459,6 +460,8 @@
 		<string name="fm_set_perms_hdr">Установить права</string>
 		<string name="fm_perms">Права:</string>
 		<string name="fm_complete">Операция завершена</string>
+		<string name="fm_open_terminal_btn">Открыть терминал здесь</string>
+		<string name="fm_edit_file">Изменить файл</string>
 		<string name="decrypt_data_hdr">Расшифровать данные</string>
 		<string name="decrypt_data_enter_pass">Введите пароль.</string>
 		<string name="decrypt_data_failed">Пароль неверный, попробуйте снова!</string>
@@ -468,8 +471,8 @@
 		<string name="decrypt_data_vold_os_missing">Отсутствуют файлы необходимые для расшифровки vold: {1}</string>
 		<string name="term_hdr">Команда терминала</string>
 		<string name="term_s_hdr">Терминал</string>
-		<string name="term_kill_btn">УБИТЬ</string>
-		<string name="term_sel_folder_hdr">Перейдите к стартовой папке</string>
+		<string name="term_kill_btn">Остановить</string>
+		<string name="term_sel_folder_hdr">Перейдите к начальной папке</string>
 		<string name="adb_sideload_hdr">ADB Sideload</string>
 		<string name="sideload_wipe_dalvik_chk">Очистка Dalvik Cache</string>
 		<string name="sideload_wipe_cache_chk">Очистка Cache</string>
@@ -737,16 +740,25 @@
 		<string name="unmount_system">Размонтирование System...</string>
 		<string name="unmount_system_err">Ошибка размонтирования System</string>
 		<string name="flash_ab_inactive">Прошивка A/B ZIP в неактивный слот: {1}</string>
-        <string name="flash_ab_reboot">Для прошивки дополнительных ZIP перезагрузите рекавери для переключения на обновлённый слот.</string>
+		<string name="flash_ab_reboot">Для прошивки дополнительных ZIP перезагрузите рекавери для переключения на обновлённый слот.</string>
+		<string name="flash_ab_both_slots">Прошить в оба слота</string>
 		<string name="ozip_decrypt_decryption">Начало расшифровки Ozip...</string>
 		<string name="ozip_decrypt_finish">Расшифровка Ozip завершена!</string>
-		<string name="change_twrp_folder_btn">Изменить папку TWRP</string>
-		<string name="change_twrp_folder_on_process">Изменение папки TWRP</string>
+		<string name="fbe_wipe_msg">ВНИМАНИЕ: {1} очищен. Устройство необходимо перезагрузить в ОС (не в рекавери) для установки начальной политики FBE после очистки.</string>
+		<string name="fastboot_button">Fastboot</string>
+		<string name="enable_adb">Включить ADB</string>
+		<string name="enable_fastboot">Включить Fastboot</string>
+		<string name="fastboot_console_msg">Переход в режим Fastboot...</string>
+		<!-- Android Rescue Party trigger -->
+		<string name="rescue_party0">Обнаружен сбой Android Rescue Party! Возможные решения:</string>
+		<string name="rescue_party1"> 1. Очистить Cache и/или</string>
+		<string name="rescue_party2"> 2. Форматировать Data и/или</string>
+		<string name="rescue_party3"> 3. Заново установить прошивку.</string>
+		<string name="rescue_party4">Проблема: </string>
+		<string name="restore_system_context">Невозможно получить контекст по умолчанию для {1} -- Android может не загрузиться.</string>
+		<string name="change_twrp_folder_btn">Сменить папку TWRP</string>
+		<string name="change_twrp_folder_on_process">Смена папки TWRP</string>
 		<string name="change_twrp_folder_after_process">Папка TWRP изменена на</string>
 		<string name="tw_folder_exists">Папка с таким именем уже существует!</string>
-		<string name="fm_open_terminal_btn">Открыть терминал здесь</string>
-		<string name="fm_edit_file">Изменить файл</string>
-		<string name="flash_ab_both_slots">Прошить на оба слота</string>
-		<string name="restore_system_context">Невозможно получить контекст по умолчанию для {1} -- Android может не загрузиться.</string>
 	</resources>
 </language>

From 41dd0a020967adc0f1006fae7b663abf9ea327e5 Mon Sep 17 00:00:00 2001
From: Chaosmaster <chaosmaster@chaosv.de>
Date: Wed, 11 Aug 2021 12:23:28 +0200
Subject: [PATCH 161/207] Don't rely on just seconds for detecting changes to
 /dev/input

We might miss devices that were inserted shortly after our last
check.

Change-Id: I2594815c1f1b8ea952b8e0d45f5c43413914dd66
---
 minuitwrp/events.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/minuitwrp/events.cpp b/minuitwrp/events.cpp
index 7e5bc42e8a..cfe2948bb0 100755
--- a/minuitwrp/events.cpp
+++ b/minuitwrp/events.cpp
@@ -108,7 +108,7 @@ static struct pollfd ev_fds[MAX_DEVICES];
 static struct ev evs[MAX_DEVICES];
 static unsigned ev_count = 0;
 static struct timeval lastInputStat;
-static time_t lastInputMTime;
+struct timespec lastInputMTim;
 static int has_mouse = 0;
 
 static inline int ABS(int x) {
@@ -363,8 +363,12 @@ int ev_init(void)
     }
 
     struct stat st;
-    if(stat("/dev/input", &st) >= 0)
-        lastInputMTime = st.st_mtime;
+    if(stat("/dev/input", &st) >= 0) {
+        lastInputMTim = st.st_mtim;
+#ifdef _EVENT_LOGGING
+        printf("ev_init: lastInputMTim sec: %lu, nsec: %lu\n", st.st_mtim.tv_sec, st.st_mtim.tv_nsec);
+#endif
+    }
     gettimeofday(&lastInputStat, NULL);
 
     return 0;
@@ -778,12 +782,13 @@ int ev_get(struct input_event *ev, int timeout_ms)
     {
         struct stat st;
         stat("/dev/input", &st);
-        if (st.st_mtime > lastInputMTime)
+        if ((st.st_mtim.tv_sec > lastInputMTim.tv_sec)
+            || (st.st_mtim.tv_sec == lastInputMTim.tv_sec && st.st_mtim.tv_nsec > lastInputMTim.tv_nsec))
         {
             LOGI("Reloading input devices\n");
             ev_exit();
             ev_init();
-            lastInputMTime = st.st_mtime;
+            lastInputMTim = st.st_mtim;
         }
         lastInputStat = curr;
     }

From 94f667d915508265866aa5bfb60c65597c31e32e Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Mon, 1 Nov 2021 11:39:47 -0400
Subject: [PATCH 162/207] fde: add missing newline

Change-Id: I4c903be0df4319b8426f4fb1d4457c6e8afde9cf
---
 crypto/fde/cryptfs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/fde/cryptfs.cpp b/crypto/fde/cryptfs.cpp
index 544d3eccf6..60912fbfaa 100644
--- a/crypto/fde/cryptfs.cpp
+++ b/crypto/fde/cryptfs.cpp
@@ -1082,7 +1082,7 @@ static int load_crypto_mapping_table(struct crypt_mnt_ftr *crypt_ftr,
   for (i = 0; i < TABLE_LOAD_RETRIES; i++) {
     int ret = ioctl(fd, DM_TABLE_LOAD, io);
     if (!ret)  {
-      SLOGI("ioctl err: %d", ret);
+      SLOGI("ioctl err: %d\n", ret);
       break;
     }
     usleep(500000);

From 56b02eb4174a4794f523f975db9440755fa24d79 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Mon, 6 Jul 2020 20:24:34 -0400
Subject: [PATCH 163/207] repack: update repacking

This will support updating the ramdisk to a different
compression format and co-exist with magisk.

We are also moving twrp repacking to its own class. We
check the new ramdisk format and if it's different
we have magisk compress using the new ramdisk format.

Change-Id: I770030aae7797e75817178b2f0fccd9f39dc23af
---
 Android.mk           |   3 +-
 gui/action.cpp       |   9 +-
 partition.cpp        |  15 ++-
 partitionmanager.cpp | 160 +--------------------------
 partitions.hpp       |  23 ++--
 twrp-functions.cpp   |  13 ++-
 twrp-functions.hpp   |   4 +-
 twrpRepacker.cpp     | 249 +++++++++++++++++++++++++++++++++++++++++++
 twrpRepacker.hpp     |  48 +++++++++
 twrpTar.cpp          |   4 +-
 10 files changed, 341 insertions(+), 187 deletions(-)
 create mode 100755 twrpRepacker.cpp
 create mode 100755 twrpRepacker.hpp

diff --git a/Android.mk b/Android.mk
index a7218859bf..826636faa7 100755
--- a/Android.mk
+++ b/Android.mk
@@ -75,7 +75,8 @@ LOCAL_SRC_FILES := \
     twrpDigestDriver.cpp \
     openrecoveryscript.cpp \
     tarWrite.c \
-    twrpAdbBuFifo.cpp
+    twrpAdbBuFifo.cpp \
+    twrpRepacker.cpp
 
 ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
   LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
diff --git a/gui/action.cpp b/gui/action.cpp
index c8ee34c099..494665c87c 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -38,6 +38,7 @@
 #include <sstream>
 #include "../partitions.hpp"
 #include "../twrp-functions.hpp"
+#include "../twrpRepacker.hpp"
 #include "../openrecoveryscript.hpp"
 
 #include "../adb_install.h"
@@ -2167,6 +2168,8 @@ int GUIAction::uninstalltwrpsystemapp(std::string arg __unused)
 int GUIAction::repackimage(std::string arg __unused)
 {
 	int op_status = 1;
+	twrpRepacker repacker;
+
 	operation_start("Repack Image");
 	if (!simulate)
 	{
@@ -2179,7 +2182,7 @@ int GUIAction::repackimage(std::string arg __unused)
 			Repack_Options.Type = REPLACE_KERNEL;
 		else
 			Repack_Options.Type = REPLACE_RAMDISK;
-		if (!PartitionManager.Repack_Images(path, Repack_Options))
+		if (!repacker.Repack_Image_And_Flash(path, Repack_Options))
 			goto exit;
 	} else
 		simulate_progress_bar();
@@ -2192,6 +2195,8 @@ int GUIAction::repackimage(std::string arg __unused)
 int GUIAction::fixabrecoverybootloop(std::string arg __unused)
 {
 	int op_status = 1;
+	twrpRepacker repacker;
+
 	operation_start("Repack Image");
 	if (!simulate)
 	{
@@ -2207,7 +2212,7 @@ int GUIAction::fixabrecoverybootloop(std::string arg __unused)
 			gui_msg(Msg(msg::kError, "unable_to_locate=Unable to locate {1}.")("/boot"));
 			goto exit;
 		}
-		if (!PartitionManager.Prepare_Repack(part, REPACK_ORIG_DIR, DataManager::GetIntValue("tw_repack_backup_first") != 0, gui_lookup("repack", "Repack")))
+		if (!repacker.Backup_Image_For_Repack(part, REPACK_ORIG_DIR, DataManager::GetIntValue("tw_repack_backup_first") != 0, gui_lookup("repack", "Repack")))
 			goto exit;
 		DataManager::SetProgress(.25);
 		gui_msg("fixing_recovery_loop_patch=Patching kernel...");
diff --git a/partition.cpp b/partition.cpp
index f108087b75..d14c72d71f 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -1478,7 +1478,7 @@ bool TWPartition::Mount(bool Display_Error) {
 		string cmd = "/sbin/exfat-fuse -o big_writes,max_read=131072,max_write=131072 " + Actual_Block_Device + " " + Mount_Point;
 		LOGINFO("cmd: %s\n", cmd.c_str());
 		string result;
-		if (TWFunc::Exec_Cmd(cmd, result) != 0) {
+		if (TWFunc::Exec_Cmd(cmd, result, false) != 0) {
 			LOGINFO("exfat-fuse failed to mount with result '%s', trying vfat\n", result.c_str());
 			Current_File_System = "vfat";
 		} else {
@@ -3482,3 +3482,16 @@ void TWPartition::Set_Backup_FileName(string fname) {
 string TWPartition::Get_Backup_Name() {
 	return Backup_Name;
 }
+
+std::string TWPartition::Get_Backup_FileName() {
+	return Backup_FileName;
+}
+
+std::string TWPartition::Get_Display_Name() {
+	return Display_Name;
+}
+
+bool TWPartition::Is_SlotSelect() {
+	return SlotSelect;
+
+}
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 555723faa1..64723490f2 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -52,6 +52,7 @@
 #include "gui/gui.hpp"
 #include "progresstracking.hpp"
 #include "twrpDigestDriver.hpp"
+#include "twrpRepacker.hpp"
 #include "adbbu/libtwadbbu.hpp"
 
 #ifdef TW_HAS_MTP
@@ -2693,6 +2694,7 @@ bool TWPartitionManager::Remove_MTP_Storage(unsigned int Storage_ID) {
 }
 
 bool TWPartitionManager::Flash_Image(string& path, string& filename) {
+	twrpRepacker repacker;
 	int partition_count = 0;
 	TWPartition* flash_part = NULL;
 	string Flash_List, flash_path, full_filename;
@@ -2726,7 +2728,7 @@ bool TWPartitionManager::Flash_Image(string& path, string& filename) {
 		Repack_Options.Disable_Verity = false;
 		Repack_Options.Disable_Force_Encrypt = false;
 		Repack_Options.Backup_First = DataManager::GetIntValue("tw_repack_backup_first") != 0;
-		return Repack_Images(full_filename, Repack_Options);
+		return repacker.Repack_Image_And_Flash(full_filename, Repack_Options);
 	}
 	PartitionSettings part_settings;
 	part_settings.Backup_Folder = path;
@@ -3224,159 +3226,3 @@ bool TWPartitionManager::Prepare_Empty_Folder(const std::string& Folder) {
 		TWFunc::removeDir(Folder, false);
 	return TWFunc::Recursive_Mkdir(Folder);
 }
-
-bool TWPartitionManager::Prepare_Repack(TWPartition* Part, const std::string& Temp_Folder_Destination, const bool Create_Backup, const std::string& Backup_Name) {
-	if (!Part) {
-		LOGERR("Partition was null!\n");
-		return false;
-	}
-	if (!Prepare_Empty_Folder(Temp_Folder_Destination))
-		return false;
-	std::string target_image = Temp_Folder_Destination + "boot.img";
-	PartitionSettings part_settings;
-	part_settings.Part = Part;
-	if (Create_Backup) {
-		if (Check_Backup_Name(Backup_Name, true, false) != 0)
-			return false;
-		DataManager::GetValue(TW_BACKUPS_FOLDER_VAR, part_settings.Backup_Folder);
-		part_settings.Backup_Folder = part_settings.Backup_Folder + "/" + TWFunc::Get_Current_Date() + " " + Backup_Name + "/";
-		if (!TWFunc::Recursive_Mkdir(part_settings.Backup_Folder))
-			return false;
-	} else
-		part_settings.Backup_Folder = Temp_Folder_Destination;
-	part_settings.adbbackup = false;
-	part_settings.generate_digest = false;
-	part_settings.generate_md5 = false;
-	part_settings.PM_Method = PM_BACKUP;
-	part_settings.progress = NULL;
-	pid_t not_a_pid = 0;
-	if (!Part->Backup(&part_settings, &not_a_pid))
-		return false;
-	std::string backed_up_image = part_settings.Backup_Folder;
-	backed_up_image += Part->Backup_FileName;
-	target_image = Temp_Folder_Destination + "boot.img";
-	if (Create_Backup) {
-		std::string source = part_settings.Backup_Folder + Part->Backup_FileName;
-		if (TWFunc::copy_file(source, target_image, 0644) != 0) {
-			LOGERR("Failed to copy backup file '%s' to temp folder target '%s'\n", source.c_str(), target_image.c_str());
-			return false;
-		}
-	} else {
-		if (rename(backed_up_image.c_str(), target_image.c_str()) != 0) {
-			LOGERR("Failed to rename '%s' to '%s'\n", backed_up_image.c_str(), target_image.c_str());
-			return false;
-		}
-	}
-	return Prepare_Repack(target_image, Temp_Folder_Destination, false, false);
-}
-
-bool TWPartitionManager::Prepare_Repack(const std::string& Source_Path, const std::string& Temp_Folder_Destination, const bool Copy_Source, const bool Create_Destination) {
-	if (Create_Destination) {
-		if (!Prepare_Empty_Folder(Temp_Folder_Destination))
-			return false;
-	}
-	if (Copy_Source) {
-		std::string destination = Temp_Folder_Destination + "/boot.img";
-		if (TWFunc::copy_file(Source_Path, destination, 0644))
-			return false;
-	}
-	std::string command = "cd " + Temp_Folder_Destination + " && /sbin/magiskboot unpack -h '" + Source_Path +"'";
-	if (TWFunc::Exec_Cmd(command) != 0) {
-		LOGINFO("Error unpacking %s!\n", Source_Path.c_str());
-		gui_msg(Msg(msg::kError, "unpack_error=Error unpacking image."));
-		return false;
-	}
-	return true;
-}
-
-bool TWPartitionManager::Repack_Images(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options) {
-	if (!TWFunc::Path_Exists("/sbin/magiskboot")) {
-		LOGERR("Image repacking tool not present in this TWRP build!");
-		return false;
-	}
-	DataManager::SetProgress(0);
-	TWPartition* part = PartitionManager.Find_Partition_By_Path("/boot");
-	if (part)
-		gui_msg(Msg("unpacking_image=Unpacking {1}...")(part->Display_Name));
-	else {
-		gui_msg(Msg(msg::kError, "unable_to_locate=Unable to locate {1}.")("/boot"));
-		return false;
-	}
-	if (!PartitionManager.Prepare_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
-		return false;
-	DataManager::SetProgress(.25);
-	gui_msg(Msg("unpacking_image=Unpacking {1}...")(Target_Image));
-	if (!PartitionManager.Prepare_Repack(Target_Image, REPACK_NEW_DIR, true))
-		return false;
-	DataManager::SetProgress(.5);
-	gui_msg(Msg("repacking_image=Repacking {1}...")(part->Display_Name));
-	std::string path = REPACK_NEW_DIR;
-	if (Repack_Options.Type == REPLACE_KERNEL) {
-		// When we replace the kernel, what we really do is copy the boot partition ramdisk into the new image's folder
-		if (TWFunc::copy_file(REPACK_ORIG_DIR "ramdisk.cpio", REPACK_NEW_DIR "ramdisk.cpio", 0644)) {
-			LOGERR("Failed to copy ramdisk\n");
-			return false;
-		}
-	} else if (Repack_Options.Type == REPLACE_RAMDISK) {
-		// Repack the ramdisk
-		if (TWFunc::copy_file(REPACK_NEW_DIR "ramdisk.cpio", REPACK_ORIG_DIR "ramdisk.cpio", 0644)) {
-			LOGERR("Failed to copy ramdisk\n");
-			return false;
-		}
-		path = REPACK_ORIG_DIR;
-	} else {
-		LOGERR("Invalid repacking options specified\n");
-		return false;
-	}
-	if (Repack_Options.Disable_Verity)
-		LOGERR("Disabling verity is not implemented yet\n");
-	if (Repack_Options.Disable_Force_Encrypt)
-		LOGERR("Disabling force encrypt is not implemented yet\n");
-	std::string command = "cd " + path + " && /sbin/magiskboot repack " + path + "boot.img";
-	if (TWFunc::Exec_Cmd(command) != 0) {
-		gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
-		return false;
-	}
-	DataManager::SetProgress(.75);
-	std::string file = "new-boot.img";
-	DataManager::SetValue("tw_flash_partition", "/boot;");
-	if (!PartitionManager.Flash_Image(path, file)) {
-		LOGINFO("Error flashing new image\n");
-		return false;
-	}
-	DataManager::SetProgress(1);
-	TWFunc::removeDir(REPACK_ORIG_DIR, false);
-	if (part->SlotSelect && Repack_Options.Type == REPLACE_RAMDISK) {
-		LOGINFO("Switching slots to flash ramdisk to both partitions\n");
-		string Current_Slot = Get_Active_Slot_Display();
-		if (Current_Slot == "A")
-			Set_Active_Slot("B");
-		else
-			Set_Active_Slot("A");
-		DataManager::SetProgress(.25);
-		if (!PartitionManager.Prepare_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
-			return false;
-		if (TWFunc::copy_file(REPACK_NEW_DIR "ramdisk.cpio", REPACK_ORIG_DIR "ramdisk.cpio", 0644)) {
-			LOGERR("Failed to copy ramdisk\n");
-			return false;
-		}
-		path = REPACK_ORIG_DIR;
-		command = "cd " + path + " && /sbin/magiskboot repack " + path + "boot.img";
-		if (TWFunc::Exec_Cmd(command) != 0) {
-			gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
-			return false;
-		}
-		DataManager::SetProgress(.75);
-		std::string file = "new-boot.img";
-		DataManager::SetValue("tw_flash_partition", "/boot;");
-		if (!PartitionManager.Flash_Image(path, file)) {
-			LOGINFO("Error flashing new image\n");
-			return false;
-		}
-		DataManager::SetProgress(1);
-		TWFunc::removeDir(REPACK_ORIG_DIR, false);
-		Set_Active_Slot(Current_Slot);
-	}
-	TWFunc::removeDir(REPACK_NEW_DIR, false);
-	return true;
-}
diff --git a/partitions.hpp b/partitions.hpp
index 45102812c6..dba9be889a 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -76,19 +76,6 @@ struct Flags_Map {
 	char* fstab_line;
 };
 
-enum Repack_Type {
-	REPLACE_NONE = 0,
-	REPLACE_RAMDISK = 1,
-	REPLACE_KERNEL = 2,
-};
-
-struct Repack_Options_struct {
-	Repack_Type Type;
-	bool Backup_First;
-	bool Disable_Verity;
-	bool Disable_Force_Encrypt;
-};
-
 enum PartitionManager_Op {                                                    // PartitionManager Restore Mode for Raw_Read_Write()
 	PM_BACKUP = 0,
 	PM_RESTORE = 1,
@@ -160,9 +147,12 @@ class TWPartition
 	int Decrypt_Adopted();
 	void Revert_Adopted();
 	void Partition_Post_Processing(bool Display_Error);                       // Apply partition specific settings after fstab processed
-	void Set_Backup_FileName(string fname);                                   // Set Backup_FileName for partition
+	void Set_Backup_FileName(string fname);                                   // Set backup filename for partition
+	std::string Get_Backup_FileName();                                        // Get the backup filename for the partition
 	string Get_Backup_Name();                                                 // Get Backup_Name for partition
 	bool Decrypt_FBE_DE();                                                    // If FBE is present, backup exclusions are set up and DE decrypt is attempted
+	std::string Get_Display_Name();                                           // Get the display name in the gui for the partition
+	bool Is_SlotSelect();                                                     // Return whether the partition is a slot partition or not
 
 public:
 	string Current_File_System;                                               // Current file system
@@ -390,9 +380,6 @@ class TWPartitionManager
 	void read_uevent();                                                       // Reads uevent data into a buffer
 	void close_uevent();                                                      // Closes the uevent netlink socket
 	void Add_Partition(TWPartition* Part);                                    // Adds a new partition to the Partitions vector
-	bool Prepare_Repack(TWPartition* Part, const std::string& Temp_Folder_Destination, const bool Create_Backup, const std::string& Backup_Name); // Prepares an image for repacking by unpacking it to the temp folder destination
-	bool Prepare_Repack(const std::string& Source_Path, const std::string& Temp_Folder_Destination, const bool Copy_Source, const bool Create_Destination = true); // Prepares an image for repacking by unpacking it to the temp folder destination
-	bool Repack_Images(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options); // Repacks the boot image with a new kernel or a new ramdisk
 	std::vector<users_struct>* Get_Users_List();                              // Returns pointer to list of users
 	int Set_FDE_Encrypt_Status();                                             // Sets encryption state for FDE devices (ro.crypto.state and ro.crypto.type)
 
@@ -415,6 +402,8 @@ class TWPartitionManager
 	Backup_Method_enum Backup_Method;                                         // Method used for backup
 	void Mark_User_Decrypted(int userID);                                     // Marks given user ID in Users_List as decrypted
 	void Check_Users_Decryption_Status();                                      // Checks to see if all users are decrypted
+	std::string original_ramdisk_format;                                      // Ramdisk format of boot partition
+	std::string repacked_ramdisk_format;                                      // Ramdisk format of boot image to repack from
 
 private:
 	std::vector<TWPartition*> Partitions;                                     // Vector list of all partitions
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index e77d1eb9d3..983d277fa6 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -66,12 +66,15 @@ extern "C" {
 struct selabel_handle *selinux_handle;
 
 /* Execute a command */
-int TWFunc::Exec_Cmd(const string& cmd, string &result) {
+int TWFunc::Exec_Cmd(const string& cmd, string &result, bool combine_stderr) {
 	FILE* exec;
 	char buffer[130];
 	int ret = 0;
-	exec = __popen(cmd.c_str(), "r");
-	if (!exec) return -1;
+	std::string popen_cmd = cmd;
+	if (combine_stderr)
+		popen_cmd = cmd + " 2>&1";
+	exec = __popen(popen_cmd.c_str(), "r");
+
 	while (!feof(exec)) {
 		if (fgets(buffer, 128, exec) != NULL) {
 			result += buffer;
@@ -521,7 +524,7 @@ void TWFunc::Copy_Log(string Source, string Destination) {
 		if (type == COMPRESSED) {
 			std::string destFileBuffer;
 			std::string getCompressedContents = "pigz -c -d " + Destination;
-			if (Exec_Cmd(getCompressedContents, destFileBuffer) < 0) {
+			if (Exec_Cmd(getCompressedContents, destFileBuffer, false) < 0) {
 				LOGINFO("Unable to get destination logfile contents.\n");
 				return;
 			}
@@ -1222,7 +1225,7 @@ void TWFunc::copy_kernel_log(string curr_storage) {
 	std::string dmesgCmd = "/sbin/dmesg";
 
 	std::string result;
-	Exec_Cmd(dmesgCmd, result);
+	Exec_Cmd(dmesgCmd, result, false);
 	write_to_file(dmesgDst, result);
 	gui_msg(Msg("copy_kernel_log=Copied kernel log to {1}")(dmesgDst));
 	tw_set_default_metadata(dmesgDst.c_str());
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 38cdd3b27f..cd772e5a2f 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -66,8 +66,8 @@ class TWFunc
 	static string Get_Path(const string& Path);                                 // Trims everything after the last / in the string
 	static string Get_Filename(const string& Path);                             // Trims the path off of a filename
 
-	static int Exec_Cmd(const string& cmd, string &result);                     //execute a command and return the result as a string by reference
-	static int Exec_Cmd(const string& cmd, bool Show_Errors = true);                   //execute a command, displays an error to the GUI if Show_Errors is true, Show_Errors is true by default
+ 	static int Exec_Cmd(const string& cmd, string &result, bool combine_stderr);     //execute a command and return the result as a string by reference, set combined_stderror to add stderr
+ 	static int Exec_Cmd(const string& cmd, bool Show_Errors = true);            //execute a command, displays an error to the GUI if Show_Errors is true, Show_Errors is true by default
 	static int Wait_For_Child(pid_t pid, int *status, string Child_Name, bool Show_Errors = true); // Waits for pid to exit and checks exit status, displays an error to the GUI if Show_Errors is true which is the default
 	static int Wait_For_Child_Timeout(pid_t pid, int *status, const string& Child_Name, int timeout); // Waits for a pid to exit until the timeout is hit. If timeout is hit, kill the chilld.
 	static bool Path_Exists(string Path);                                       // Returns true if the path exists
diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
new file mode 100755
index 0000000000..2ee5b7d83d
--- /dev/null
+++ b/twrpRepacker.cpp
@@ -0,0 +1,249 @@
+/*
+	Copyright 2013 to 2020 TeamWin
+	This file is part of TWRP/TeamWin Recovery Project.
+
+	TWRP is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	TWRP is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with TWRP.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <string>
+
+#include "data.hpp"
+#include "partitions.hpp"
+#include "twrp-functions.hpp"
+#include "twrpRepacker.hpp"
+#include "twcommon.h"
+#include "variables.h"
+#include "gui/gui.hpp"
+
+bool twrpRepacker::Prepare_Empty_Folder(const std::string& Folder) {
+	if (TWFunc::Path_Exists(Folder))
+		TWFunc::removeDir(Folder, false);
+	return TWFunc::Recursive_Mkdir(Folder);
+}
+
+bool twrpRepacker::Backup_Image_For_Repack(TWPartition* Part, const std::string& Temp_Folder_Destination,
+										 const bool Create_Backup, const std::string& Backup_Name) {
+	if (!Part) {
+		LOGERR("Partition was null!\n");
+		return false;
+	}
+	if (!Prepare_Empty_Folder(Temp_Folder_Destination))
+		return false;
+	std::string target_image = Temp_Folder_Destination + "boot.img";
+	PartitionSettings part_settings;
+	part_settings.Part = Part;
+	if (Create_Backup) {
+		if (PartitionManager.Check_Backup_Name(Backup_Name, true, false) != 0)
+			return false;
+		DataManager::GetValue(TW_BACKUPS_FOLDER_VAR, part_settings.Backup_Folder);
+		part_settings.Backup_Folder = part_settings.Backup_Folder + "/" + TWFunc::Get_Current_Date() + " " + Backup_Name + "/";
+		if (!TWFunc::Recursive_Mkdir(part_settings.Backup_Folder))
+			return false;
+	} else
+		part_settings.Backup_Folder = Temp_Folder_Destination;
+	part_settings.adbbackup = false;
+	part_settings.generate_digest = false;
+	part_settings.generate_md5 = false;
+	part_settings.PM_Method = PM_BACKUP;
+	part_settings.progress = NULL;
+	pid_t not_a_pid = 0;
+	if (!Part->Backup(&part_settings, &not_a_pid))
+		return false;
+	std::string backed_up_image = part_settings.Backup_Folder;
+	backed_up_image += Part->Get_Backup_FileName();
+	target_image = Temp_Folder_Destination + "boot.img";
+	if (Create_Backup) {
+		std::string source = part_settings.Backup_Folder + Part->Get_Backup_FileName();
+		if (TWFunc::copy_file(source, target_image, 0644) != 0) {
+			LOGERR("Failed to copy backup file '%s' to temp folder target '%s'\n", source.c_str(), target_image.c_str());
+			return false;
+		}
+	} else {
+		if (rename(backed_up_image.c_str(), target_image.c_str()) != 0) {
+			LOGERR("Failed to rename '%s' to '%s'\n", backed_up_image.c_str(), target_image.c_str());
+			return false;
+		}
+	}
+	original_ramdisk_format = Unpack_Image(target_image, Temp_Folder_Destination, false, false);
+	return !original_ramdisk_format.empty();
+}
+
+std::string twrpRepacker::Unpack_Image(const std::string& Source_Path, const std::string& Temp_Folder_Destination,
+										const bool Copy_Source, const bool Create_Destination) {
+	std::string txt_to_find = "RAMDISK_FMT";
+	if (Create_Destination) {
+		if (!Prepare_Empty_Folder(Temp_Folder_Destination))
+			return std::string();
+	}
+	if (Copy_Source) {
+		std::string destination = Temp_Folder_Destination + "/boot.img";
+		if (TWFunc::copy_file(Source_Path, destination, 0644))
+			return std::string();
+	}
+	std::string command = "cd " + Temp_Folder_Destination + " && /sbin/magiskboot unpack -h ";
+	command = command + "'" + Source_Path +"'";
+
+	std::string magisk_unpack_output;
+	int ret;
+	if ((ret = TWFunc::Exec_Cmd(command, magisk_unpack_output, true)) != 0) {
+		LOGINFO("Error unpacking %s, ret: %d!\n", Source_Path.c_str(), ret);
+		gui_msg(Msg(msg::kError, "unpack_error=Error unpacking image."));
+		return std::string();
+	}
+	size_t pos = magisk_unpack_output.find(txt_to_find) + txt_to_find.size();
+	std::string ramdisk_format = magisk_unpack_output.substr(pos, magisk_unpack_output.size() - 1);
+	ramdisk_format.erase(std::remove(ramdisk_format.begin(), ramdisk_format.end(), '['), ramdisk_format.end());
+	ramdisk_format.erase(std::remove(ramdisk_format.begin(), ramdisk_format.end(), ']'), ramdisk_format.end());
+	ramdisk_format.erase(std::remove(ramdisk_format.begin(), ramdisk_format.end(), ' '), ramdisk_format.end());
+	ramdisk_format.erase(std::remove(ramdisk_format.begin(), ramdisk_format.end(), '\n'), ramdisk_format.end());
+	return ramdisk_format;
+}
+
+bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options) {
+	bool recompress = false;
+
+	if (!TWFunc::Path_Exists("/sbin/magiskboot")) {
+		LOGERR("Image repacking tool not present in this TWRP build!");
+		return false;
+	}
+	DataManager::SetProgress(0);
+	TWPartition* part = PartitionManager.Find_Partition_By_Path("/boot");
+	if (part)
+		gui_msg(Msg("unpacking_image=Unpacking {1}...")(part->Get_Display_Name()));
+	else {
+		gui_msg(Msg(msg::kError, "unable_to_locate=Unable to locate {1}.")("/boot"));
+		return false;
+	}
+	if (!Backup_Image_For_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
+		return false;
+	DataManager::SetProgress(.25);
+	gui_msg(Msg("unpacking_image=Unpacking {1}...")(Target_Image));
+	image_ramdisk_format = Unpack_Image(Target_Image, REPACK_NEW_DIR, true);
+	if (image_ramdisk_format.empty())
+		return false;
+	DataManager::SetProgress(.5);
+	gui_msg(Msg("repacking_image=Repacking {1}...")(part->Get_Display_Name()));
+	std::string path = REPACK_NEW_DIR;
+	if (Repack_Options.Type == REPLACE_KERNEL) {
+		// When we replace the kernel, what we really do is copy the boot partition ramdisk into the new image's folder
+		if (TWFunc::copy_file(REPACK_ORIG_DIR "ramdisk.cpio", REPACK_NEW_DIR "ramdisk.cpio", 0644)) {
+			LOGERR("Failed to copy ramdisk\n");
+			return false;
+		}
+	} else if (Repack_Options.Type == REPLACE_RAMDISK) {
+		// Repack the ramdisk
+		if (TWFunc::copy_file(REPACK_NEW_DIR "ramdisk.cpio", REPACK_ORIG_DIR "ramdisk.cpio", 0644)) {
+			LOGERR("Failed to copy ramdisk\n");
+			return false;
+		}
+		path = REPACK_ORIG_DIR;
+	} else {
+		LOGERR("Invalid repacking options specified\n");
+		return false;
+	}
+	if (Repack_Options.Disable_Verity)
+		LOGERR("Disabling verity is not implemented yet\n");
+	if (Repack_Options.Disable_Force_Encrypt)
+		LOGERR("Disabling force encrypt is not implemented yet\n");
+	std::string command = "cd " + path + " && /sbin/magiskboot repack ";
+	if (original_ramdisk_format != image_ramdisk_format) {
+		command = command + "-n ";
+		recompress = true;
+	}
+
+	command += path + "boot.img";
+
+	std::string orig_compressed_image(REPACK_ORIG_DIR);
+	orig_compressed_image += "ramdisk.cpio";
+	std::string copy_compressed_image(REPACK_ORIG_DIR);
+	copy_compressed_image += "ramdisk-1.cpio";
+
+	if (recompress) {
+		std::string compress_cmd = "/sbin/magiskboot compress=" + image_ramdisk_format + " " + orig_compressed_image + " " + copy_compressed_image;
+		if (TWFunc::Exec_Cmd(compress_cmd) != 0) {
+			gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
+			return false;
+		}
+		std::rename(copy_compressed_image.c_str(), orig_compressed_image.c_str());
+	}
+
+	if (TWFunc::Exec_Cmd(command) != 0) {
+		gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
+		return false;
+	}
+
+	DataManager::SetProgress(.75);
+	std::string file = "new-boot.img";
+	DataManager::SetValue("tw_flash_partition", "/boot;");
+	if (!PartitionManager.Flash_Image(path, file)) {
+		LOGINFO("Error flashing new image\n");
+		return false;
+	}
+	DataManager::SetProgress(1);
+	TWFunc::removeDir(REPACK_ORIG_DIR, false);
+	if (part->Is_SlotSelect() && Repack_Options.Type == REPLACE_RAMDISK) {
+		LOGINFO("Switching slots to flash ramdisk to both partitions\n");
+		string Current_Slot = PartitionManager.Get_Active_Slot_Display();
+		if (Current_Slot == "A")
+			PartitionManager.Set_Active_Slot("B");
+		else
+			PartitionManager.Set_Active_Slot("A");
+		DataManager::SetProgress(.25);
+		if (!Backup_Image_For_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
+			return false;
+		if (TWFunc::copy_file(REPACK_NEW_DIR "ramdisk.cpio", REPACK_ORIG_DIR "ramdisk.cpio", 0644)) {
+			LOGERR("Failed to copy ramdisk\n");
+			return false;
+		}
+		path = REPACK_ORIG_DIR;
+		std::string command = "cd " + path + " && /sbin/magiskboot repack ";
+
+		if (original_ramdisk_format != image_ramdisk_format) {
+			command = command + "-n ";
+			recompress = true;
+		}
+		command += path + "boot.img";
+
+		if (recompress) {
+			std::string compress_cmd = "/sbin/magiskboot compress=" + image_ramdisk_format + " " + orig_compressed_image + " " + copy_compressed_image;
+			if (TWFunc::Exec_Cmd(compress_cmd) != 0) {
+				gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
+				return false;
+			}
+			std::rename(copy_compressed_image.c_str(), orig_compressed_image.c_str());
+		}
+
+		if (TWFunc::Exec_Cmd(command) != 0) {
+			gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
+			return false;
+		}
+
+		if (TWFunc::Exec_Cmd(command) != 0) {
+			gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
+			return false;
+		}
+		DataManager::SetProgress(.75);
+		std::string file = "new-boot.img";
+		DataManager::SetValue("tw_flash_partition", "/boot;");
+		if (!PartitionManager.Flash_Image(path, file)) {
+			LOGINFO("Error flashing new image\n");
+			return false;
+		}
+		DataManager::SetProgress(1);
+		TWFunc::removeDir(REPACK_ORIG_DIR, false);
+		PartitionManager.Set_Active_Slot(Current_Slot);
+	}
+	TWFunc::removeDir(REPACK_NEW_DIR, false);
+	return true;
+}
diff --git a/twrpRepacker.hpp b/twrpRepacker.hpp
new file mode 100755
index 0000000000..346229bb62
--- /dev/null
+++ b/twrpRepacker.hpp
@@ -0,0 +1,48 @@
+/*
+	Copyright 2014 to 2020 TeamWin
+	This file is part of TWRP/TeamWin Recovery Project.
+
+	TWRP is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	TWRP is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with TWRP.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <string>
+#include "partitions.hpp"
+
+#ifndef TWRP_REPACKER
+#define TWRP_REPACKER
+
+enum Repack_Type {
+	REPLACE_NONE = 0,
+	REPLACE_RAMDISK = 1,
+	REPLACE_KERNEL = 2,
+};
+
+struct Repack_Options_struct {
+	Repack_Type Type;
+	bool Backup_First;
+	bool Disable_Verity;
+	bool Disable_Force_Encrypt;
+};
+
+class twrpRepacker {
+    public:
+        bool Backup_Image_For_Repack(TWPartition* Part, const std::string& Temp_Folder_Destination, const bool Create_Backup, const std::string& Backup_Name); // Prepares an image for repacking by unpacking it to the temp folder destination
+        std::string Unpack_Image(const std::string& Source_Path, const std::string& Temp_Folder_Destination, const bool Copy_Source, const bool Create_Destination = true); // Prepares an image for repacking by unpacking it to the temp folder destination and return the ramdisk format
+        bool Repack_Image_And_Flash(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options); // Repacks the boot image with a new kernel or a new ramdisk
+    private:
+    	bool Prepare_Empty_Folder(const std::string& Folder); // Creates an empty folder at Folder. If the folder already exists, the folder is deleted, then created
+    	std::string original_ramdisk_format;                  // Ramdisk format of boot partition
+	    std::string image_ramdisk_format;                     // Ramdisk format of boot image to repack from
+};
+#endif // TWRP_REPACKER
\ No newline at end of file
diff --git a/twrpTar.cpp b/twrpTar.cpp
index b2d0ea67eb..94667a5b4a 100644
--- a/twrpTar.cpp
+++ b/twrpTar.cpp
@@ -1471,7 +1471,7 @@ unsigned long long twrpTar::uncompressedSize(string filename) {
 		Command = "pigz -l '" + filename + "'";
 		/* if we set Command = "pigz -l " + tarfn + " | sed '1d' | cut -f5 -d' '";
 		we get the uncompressed size at once. */
-		TWFunc::Exec_Cmd(Command, result);
+		TWFunc::Exec_Cmd(Command, result, false);
 		if (!result.empty()) {
 			/* Expected output:
 			compressed original  reduced name
@@ -1496,7 +1496,7 @@ unsigned long long twrpTar::uncompressedSize(string filename) {
 			Command = "openaes dec --key \"" + password + "\" --in '" + filename + "' | pigz -l";
 			/* if we set Command = "pigz -l " + tarfn + " | sed '1d' | cut -f5 -d' '";
 			we get the uncompressed size at once. */
-			TWFunc::Exec_Cmd(Command, result);
+			TWFunc::Exec_Cmd(Command, result, false);
 			if (!result.empty()) {
 				LOGINFO("result was: '%s'\n", result.c_str());
 				/* Expected output:

From 774f7a1f53311befcf7a1edd07fff6b53408fecb Mon Sep 17 00:00:00 2001
From: nebrassy <nebras30@gmail.com>
Date: Mon, 26 Jul 2021 22:34:24 +0200
Subject: [PATCH 164/207] Repacker: refresh sizes before backing up boot

Change-Id: I001295739cb71fdbfc3c3bfe5cc150dc5215867c
---
 twrpRepacker.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index 2ee5b7d83d..83ae973fff 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -118,6 +118,7 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		return false;
 	}
 	DataManager::SetProgress(0);
+	PartitionManager.Update_System_Details();
 	TWPartition* part = PartitionManager.Find_Partition_By_Path("/boot");
 	if (part)
 		gui_msg(Msg("unpacking_image=Unpacking {1}...")(part->Get_Display_Name()));

From 6e2f36682315b21786de61bb8f7e3d867f9ae2d3 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sat, 31 Jul 2021 19:02:26 -0400
Subject: [PATCH 165/207] repacker: override slot for flashing images instead
 of using bootctrl

Bootctrl is being unreliable during repacking. This overrides the slot
while repacking recovery in boot.

Change-Id: I0a04357af4e5f24591792bcfb27ccbd10b0a813b
---
 partitionmanager.cpp | 6 ++++++
 partitions.hpp       | 1 +
 twrpRepacker.cpp     | 8 ++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 64723490f2..7914b92687 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2973,6 +2973,12 @@ void TWPartitionManager::Remove_Partition_By_Path(string Path) {
 	}
 }
 
+void TWPartitionManager::Override_Active_Slot(const string& Slot) {
+	LOGINFO("Overriding slot to '%s'\n", Slot.c_str());
+	Active_Slot_Display = Slot;
+	DataManager::SetValue("tw_active_slot", Slot);
+}
+
 void TWPartitionManager::Set_Active_Slot(const string& Slot) {
 	if (Slot != "A" && Slot != "B") {
 		LOGERR("Set_Active_Slot invalid slot '%s'\n", Slot.c_str());
diff --git a/partitions.hpp b/partitions.hpp
index dba9be889a..4840566f21 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -368,6 +368,7 @@ class TWPartitionManager
 	bool Flash_Image(string& path, string& filename);                         // Flashes an image to a selected partition from the partition list
 	bool Restore_Partition(struct PartitionSettings *part_settings);          // Restore the partitions based on type
 	TWAtomicInt stop_backup;
+	void Override_Active_Slot(const string& Slot);                            // Override the active slot for repacking
 	void Set_Active_Slot(const string& Slot);                                 // Sets the active slot to A or B
 	string Get_Active_Slot_Suffix();                                          // Returns active slot _a or _b
 	string Get_Active_Slot_Display();                                         // Returns active slot A or B for display purposes
diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index 83ae973fff..aff242ae4a 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -197,9 +197,9 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		LOGINFO("Switching slots to flash ramdisk to both partitions\n");
 		string Current_Slot = PartitionManager.Get_Active_Slot_Display();
 		if (Current_Slot == "A")
-			PartitionManager.Set_Active_Slot("B");
+			PartitionManager.Override_Active_Slot("B");
 		else
-			PartitionManager.Set_Active_Slot("A");
+			PartitionManager.Override_Active_Slot("A");
 		DataManager::SetProgress(.25);
 		if (!Backup_Image_For_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
 			return false;
@@ -243,8 +243,4 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		}
 		DataManager::SetProgress(1);
 		TWFunc::removeDir(REPACK_ORIG_DIR, false);
-		PartitionManager.Set_Active_Slot(Current_Slot);
-	}
-	TWFunc::removeDir(REPACK_NEW_DIR, false);
-	return true;
 }

From fc9e4382803406316f0c819ea123602e2a1839dd Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sat, 7 Aug 2021 14:34:06 -0400
Subject: [PATCH 166/207] repack: fix bad rebase

Change-Id: Ic266b48e0a94c18dfc942e1214b38e6a0f2e8100
---
 twrpRepacker.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index aff242ae4a..c45098ca53 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -243,4 +243,7 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		}
 		DataManager::SetProgress(1);
 		TWFunc::removeDir(REPACK_ORIG_DIR, false);
+	}
+	TWFunc::removeDir(REPACK_NEW_DIR, false);
+	return true;
 }

From fe1c237df84756beeea324f4e9eeb9b4369d0681 Mon Sep 17 00:00:00 2001
From: nebrassy <nebras30@gmail.com>
Date: Thu, 20 May 2021 13:03:30 +0200
Subject: [PATCH 167/207] Add an option to one click flash current booted TWRP
 ramdisk

Change-Id: I12303696698a5feaa43401bcac9e30d5b3b99a0c
---
 data.cpp                          |  4 +-
 gui/action.cpp                    | 18 ++++++
 gui/objects.hpp                   |  1 +
 gui/theme/common/landscape.xml    | 30 ++++++++++
 gui/theme/common/languages/en.xml |  7 +++
 gui/theme/common/portrait.xml     | 30 ++++++++++
 gui/theme/common/watch.xml        | 30 ++++++++++
 twinstall.cpp                     |  9 ++-
 twrpRepacker.cpp                  | 50 ++++++++++++++--
 twrpRepacker.hpp                  | 98 ++++++++++++++++---------------
 variables.h                       |  1 +
 11 files changed, 223 insertions(+), 55 deletions(-)

diff --git a/data.cpp b/data.cpp
index bfa7bc9dee..b0d44f158d 100755
--- a/data.cpp
+++ b/data.cpp
@@ -755,6 +755,8 @@ void DataManager::SetDefaultValues()
 	mPersist.SetValue(TW_TIME_ZONE_GUISEL, "CST6;CDT,M3.2.0,M11.1.0");
 	mPersist.SetValue(TW_TIME_ZONE_GUIOFFSET, "0");
 	mPersist.SetValue(TW_TIME_ZONE_GUIDST, "1");
+        mPersist.SetValue(TW_AUTO_REFLASHTWRP_VAR, "0");
+
 	mData.SetValue(TW_ACTION_BUSY, "0");
 	mData.SetValue("tw_wipe_cache", "0");
 	mData.SetValue("tw_wipe_dalvik", "0");
@@ -1155,4 +1157,4 @@ void DataManager::LoadTWRPFolderInfo(void)
 	string mainPath = GetCurrentStoragePath();
 	SetValue(TW_RECOVERY_FOLDER_VAR, TWFunc::Check_For_TwrpFolder());
 	mBackingFile = mainPath + GetStrValue(TW_RECOVERY_FOLDER_VAR) + '/' + TW_SETTINGS_FILE;
-}
\ No newline at end of file
+}
diff --git a/gui/action.cpp b/gui/action.cpp
index 494665c87c..dbe4ae74f3 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -237,6 +237,7 @@ GUIAction::GUIAction(xml_node<>* node)
 		ADD_ACTION(installapp);
 		ADD_ACTION(uninstalltwrpsystemapp);
 		ADD_ACTION(repackimage);
+		ADD_ACTION(reflashtwrp);
 		ADD_ACTION(fixabrecoverybootloop);
 		ADD_ACTION(applycustomtwrpfolder);
 #ifndef TW_EXCLUDE_NANO
@@ -2192,6 +2193,23 @@ int GUIAction::repackimage(std::string arg __unused)
 	return 0;
 }
 
+int GUIAction::reflashtwrp(std::string arg __unused)
+{
+	int op_status = 1;
+	twrpRepacker repacker;
+
+	operation_start("Repack Image");
+	if (!simulate)
+	{
+		if (!repacker.Flash_Current_Twrp())
+		goto exit;
+	} else
+		simulate_progress_bar();
+	op_status = 0;
+exit:
+	operation_end(op_status);
+	return 0;
+}
 int GUIAction::fixabrecoverybootloop(std::string arg __unused)
 {
 	int op_status = 1;
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 78ed94d489..2b6ec1cd73 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -370,6 +370,7 @@ class GUIAction : public GUIObject, public ActionObject
 	int installapp(std::string arg);
 	int uninstalltwrpsystemapp(std::string arg);
 	int repackimage(std::string arg);
+	int reflashtwrp(std::string arg);
 	int fixabrecoverybootloop(std::string arg);
 	int changeterminal(std::string arg);
 #ifndef TW_EXCLUDE_NANO
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index cdaf229cb8..2514a2783e 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -460,6 +460,13 @@
 				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
 					<data variable="tw_skip_digest_check_zip"/>
 				</listitem>
+				<listitem name="{@auto_reflashtwrp_chk=Automatically Reflash TWRP after flashing a ROM}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<data variable="tw_auto_reflashtwrp"/>
+				</listitem>
 				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">
 					<data variable="tw_install_reboot"/>
 				</listitem>
@@ -3083,6 +3090,13 @@
 				<listitem name="{@unmount_sys_install=Unmount System before installing a ZIP}">
 					<data variable="tw_unmount_system"/>
 				</listitem>
+				<listitem name="{@auto_reflashtwrp_chk=Automatically Reflash TWRP after flashing a ROM}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<data variable="tw_auto_reflashtwrp"/>
+				</listitem>
 			</listbox>
 
 			<checkbox>
@@ -3568,6 +3582,22 @@
 						<action function="page">repackselect</action>
 					</actions>
 				</listitem>
+				<listitem name="{@reflash_twrp=Flash Current TWRP}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<actions>
+						<action function="set">tw_repack_kernel=0</action>
+						<action function="set">tw_back=advanced</action>
+						<action function="set">tw_action=reflashtwrp</action>
+						<action function="set">tw_text1={@reflash_twrp_confirm=Flash Current TWRP?}</action>
+						<action function="set">tw_action_text1={@reflashing_twrp=Flashing TWRP...}</action>
+						<action function="set">tw_complete_text1={@reflash_twrp_complete=Done flashing TWRP}</action>
+						<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+						<action function="page">confirm_action</action>
+					</actions>
+				</listitem>
 				<listitem name="{@install_kernel=Install Kernel}">
 					<conditions>
 						<condition var1="tw_has_boot_slots" var2="1"/>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 74d35fab24..9e719dcc3f 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -317,6 +317,7 @@
 		<string name="settings_gen_s_hdr">General</string>
 		<string name="settings_gen_btn">General</string>
 		<string name="use_rmrf_chk">Use rm -rf instead of formatting</string>
+		<string name="auto_reflashtwrp_chk">Automatically Reflash TWRP after flashing a ROM</string>
 		<string name="use24clock_chk">Use 24-hour clock</string>
 		<string name="rev_navbar_chk">Reversed navbar layout</string>
 		<string name="simact_chk">Simulate actions for theme testing</string>
@@ -506,9 +507,15 @@
 		<string name="install_complete">Install Complete</string>
 		<string name="unpack_error">Error unpacking image.</string>
 		<string name="repack_error">Error repacking image.</string>
+		<string name="modified_ramdisk_error">ramdisk files have been modified, unable to create ramdisk to flash, fastboot boot twrp and try this option again or use the Install Recovery Ramdisk option.</string>
+		<string name="create_ramdisk_error">failed to create ramdisk to flash.</string>
 		<string name="unpacking_image">Unpacking {1}...</string>
 		<string name="repacking_image">Repacking {1}...</string>
 		<string name="repack_image_hdr">Select Image</string>
+		<string name="reflash_twrp">Flash current TWRP</string>
+		<string name="reflash_twrp_confirm">Flash current TWRP?</string>
+		<string name="reflashing_twrp">Flashing TWRP...</string>
+		<string name="reflash_twrp_complete">Done flashing TWRP</string>
 		<string name="fix_recovery_loop">Fix Recovery Bootloop</string>
 		<string name="fix_recovery_loop_confirm">Fix Recovery Bootloop?</string>
 		<string name="fixing_recovery_loop">Fixing Recovery Bootloop...</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 6c6ce47e47..125effe4c7 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -412,6 +412,13 @@
 				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
 					<data variable="tw_skip_digest_check_zip"/>
 				</listitem>
+				<listitem name="{@auto_reflashtwrp_chk=Automatically Reflash TWRP after flashing a ROM}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<data variable="tw_auto_reflashtwrp"/>
+				</listitem>
 				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">
 					<data variable="tw_install_reboot"/>
 				</listitem>
@@ -3257,6 +3264,13 @@
 				<listitem name="{@unmount_sys_install=Unmount System before installing a ZIP}">
 					<data variable="tw_unmount_system"/>
 				</listitem>
+				<listitem name="{@auto_reflashtwrp_chk=Automatically Reflash TWRP after flashing a ROM}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<data variable="tw_auto_reflashtwrp"/>
+				</listitem>
 			</listbox>
 
 			<button style="main_button_half_height">
@@ -3690,6 +3704,22 @@
 						<action function="page">repackselect</action>
 					</actions>
 				</listitem>
+				<listitem name="{@reflash_twrp=Flash Current TWRP}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<actions>
+						<action function="set">tw_repack_kernel=0</action>
+						<action function="set">tw_back=advanced</action>
+						<action function="set">tw_action=reflashtwrp</action>
+						<action function="set">tw_text1={@reflash_twrp_confirm=Flash Current TWRP?}</action>
+						<action function="set">tw_action_text1={@reflashing_twrp=Flashing TWRP...}</action>
+						<action function="set">tw_complete_text1={@reflash_twrp_complete=Done Flashing TWRP}</action>
+						<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+						<action function="page">confirm_action</action>
+						</actions>
+				</listitem>
 				<listitem name="{@install_kernel=Install Kernel}">
 					<conditions>
 						<condition var1="tw_has_boot_slots" var2="1"/>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index bb5951168b..3ce668a989 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -568,6 +568,13 @@
 				<listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
 					<data variable="tw_skip_digest_check_zip"/>
 				</listitem>
+				<listitem name="{@auto_reflashtwrp_chk=Automatically Reflash TWRP after flashing a ROM}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<data variable="tw_auto_reflashtwrp"/>
+				</listitem>
 				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">
 					<data variable="tw_install_reboot"/>
 				</listitem>
@@ -3760,6 +3767,13 @@
 				<listitem name="{@unmount_sys_install=Unmount System before installing a ZIP}">
 					<data variable="tw_unmount_system"/>
 				</listitem>
+				<listitem name="{@auto_reflashtwrp_chk=Automatically Reflash TWRP after flashing a ROM}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<data variable="tw_auto_reflashtwrp"/>
+				</listitem>
 			</listbox>
 
 			<action>
@@ -4314,6 +4328,22 @@
 						<action function="page">repackselect</action>
 					</actions>
 				</listitem>
+				<listitem name="{@reflash_twrp=Flash Current TWRP}">
+					<conditions>
+						<condition var1="tw_has_boot_slots" var2="1"/>
+						<condition var1="tw_has_repack_tools" var2="1"/>
+					</conditions>
+					<actions>
+						<action function="set">tw_repack_kernel=0</action>
+						<action function="set">tw_back=advanced</action>
+						<action function="set">tw_action=reflashtwrp</action>
+						<action function="set">tw_text1={@reflash_twrp_confirm=Flash Current TWRP?}</action>
+						<action function="set">tw_action_text1={@reflashing_twrp=Flashing TWRP...}</action>
+						<action function="set">tw_complete_text1={@reflash_twrp_complete=Done Flashing TWRP}</action>
+						<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
+						<action function="page">confirm_action</action>
+						</actions>
+				</listitem>
 				<listitem name="{@install_kernel=Install Kernel}">
 					<conditions>
 						<condition var1="tw_has_boot_slots" var2="1"/>
diff --git a/twinstall.cpp b/twinstall.cpp
index 8c3c957b69..9dc70d1aa6 100755
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -63,6 +63,7 @@
 #include "legacy_property_service.h"
 #include "twinstall.h"
 #include "installcommand.h"
+#include "twrpRepacker.hpp"
 extern "C" {
 	#include "gui/gui.h"
 }
@@ -340,7 +341,7 @@ static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zi
 }
 
 int TWinstall_zip(const char* path, int* wipe_cache, bool check_for_digest) {
-	int ret_val, zip_verify = 1, unmount_system = 1;
+	int ret_val, zip_verify = 1, unmount_system = 1, reflashtwrp = 0;
 
 	if (strcmp(path, "error") == 0) {
 		LOGERR("Failed to get adb sideload file: '%s'\n", path);
@@ -461,7 +462,11 @@ int TWinstall_zip(const char* path, int* wipe_cache, bool check_for_digest) {
 			if (!system_mount_state)
 				PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), true);
 			gui_warn("flash_ab_reboot=To flash additional zips, please reboot recovery to switch to the updated slot.");
-
+			DataManager::GetValue(TW_AUTO_REFLASHTWRP_VAR, reflashtwrp);
+			if (reflashtwrp) {
+			twrpRepacker repacker;
+			repacker.Flash_Current_Twrp();
+			}
 		} else {
 			if (Zip.EntryExists("ui.xml")) {
 				LOGINFO("TWRP theme zip\n");
diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index c45098ca53..279069784e 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -129,8 +129,14 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 	if (!Backup_Image_For_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
 		return false;
 	DataManager::SetProgress(.25);
-	gui_msg(Msg("unpacking_image=Unpacking {1}...")(Target_Image));
-	image_ramdisk_format = Unpack_Image(Target_Image, REPACK_NEW_DIR, true);
+	if (Repack_Options.Type == REPLACE_RAMDISK_UNPACKED) {
+		if (!Prepare_Empty_Folder(REPACK_NEW_DIR))
+			return false;
+		image_ramdisk_format = "gzip";
+	} else {
+		gui_msg(Msg("unpacking_image=Unpacking {1}...")(Target_Image));
+		image_ramdisk_format = Unpack_Image(Target_Image, REPACK_NEW_DIR, true);
+	}
 	if (image_ramdisk_format.empty())
 		return false;
 	DataManager::SetProgress(.5);
@@ -142,6 +148,16 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 			LOGERR("Failed to copy ramdisk\n");
 			return false;
 		}
+	} else if (Repack_Options.Type == REPLACE_RAMDISK_UNPACKED) {
+			if (TWFunc::copy_file(Target_Image, REPACK_ORIG_DIR "ramdisk.cpio", 0644)) {
+				LOGERR("Failed to copy ramdisk\n");
+				return false;
+			}
+			if (TWFunc::copy_file(Target_Image, REPACK_NEW_DIR "ramdisk.cpio", 0644)) {
+				LOGERR("Failed to copy ramdisk\n");
+				return false;
+			}
+		path = REPACK_ORIG_DIR;
 	} else if (Repack_Options.Type == REPLACE_RAMDISK) {
 		// Repack the ramdisk
 		if (TWFunc::copy_file(REPACK_NEW_DIR "ramdisk.cpio", REPACK_ORIG_DIR "ramdisk.cpio", 0644)) {
@@ -193,7 +209,7 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 	}
 	DataManager::SetProgress(1);
 	TWFunc::removeDir(REPACK_ORIG_DIR, false);
-	if (part->Is_SlotSelect() && Repack_Options.Type == REPLACE_RAMDISK) {
+	if (part->Is_SlotSelect()) { if (Repack_Options.Type == REPLACE_RAMDISK || Repack_Options.Type == REPLACE_RAMDISK_UNPACKED) {
 		LOGINFO("Switching slots to flash ramdisk to both partitions\n");
 		string Current_Slot = PartitionManager.Get_Active_Slot_Display();
 		if (Current_Slot == "A")
@@ -243,7 +259,33 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		}
 		DataManager::SetProgress(1);
 		TWFunc::removeDir(REPACK_ORIG_DIR, false);
-	}
+	}}
 	TWFunc::removeDir(REPACK_NEW_DIR, false);
 	return true;
 }
+
+bool twrpRepacker::Flash_Current_Twrp() {
+if (!TWFunc::Path_Exists("/ramdisk-files.txt")) {
+			LOGERR("can not find ramdisk-files.txt");
+			return false;
+		}
+		Repack_Options_struct Repack_Options;
+		Repack_Options.Disable_Verity = false;
+		Repack_Options.Disable_Force_Encrypt = false;
+		Repack_Options.Type = REPLACE_RAMDISK_UNPACKED;
+		Repack_Options.Backup_First = DataManager::GetIntValue("tw_repack_backup_first") != 0;
+		std::string verifyfiles = "cd / && sha256sum -c ramdisk-files.sha256sum";
+		if (TWFunc::Exec_Cmd(verifyfiles) != 0) {
+		gui_msg(Msg(msg::kError, "modified_ramdisk_error=ramdisk files have been modified, unable to create ramdisk to flash, fastboot boot twrp and try this option again or use the Install Recovery Ramdisk option."));
+			return false;
+		}
+		std::string command = "cd / && /sbin/cpio -H newc -o < ramdisk-files.txt > /tmp/currentramdisk.cpio && /sbin/gzip -f /tmp/currentramdisk.cpio";
+		if (TWFunc::Exec_Cmd(command) != 0) {
+			gui_msg(Msg(msg::kError, "create_ramdisk_error=failed to create ramdisk to flash."));
+			return false;
+		}
+		if (!Repack_Image_And_Flash("/tmp/currentramdisk.cpio.gz", Repack_Options))
+			return false;
+       else
+       return true;
+}
diff --git a/twrpRepacker.hpp b/twrpRepacker.hpp
index 346229bb62..e71f3dcb4f 100755
--- a/twrpRepacker.hpp
+++ b/twrpRepacker.hpp
@@ -1,48 +1,50 @@
-/*
-	Copyright 2014 to 2020 TeamWin
-	This file is part of TWRP/TeamWin Recovery Project.
-
-	TWRP is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	TWRP is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with TWRP.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string>
-#include "partitions.hpp"
-
-#ifndef TWRP_REPACKER
-#define TWRP_REPACKER
-
-enum Repack_Type {
-	REPLACE_NONE = 0,
-	REPLACE_RAMDISK = 1,
-	REPLACE_KERNEL = 2,
-};
-
-struct Repack_Options_struct {
-	Repack_Type Type;
-	bool Backup_First;
-	bool Disable_Verity;
-	bool Disable_Force_Encrypt;
-};
-
-class twrpRepacker {
-    public:
-        bool Backup_Image_For_Repack(TWPartition* Part, const std::string& Temp_Folder_Destination, const bool Create_Backup, const std::string& Backup_Name); // Prepares an image for repacking by unpacking it to the temp folder destination
-        std::string Unpack_Image(const std::string& Source_Path, const std::string& Temp_Folder_Destination, const bool Copy_Source, const bool Create_Destination = true); // Prepares an image for repacking by unpacking it to the temp folder destination and return the ramdisk format
-        bool Repack_Image_And_Flash(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options); // Repacks the boot image with a new kernel or a new ramdisk
-    private:
-    	bool Prepare_Empty_Folder(const std::string& Folder); // Creates an empty folder at Folder. If the folder already exists, the folder is deleted, then created
-    	std::string original_ramdisk_format;                  // Ramdisk format of boot partition
-	    std::string image_ramdisk_format;                     // Ramdisk format of boot image to repack from
-};
-#endif // TWRP_REPACKER
\ No newline at end of file
+/*
+	Copyright 2014 to 2020 TeamWin
+	This file is part of TWRP/TeamWin Recovery Project.
+
+	TWRP is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	TWRP is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with TWRP.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <string>
+#include "partitions.hpp"
+
+#ifndef TWRP_REPACKER
+#define TWRP_REPACKER
+
+enum Repack_Type {
+	REPLACE_NONE = 0,
+	REPLACE_RAMDISK = 1,
+	REPLACE_KERNEL = 2,
+	REPLACE_RAMDISK_UNPACKED = 3,
+};
+
+struct Repack_Options_struct {
+	Repack_Type Type;
+	bool Backup_First;
+	bool Disable_Verity;
+	bool Disable_Force_Encrypt;
+};
+
+class twrpRepacker {
+    public:
+        bool Backup_Image_For_Repack(TWPartition* Part, const std::string& Temp_Folder_Destination, const bool Create_Backup, const std::string& Backup_Name); // Prepares an image for repacking by unpacking it to the temp folder destination
+        std::string Unpack_Image(const std::string& Source_Path, const std::string& Temp_Folder_Destination, const bool Copy_Source, const bool Create_Destination = true); // Prepares an image for repacking by unpacking it to the temp folder destination and return the ramdisk format
+        bool Repack_Image_And_Flash(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options); // Repacks the boot image with a new kernel or a new ramdisk
+        bool Flash_Current_Twrp();
+    private:
+    	bool Prepare_Empty_Folder(const std::string& Folder); // Creates an empty folder at Folder. If the folder already exists, the folder is deleted, then created
+    	std::string original_ramdisk_format;                  // Ramdisk format of boot partition
+	    std::string image_ramdisk_format;                     // Ramdisk format of boot image to repack from
+};
+#endif // TWRP_REPACKER
diff --git a/variables.h b/variables.h
index a58484f88c..8efc902504 100644
--- a/variables.h
+++ b/variables.h
@@ -145,6 +145,7 @@
 #define TW_USE_SHA2                 "tw_use_sha2"
 #define TW_NO_SHA2                  "tw_no_sha2"
 #define TW_UNMOUNT_SYSTEM           "tw_unmount_system"
+#define TW_AUTO_REFLASHTWRP_VAR     "tw_auto_reflashtwrp"
 
 // Also used:
 //   tw_boot_is_mountable

From 3490f657c332442da7d5850792a0f4f1bd1876c7 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 1 Oct 2021 18:22:44 -0400
Subject: [PATCH 168/207] en.xml: fix capitalization

Change-Id: Ib67db5eb0ab7cf2b54622d69299edbb2e216a210
(cherry picked from commit 8f71b5a7ece4aea1db5ff4af399833b0fd94f52f)
---
 gui/theme/common/languages/en.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 9e719dcc3f..393808cf20 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -512,8 +512,8 @@
 		<string name="unpacking_image">Unpacking {1}...</string>
 		<string name="repacking_image">Repacking {1}...</string>
 		<string name="repack_image_hdr">Select Image</string>
-		<string name="reflash_twrp">Flash current TWRP</string>
-		<string name="reflash_twrp_confirm">Flash current TWRP?</string>
+		<string name="reflash_twrp">Flash Current TWRP</string>
+		<string name="reflash_twrp_confirm">Flash Current TWRP?</string>
 		<string name="reflashing_twrp">Flashing TWRP...</string>
 		<string name="reflash_twrp_complete">Done flashing TWRP</string>
 		<string name="fix_recovery_loop">Fix Recovery Bootloop</string>

From 363497bddb34e4a4dac66d3fb905410c51f5cbd6 Mon Sep 17 00:00:00 2001
From: nebrassy <nebras30@gmail.com>
Date: Sat, 7 Aug 2021 00:37:30 +0200
Subject: [PATCH 169/207] repack: correctly recompress ramdisk to the format of
 boot image

Change-Id: I90df3d2f63eb82a185d9af0d68e61c955cee9403
---
 twrpRepacker.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index 279069784e..93b70c22b2 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -175,7 +175,6 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		LOGERR("Disabling force encrypt is not implemented yet\n");
 	std::string command = "cd " + path + " && /sbin/magiskboot repack ";
 	if (original_ramdisk_format != image_ramdisk_format) {
-		command = command + "-n ";
 		recompress = true;
 	}
 
@@ -187,8 +186,8 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 	copy_compressed_image += "ramdisk-1.cpio";
 
 	if (recompress) {
-		std::string compress_cmd = "/sbin/magiskboot compress=" + image_ramdisk_format + " " + orig_compressed_image + " " + copy_compressed_image;
-		if (TWFunc::Exec_Cmd(compress_cmd) != 0) {
+		std::string decompress_cmd = "/sbin/magiskboot decompress " + orig_compressed_image + " " + copy_compressed_image;
+		if (TWFunc::Exec_Cmd(decompress_cmd) != 0) {
 			gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
 			return false;
 		}
@@ -227,14 +226,13 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		std::string command = "cd " + path + " && /sbin/magiskboot repack ";
 
 		if (original_ramdisk_format != image_ramdisk_format) {
-			command = command + "-n ";
 			recompress = true;
 		}
 		command += path + "boot.img";
 
 		if (recompress) {
-			std::string compress_cmd = "/sbin/magiskboot compress=" + image_ramdisk_format + " " + orig_compressed_image + " " + copy_compressed_image;
-			if (TWFunc::Exec_Cmd(compress_cmd) != 0) {
+			std::string decompress_cmd = "/sbin/magiskboot decompress " + orig_compressed_image + " " + copy_compressed_image;
+			if (TWFunc::Exec_Cmd(decompress_cmd) != 0) {
 				gui_msg(Msg(msg::kError, "repack_error=Error repacking image."));
 				return false;
 			}

From 0b77d46de6e2ae07267e8238231c0ccae8866d1a Mon Sep 17 00:00:00 2001
From: Aseem Athale <athaleaseem@gmail.com>
Date: Mon, 8 Nov 2021 13:12:30 +0530
Subject: [PATCH 170/207] theme: Capitalize EDL

TWRP used 'Edl', but everywhere else, it is 'EDL'.

Change-Id: I4f63185ffb96797da0d695b34857ee242cfa33e8
---
 gui/theme/common/landscape.xml                | 2 +-
 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/es.xml             | 2 +-
 gui/theme/common/languages/fr.xml             | 2 +-
 gui/theme/common/languages/hu.xml             | 2 +-
 gui/theme/common/languages/id.xml             | 2 +-
 gui/theme/common/languages/it.xml             | 2 +-
 gui/theme/common/languages/nl.xml             | 2 +-
 gui/theme/common/languages/pl.xml             | 2 +-
 gui/theme/common/languages/pt_BR.xml          | 2 +-
 gui/theme/common/languages/pt_PT.xml          | 2 +-
 gui/theme/common/languages/sk.xml             | 2 +-
 gui/theme/common/languages/sl.xml             | 2 +-
 gui/theme/common/languages/sv.xml             | 2 +-
 gui/theme/common/languages/tr.xml             | 2 +-
 gui/theme/common/languages/uk.xml             | 2 +-
 gui/theme/common/portrait.xml                 | 2 +-
 gui/theme/common/watch.xml                    | 2 +-
 gui/theme/extra-languages/languages/ja.xml    | 2 +-
 gui/theme/extra-languages/languages/zh_CN.xml | 2 +-
 gui/theme/extra-languages/languages/zh_TW.xml | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 2514a2783e..09efcb3457 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2827,7 +2827,7 @@
 					</actions>
 				</listitem>
 
-				<listitem name="{@rb_edl_btn=Edl}">
+				<listitem name="{@rb_edl_btn=EDL}">
 					<condition var1="tw_edl_mode" var2="1"/>
 					<actions>
 						<action function="set">tw_back=reboot</action>
diff --git a/gui/theme/common/languages/cz.xml b/gui/theme/common/languages/cz.xml
index 7f7fc3cb66..e15b2a72b4 100644
--- a/gui/theme/common/languages/cz.xml
+++ b/gui/theme/common/languages/cz.xml
@@ -262,7 +262,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Stáhnout</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Vypínání...</string>
 		<string name="swipe_power_off">Potáhnout pro vypnutí</string>
 		<string name="swipe_power_off_s">Vypnout</string>
diff --git a/gui/theme/common/languages/de.xml b/gui/theme/common/languages/de.xml
index 09b5c98c2a..92cf03c727 100644
--- a/gui/theme/common/languages/de.xml
+++ b/gui/theme/common/languages/de.xml
@@ -292,7 +292,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Ausschalten...</string>
 		<string name="swipe_power_off">Gerät ausschalten</string>
 		<string name="swipe_power_off_s">Ausschalten</string>
diff --git a/gui/theme/common/languages/el.xml b/gui/theme/common/languages/el.xml
index 8ac681d2d7..688299a96b 100644
--- a/gui/theme/common/languages/el.xml
+++ b/gui/theme/common/languages/el.xml
@@ -273,7 +273,7 @@
         <string name="rb_recovery_btn">Recovery</string>
         <string name="rb_bootloader_btn">Bootloader</string>
         <string name="rb_download_btn">Λήψη</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
         <string name="turning_off">Απενεργοποίηση...</string>
         <string name="swipe_power_off">Σύρετε για Απενεργοποίηση</string>
         <string name="swipe_power_off_s">Απενεργοποίηση</string>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 393808cf20..32005b00e3 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -293,7 +293,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Turning Off...</string>
 		<string name="swipe_power_off">Swipe to Power Off</string>
 		<string name="swipe_power_off_s">Power Off</string>
diff --git a/gui/theme/common/languages/es.xml b/gui/theme/common/languages/es.xml
index 06ea30e183..8ee763294b 100644
--- a/gui/theme/common/languages/es.xml
+++ b/gui/theme/common/languages/es.xml
@@ -264,7 +264,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Descarga</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Apagando...</string>
 		<string name="swipe_power_off">Desliza para Apagar</string>
 		<string name="swipe_power_off_s">Apagar</string>
diff --git a/gui/theme/common/languages/fr.xml b/gui/theme/common/languages/fr.xml
index 6ae3298ef6..6e824af512 100644
--- a/gui/theme/common/languages/fr.xml
+++ b/gui/theme/common/languages/fr.xml
@@ -260,7 +260,7 @@
         <string name="rb_recovery_btn">Récupération</string>
         <string name="rb_bootloader_btn">Amorçage</string>
         <string name="rb_download_btn">Télécharger</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
         <string name="turning_off">Arrêt en cours...</string>
         <string name="swipe_power_off">Glisser pour éteindre</string>
         <string name="swipe_power_off_s">Éteindre</string>
diff --git a/gui/theme/common/languages/hu.xml b/gui/theme/common/languages/hu.xml
index 96557ac7c4..2030889e0d 100644
--- a/gui/theme/common/languages/hu.xml
+++ b/gui/theme/common/languages/hu.xml
@@ -283,7 +283,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download mód</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Kikapcsolás...</string>
 		<string name="swipe_power_off">Csúsztasson a kikapcsoláshoz</string>
 		<string name="swipe_power_off_s">Kikapcsolás</string>
diff --git a/gui/theme/common/languages/id.xml b/gui/theme/common/languages/id.xml
index d20697896d..ef14d38757 100755
--- a/gui/theme/common/languages/id.xml
+++ b/gui/theme/common/languages/id.xml
@@ -293,7 +293,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Mematikan...</string>
 		<string name="swipe_power_off">Geser untuk Matikan</string>
 		<string name="swipe_power_off_s">Matikan Perangkat</string>
diff --git a/gui/theme/common/languages/it.xml b/gui/theme/common/languages/it.xml
index ec74d59a5a..3427710f83 100644
--- a/gui/theme/common/languages/it.xml
+++ b/gui/theme/common/languages/it.xml
@@ -283,7 +283,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Spegnimento in corso...</string>
 		<string name="swipe_power_off">Scorri per spegnere</string>
 		<string name="swipe_power_off_s">Spegni</string>
diff --git a/gui/theme/common/languages/nl.xml b/gui/theme/common/languages/nl.xml
index a913d9da5f..551b0dc70d 100644
--- a/gui/theme/common/languages/nl.xml
+++ b/gui/theme/common/languages/nl.xml
@@ -287,7 +287,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Wordt uitgeschakeld...</string>
 		<string name="swipe_power_off">Veeg om uit te schakelen</string>
 		<string name="swipe_power_off_s">Uitschakelen</string>
diff --git a/gui/theme/common/languages/pl.xml b/gui/theme/common/languages/pl.xml
index e337455a7f..697a7c4196 100644
--- a/gui/theme/common/languages/pl.xml
+++ b/gui/theme/common/languages/pl.xml
@@ -270,7 +270,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Wyłączanie...</string>
 		<string name="swipe_power_off">Przesuń, aby wyłączyć</string>
 		<string name="swipe_power_off_s">Wyłącz</string>
diff --git a/gui/theme/common/languages/pt_BR.xml b/gui/theme/common/languages/pt_BR.xml
index f540e4c457..9f717b5e82 100644
--- a/gui/theme/common/languages/pt_BR.xml
+++ b/gui/theme/common/languages/pt_BR.xml
@@ -262,7 +262,7 @@
 		<string name="rb_recovery_btn">Recuperação</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Baixar</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Desligar...</string>
 		<string name="swipe_power_off">Deslize para desligar</string>
 		<string name="swipe_power_off_s">Desligar</string>
diff --git a/gui/theme/common/languages/pt_PT.xml b/gui/theme/common/languages/pt_PT.xml
index 32463f1b97..ee589eb06a 100644
--- a/gui/theme/common/languages/pt_PT.xml
+++ b/gui/theme/common/languages/pt_PT.xml
@@ -291,7 +291,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Descarregar</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">A desligar...</string>
 		<string name="swipe_power_off">      Deslize para desligar</string>
 		<string name="swipe_power_off_s">Desligar</string>
diff --git a/gui/theme/common/languages/sk.xml b/gui/theme/common/languages/sk.xml
index f4e56ef997..e212f7d830 100644
--- a/gui/theme/common/languages/sk.xml
+++ b/gui/theme/common/languages/sk.xml
@@ -262,7 +262,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Stiahnuť</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Vypínanie...</string>
 		<string name="swipe_power_off">Potiahnite pre vypnutie</string>
 		<string name="swipe_power_off_s">Vypnúť</string>
diff --git a/gui/theme/common/languages/sl.xml b/gui/theme/common/languages/sl.xml
index 4259e625d5..ef0a692259 100644
--- a/gui/theme/common/languages/sl.xml
+++ b/gui/theme/common/languages/sl.xml
@@ -262,7 +262,7 @@
 		<string name="rb_recovery_btn">Obnovitev</string>
 		<string name="rb_bootloader_btn">Zagonski nalagalnik</string>
 		<string name="rb_download_btn">Prejmi</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Izklapljanje …</string>
 		<string name="swipe_power_off">Povlecite za izklop</string>
 		<string name="swipe_power_off_s">Izklopi</string>
diff --git a/gui/theme/common/languages/sv.xml b/gui/theme/common/languages/sv.xml
index c898957781..1f4368ca07 100644
--- a/gui/theme/common/languages/sv.xml
+++ b/gui/theme/common/languages/sv.xml
@@ -101,7 +101,7 @@
 		<string name="rb_system_btn">System</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Ladda ner</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Stänger av...</string>
 		<string name="settings_hdr">Inställningar</string>
 		<string name="settings_gen_s_hdr">Allmänt</string>
diff --git a/gui/theme/common/languages/tr.xml b/gui/theme/common/languages/tr.xml
index d86d494e54..15a1a31e7e 100644
--- a/gui/theme/common/languages/tr.xml
+++ b/gui/theme/common/languages/tr.xml
@@ -291,7 +291,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Kapatılıyor...</string>
 		<string name="swipe_power_off">Kapatmak için Kaydır</string>
 		<string name="swipe_power_off_s">Kapat</string>
diff --git a/gui/theme/common/languages/uk.xml b/gui/theme/common/languages/uk.xml
index 9b267d26ee..d48310bbf4 100644
--- a/gui/theme/common/languages/uk.xml
+++ b/gui/theme/common/languages/uk.xml
@@ -266,7 +266,7 @@
 		<string name="rb_recovery_btn">Рекавері</string>
 		<string name="rb_bootloader_btn">Завантажувач</string>
 		<string name="rb_download_btn">Режим завантаження</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">Вимкнення...</string>
 		<string name="swipe_power_off">Вимкнути</string>
 		<string name="swipe_power_off_s">Вимкнення</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 125effe4c7..d27aa53f93 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2983,7 +2983,7 @@
 					</actions>
 				</listitem>
 
-				<listitem name="{@rb_edl_btn=Edl}">
+				<listitem name="{@rb_edl_btn=EDL}">
 					<condition var1="tw_edl_mode" var2="1"/>
 					<actions>
 						<action function="set">tw_back=reboot</action>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 3ce668a989..d87d091168 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -3491,7 +3491,7 @@
 			<button style="main_button">
 				<condition var1="tw_edl_mode" var2="1"/>
 				<placement x="%col1_x_right%" y="%row11_y%"/>
-				<text>{@rb_edl_btn=Edl}</text>
+				<text>{@rb_edl_btn=EDL}</text>
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
diff --git a/gui/theme/extra-languages/languages/ja.xml b/gui/theme/extra-languages/languages/ja.xml
index 977b1708b1..9fe767baca 100644
--- a/gui/theme/extra-languages/languages/ja.xml
+++ b/gui/theme/extra-languages/languages/ja.xml
@@ -265,7 +265,7 @@
 		<string name="rb_recovery_btn">リカバリ</string>
 		<string name="rb_bootloader_btn">ブートローダー</string>
 		<string name="rb_download_btn">ダウンロード</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">電源を切っています...</string>
 		<string name="swipe_power_off">スワイプで電源を切る</string>
 		<string name="swipe_power_off_s">電源を切る</string>
diff --git a/gui/theme/extra-languages/languages/zh_CN.xml b/gui/theme/extra-languages/languages/zh_CN.xml
index 43bb3ffafc..e10a60aaa6 100644
--- a/gui/theme/extra-languages/languages/zh_CN.xml
+++ b/gui/theme/extra-languages/languages/zh_CN.xml
@@ -292,7 +292,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">正在关机…</string>
 		<string name="swipe_power_off">滑动滑块确认关机</string>
 		<string name="swipe_power_off_s">关机</string>
diff --git a/gui/theme/extra-languages/languages/zh_TW.xml b/gui/theme/extra-languages/languages/zh_TW.xml
index 0f9e826a60..1d9c693f68 100644
--- a/gui/theme/extra-languages/languages/zh_TW.xml
+++ b/gui/theme/extra-languages/languages/zh_TW.xml
@@ -292,7 +292,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Download</string>
-		<string name="rb_edl_btn">Edl</string>
+		<string name="rb_edl_btn">EDL</string>
 		<string name="turning_off">正在關機…</string>
 		<string name="swipe_power_off">滑動滑塊確認關機</string>
 		<string name="swipe_power_off_s">關機</string>

From 4bce54bcd7878dd8434c046eb740276cd4d8afd6 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 16 Sep 2021 10:04:26 -0400
Subject: [PATCH 171/207] Add exclusion criteria for "Fix Recovery Bootloop"

Should only be included on devices that use initramfs,
i.e. legacy SAR, recovery-in-boot

Change-Id: I2408fcd993e1e381f49b3d5ae860694b2fade4d2
---
 Android.mk                     | 7 +++++++
 data.cpp                       | 6 ++++++
 gui/theme/common/landscape.xml | 1 +
 gui/theme/common/portrait.xml  | 1 +
 gui/theme/common/watch.xml     | 1 +
 5 files changed, 16 insertions(+)

diff --git a/Android.mk b/Android.mk
index 826636faa7..d5e023fe9b 100755
--- a/Android.mk
+++ b/Android.mk
@@ -240,6 +240,13 @@ ifeq ($(TW_EXCLUDE_MTP),)
 endif
 endif
 
+ifeq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
+    LOCAL_CFLAGS += -DBOARD_USES_RECOVERY_AS_BOOT
+endif
+ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true)
+    LOCAL_CFLAGS += -DBOARD_BUILD_SYSTEM_ROOT_IMAGE
+endif
+
 #TWRP Build Flags
 ifeq ($(TW_EXCLUDE_MTP),)
     LOCAL_CFLAGS += -DTW_HAS_MTP
diff --git a/data.cpp b/data.cpp
index b0d44f158d..a40a7e59c8 100755
--- a/data.cpp
+++ b/data.cpp
@@ -781,6 +781,12 @@ void DataManager::SetDefaultValues()
 #endif
 	mPersist.SetValue(TW_UNMOUNT_SYSTEM, "1");
 
+#if defined BOARD_USES_RECOVERY_AS_BOOT && defined BOARD_BUILD_SYSTEM_ROOT_IMAGE
+	mConst.SetValue("tw_uses_initramfs", "1");
+#else
+	mConst.SetValue("tw_uses_initramfs", "0");
+#endif
+
 #ifdef TW_NO_SCREEN_TIMEOUT
 	mConst.SetValue("tw_screen_timeout_secs", "0");
 	mConst.SetValue("tw_no_screen_timeout", "1");
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 09efcb3457..ef0cb4f3b1 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -3612,6 +3612,7 @@
 					<conditions>
 						<condition var1="tw_has_boot_slots" var2="1"/>
 						<condition var1="tw_has_repack_tools" var2="1"/>
+						<condition var1="tw_uses_initramfs" var2="1"/>
 					</conditions>
 					<actions>
 						<action function="set">tw_back=advanced</action>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index d27aa53f93..9490a04cb6 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3734,6 +3734,7 @@
 					<conditions>
 						<condition var1="tw_has_boot_slots" var2="1"/>
 						<condition var1="tw_has_repack_tools" var2="1"/>
+						<condition var1="tw_uses_initramfs" var2="1"/>
 					</conditions>
 					<actions>
 						<action function="set">tw_back=advanced</action>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index d87d091168..825278093c 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -4358,6 +4358,7 @@
 					<conditions>
 						<condition var1="tw_has_boot_slots" var2="1"/>
 						<condition var1="tw_has_repack_tools" var2="1"/>
+						<condition var1="tw_uses_initramfs" var2="1"/>
 					</conditions>
 					<actions>
 						<action function="set">tw_back=advanced</action>

From a1ad7eb58234d8ad0354c4cf2015b0d9ce8abcd7 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Wed, 6 Oct 2021 11:38:18 -0400
Subject: [PATCH 172/207] crypto: only set crypto state and type if not already
 set

Move setting crypto state and type to functions and call those
functions rather than arbitrarily setting those props in every
case. This cleans up all the log spam from trying to set
read-only props, since they will now only get set if
they aren't already.

Change-Id: I392bee060d71c6ee50d0d92bf1b118d9049be41a
---
 partition.cpp        |  6 +++---
 partitionmanager.cpp | 30 +++++++++++++++++++-----------
 partitions.hpp       |  3 ++-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/partition.cpp b/partition.cpp
index d14c72d71f..2af1bf33ed 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -733,8 +733,8 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 bool TWPartition::Decrypt_FBE_DE() {
 if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 		DataManager::SetValue(TW_IS_FBE, 1);
-		property_set("ro.crypto.state", "encrypted");
-		property_set("ro.crypto.type", "file");
+		PartitionManager.Set_Crypto_State();
+		PartitionManager.Set_Crypto_Type("file");
 		LOGINFO("File Based Encryption is present\n");
 #ifdef TW_INCLUDE_FBE
 	Is_FBE = true;
@@ -755,7 +755,7 @@ if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 	while (!Decrypt_DE() && --retry_count)
 		usleep(2000);
 	if (retry_count > 0) {
-		property_set("ro.crypto.state", "encrypted");
+		PartitionManager.Set_Crypto_State();
 		Is_Encrypted = true;
 		Is_Decrypted = false;
 		DataManager::SetValue(TW_IS_ENCRYPTED, 1);
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 7914b92687..3ab22a0e1d 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -113,9 +113,18 @@ TWPartitionManager::TWPartitionManager(void) {
 #endif
 }
 
-int TWPartitionManager::Set_FDE_Encrypt_Status(void) {
-	property_set("ro.crypto.state", "encrypted");
-	property_set("ro.crypto.type", "block");
+void TWPartitionManager::Set_Crypto_State() {
+	char crypto_state[PROPERTY_VALUE_MAX];
+	property_get("ro.crypto.state", crypto_state, "error");
+	if (strcmp(crypto_state, "error") == 0)
+		property_set("ro.crypto.state", "encrypted");
+}
+
+int TWPartitionManager::Set_Crypto_Type(const char* crypto_type) {
+	char type_prop[PROPERTY_VALUE_MAX];
+	property_get("ro.crypto.type", type_prop, "error");
+	if (strcmp(type_prop, "error") == 0)
+		property_set("ro.crypto.type", crypto_type);
 	// Sleep for a bit so that services can start if needed
 	sleep(1);
 	return 0;
@@ -303,9 +312,9 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error,
 #ifdef TW_INCLUDE_CRYPTO
 	TWPartition* Decrypt_Data = Find_Partition_By_Path("/data");
 	if (Decrypt_Data && Decrypt_Data->Is_Encrypted && !Decrypt_Data->Is_Decrypted) {
-		property_set("ro.crypto.state", "encrypted");
+		Set_Crypto_State();
 		if (!Decrypt_Data->Key_Directory.empty() && Mount_By_Path(Decrypt_Data->Key_Directory, false)) {
-		property_set("ro.crypto.type", "file");
+		Set_Crypto_Type("file");
 #ifdef TW_INCLUDE_FBE_METADATA_DECRYPT
 			if (e4crypt_mount_metadata_encrypted(Decrypt_Data->Mount_Point, false, Decrypt_Data->Key_Directory, Decrypt_Data->Actual_Block_Device, &Decrypt_Data->Decrypted_Block_Device)) {
 				LOGINFO("Successfully decrypted metadata encrypted data partition with new block device: '%s'\n", Decrypt_Data->Decrypted_Block_Device.c_str());
@@ -349,7 +358,8 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error,
 				}
 			}
 		} else {
-			Set_FDE_Encrypt_Status();
+			Set_Crypto_State();
+			Set_Crypto_Type("block");
 			int password_type = cryptfs_get_password_type();
 			if (password_type == CRYPT_TYPE_DEFAULT) {
 				LOGINFO("Device is encrypted with the default password, attempting to decrypt.\n");
@@ -1799,7 +1809,7 @@ void TWPartitionManager::Check_Users_Decryption_Status() {
 
 int TWPartitionManager::Decrypt_Device(string Password, int user_id) {
 #ifdef TW_INCLUDE_CRYPTO
-	char crypto_state[PROPERTY_VALUE_MAX], crypto_blkdev[PROPERTY_VALUE_MAX];
+	char crypto_blkdev[PROPERTY_VALUE_MAX];
 	std::vector<TWPartition*>::iterator iter;
 
 	// Mount any partitions that need to be mounted for decrypt
@@ -1810,10 +1820,8 @@ int TWPartitionManager::Decrypt_Device(string Password, int user_id) {
 	}
 	property_set("twrp.mount_to_decrypt", "1");
 
-	property_get("ro.crypto.state", crypto_state, "error");
-	if (strcmp(crypto_state, "error") == 0) {
-		Set_FDE_Encrypt_Status();
-	}
+	Set_Crypto_State();
+	Set_Crypto_Type("block");
 
 	if (DataManager::GetIntValue(TW_IS_FBE)) {
 #ifdef TW_INCLUDE_FBE
diff --git a/partitions.hpp b/partitions.hpp
index 4840566f21..637471bd76 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -382,7 +382,8 @@ class TWPartitionManager
 	void close_uevent();                                                      // Closes the uevent netlink socket
 	void Add_Partition(TWPartition* Part);                                    // Adds a new partition to the Partitions vector
 	std::vector<users_struct>* Get_Users_List();                              // Returns pointer to list of users
-	int Set_FDE_Encrypt_Status();                                             // Sets encryption state for FDE devices (ro.crypto.state and ro.crypto.type)
+	void Set_Crypto_State();                                                  // Sets encryption state for devices (ro.crypto.state)
+	int Set_Crypto_Type(const char* crypto_type);                             // Sets encryption type for FDE (block) and FBE (file) devices (ro.crypto.type)
 
 private:
 	void Setup_Settings_Storage_Partition(TWPartition* Part);                 // Sets up settings storage

From 0f7f9a17529c1091df9966ed5e16b012cd438abb Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Fri, 9 Jul 2021 20:08:44 -0400
Subject: [PATCH 173/207] fbe formatting: add warning for fbe devices and
 remove unused string

Change-Id: Id7af18a4c39932d8685e3265bfa158494ffd10f0
(cherry picked from commit 2d54867daaeb374159355f06c8a295b32ad06bec)
---
 gui/theme/common/languages/en.xml | 1 +
 gui/theme/common/languages/id.xml | 1 -
 gui/theme/common/languages/nl.xml | 1 -
 gui/theme/common/languages/ru.xml | 1 -
 partition.cpp                     | 4 ++++
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 32005b00e3..ac603e6e65 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -751,6 +751,7 @@
 		<string name="flash_ab_both_slots">Flash to both slots</string>
 		<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
 		<string name="ozip_decrypt_finish">Ozip Decryption Finished!</string>
+		<string name="data_media_fbe_msg">TWRP will not recreate /data/media on an FBE device. Please reboot into your rom to create /data/media</string>
 		<string name="restore_system_context">Unable to get default context for {1} -- Android may not boot.</string>
 		<string name="change_twrp_folder_btn">Change TWRP folder</string>
 		<string name="change_twrp_folder_on_process">Changing TWRP folder</string>
diff --git a/gui/theme/common/languages/id.xml b/gui/theme/common/languages/id.xml
index ef14d38757..5ace582c60 100755
--- a/gui/theme/common/languages/id.xml
+++ b/gui/theme/common/languages/id.xml
@@ -743,7 +743,6 @@
 		<string name="flash_ab_both_slots">Flash ke kedua slot</string>
 		<string name="ozip_decrypt_decryption">Mulai mendekripsi Ozip ...</string>
 		<string name="ozip_decrypt_finish">Mendeskripsi Ozip selesai!</string>
-		<string name="fbe_wipe_msg">PERINGATAN: {1} dihapus. Perangkat FBE harus di-boot ke Android dan bukan Recovery untuk mengatur kebijakan FBE awal setelah penghapusan.</string>
 		<string name="fastboot_button">Fastboot</string>
 		<string name="enable_adb">Aktifkan ADB</string>
 		<string name="enable_fastboot">Aktifkan Fastboot</string>
diff --git a/gui/theme/common/languages/nl.xml b/gui/theme/common/languages/nl.xml
index 551b0dc70d..37e712a966 100644
--- a/gui/theme/common/languages/nl.xml
+++ b/gui/theme/common/languages/nl.xml
@@ -737,7 +737,6 @@
 		<string name="flash_ab_both_slots">Beide slots flashen</string>
 		<string name="ozip_decrypt_decryption">Ozip-ontsleutelen...</string>
 		<string name="ozip_decrypt_finish">Ozip-ontsleutelen gereed!</string>
-		<string name="fbe_wipe_msg">WAARSCHUWING: {1} gewist. FBE-apparaat dient opgestart te worden in Android, niet Recovery, om initieel FBE-beleid in werking te zetten na het wissen.</string>
 		<string name="fastboot_button">Fastboot</string>
 		<string name="enable_adb">ADB inschakelen</string>
 		<string name="enable_fastboot">Fastboot inschakelen</string>
diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index 63878576a9..37e6c0efb2 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -744,7 +744,6 @@
 		<string name="flash_ab_both_slots">Прошить в оба слота</string>
 		<string name="ozip_decrypt_decryption">Начало расшифровки Ozip...</string>
 		<string name="ozip_decrypt_finish">Расшифровка Ozip завершена!</string>
-		<string name="fbe_wipe_msg">ВНИМАНИЕ: {1} очищен. Устройство необходимо перезагрузить в ОС (не в рекавери) для установки начальной политики FBE после очистки.</string>
 		<string name="fastboot_button">Fastboot</string>
 		<string name="enable_adb">Включить ADB</string>
 		<string name="enable_fastboot">Включить Fastboot</string>
diff --git a/partition.cpp b/partition.cpp
index 2af1bf33ed..5bccd409ea 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -2068,6 +2068,10 @@ bool TWPartition::Wipe_Encryption() {
 #ifndef TW_OEM_BUILD
 		gui_msg("format_data_msg=You may need to reboot recovery to be able to use /data again.");
 #endif
+		if (Is_FBE) {
+			gui_msg(Msg(msg::kWarning, "data_media_fbe_msg=TWRP will not recreate /data/media on an FBE device. Please reboot into your rom to create /data/media."));
+		}
+
 		ret = true;
 		if (!Key_Directory.empty())
 			ret = PartitionManager.Wipe_By_Path(Key_Directory);

From dfeab0d5ae1bca5846aecee0d9e57af7c8e84021 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sat, 2 Oct 2021 20:47:33 -0400
Subject: [PATCH 174/207] mtp: don't create storage device after format data

Since we don't re-create data/media on FBE devices,
don't create an MTP storage device for it.

This fixes the bug when, after formatting data on
and FBE device, an empty Internal Storage appears
on the PC.

Change-Id: Iaafc5e3cde54c3ef6ffaf33f76d14c626b6e590d
---
 partition.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/partition.cpp b/partition.cpp
index 5bccd409ea..03eba4b1d0 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -1749,10 +1749,7 @@ bool TWPartition::Wipe(string New_File_System) {
 			}
 		}
 
-		if (Has_Data_Media && recreate_media) {
-			Recreate_Media_Folder();
-		}
-		if (Is_Storage && Mount(false))
+		if (Is_Storage && Mount(false) && !Is_FBE)
 			PartitionManager.Add_MTP_Storage(MTP_Storage_ID);
 	}
 
@@ -2059,17 +2056,18 @@ bool TWPartition::Wipe_Encryption() {
 	Is_Encrypted = false;
 	if (Wipe(Fstab_File_System)) {
 		Has_Data_Media = Save_Data_Media;
-		if (Has_Data_Media && !Symlink_Mount_Point.empty()) {
-			Recreate_Media_Folder();
-			if (Mount(false))
-				PartitionManager.Add_MTP_Storage(MTP_Storage_ID);
-		}
 		DataManager::SetValue(TW_IS_ENCRYPTED, 0);
 #ifndef TW_OEM_BUILD
 		gui_msg("format_data_msg=You may need to reboot recovery to be able to use /data again.");
 #endif
 		if (Is_FBE) {
 			gui_msg(Msg(msg::kWarning, "data_media_fbe_msg=TWRP will not recreate /data/media on an FBE device. Please reboot into your rom to create /data/media."));
+		} else {
+			if (Has_Data_Media && !Symlink_Mount_Point.empty()) {
+				Recreate_Media_Folder();
+				if (Mount(false))
+					PartitionManager.Add_MTP_Storage(MTP_Storage_ID);
+			}
 		}
 
 		ret = true;

From cfa637e0560dd894b955af83198d43a0ae35ecb1 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Wed, 10 Feb 2021 18:25:07 -0500
Subject: [PATCH 175/207] gui: add canceldecrypt page

Use refreshsizes action to update system details when
Cancel button is pressed at decryption prompt

Change-Id: I9e436b1c57664a5269f42dc1cda4f6097f7e3062
---
 gui/theme/common/landscape.xml | 42 +++++++++++++++++++++++++++-------
 gui/theme/common/portrait.xml  | 42 +++++++++++++++++++++++++++-------
 gui/theme/common/watch.xml     | 39 ++++++++++++++++++++++++-------
 3 files changed, 99 insertions(+), 24 deletions(-)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index ef0cb4f3b1..99cd126e74 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -4637,10 +4637,7 @@ edi				<conditions>
 			<button style="main_button_half_width_low">
 				<placement x="%indent%" y="%row6_y%"/>
 				<text>{@cancel_btn=Cancel}</text>
-				<actions>
-					<action function="set">tw_page_done=1</action>
-					<action function="page">main</action>
-				</actions>
+				<action function="page">canceldecrypt</action>
 			</button>
 
 			<button style="main_button_half_width_low">
@@ -4717,10 +4714,7 @@ edi				<conditions>
 			<button style="main_button_half_width">
 				<placement x="%col2_x_right%" y="%row15a_y%"/>
 				<text>{@cancel_btn=Cancel}</text>
-				<actions>
-					<action function="set">tw_page_done=1</action>
-					<action function="page">main</action>
-				</actions>
+				<action function="page">canceldecrypt</action>
 			</button>
 		</page>
 
@@ -4768,6 +4762,38 @@ edi				<conditions>
 			</action>
 		</page>
 
+		<page name="canceldecrypt">
+			<template name="page"/>
+
+			<text style="text_l">
+				<placement x="%col1_x_header%" y="%row3_header_y%"/>
+				<text>{@cancel_btn=Cancel}</text>
+			</text>
+
+			<text style="text_m">
+				<placement x="%col1_x_header%" y="%row4_header_y%"/>
+				<text>{@refresh_sizes_btn=Refresh Sizes}</text>
+			</text>
+
+			<template name="console"/>
+
+			<template name="progress_bar"/>
+
+			<action>
+				<action function="refreshsizes"/>
+			</action>
+
+			<action>
+				<conditions>
+					<condition var1="tw_operation_state" var2="1"/>
+				</conditions>
+				<actions>
+					<action function="set">tw_page_done=1</action>
+					<action function="page">main</action>
+				</actions>
+			</action>
+		</page>
+
 		<page name="terminalcommand">
 			<template name="page"/>
 
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 9490a04cb6..4f36e46f04 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -4760,10 +4760,7 @@
 			<button style="main_button_half_height">
 				<placement x="%indent%" y="%row10_y%"/>
 				<text>{@cancel_btn=Cancel}</text>
-				<actions>
-					<action function="set">tw_page_done=1</action>
-					<action function="page">main</action>
-				</actions>
+				<action function="page">canceldecrypt</action>
 			</button>
 
 			<button style="main_button_half_height">
@@ -4841,10 +4838,7 @@
 			<button style="main_button_half_height">
 				<placement x="%indent%" y="%row21a_y%"/>
 				<text>{@cancel_btn=Cancel}</text>
-				<actions>
-					<action function="set">tw_page_done=1</action>
-					<action function="page">main</action>
-				</actions>
+				<action function="page">canceldecrypt</action>
 			</button>
 
 			<button style="main_button_half_height">
@@ -4898,6 +4892,38 @@
 			</action>
 		</page>
 
+		<page name="canceldecrypt">
+			<template name="page"/>
+
+			<text style="text_l">
+				<placement x="%col1_x_header%" y="%row3_header_y%"/>
+				<text>{@cancel_btn=Cancel}</text>
+			</text>
+
+			<text style="text_m">
+				<placement x="%col1_x_header%" y="%row4_header_y%"/>
+				<text>{@refresh_sizes_btn=Refresh Sizes}</text>
+			</text>
+
+			<template name="console"/>
+
+			<template name="progress_bar"/>
+
+			<action>
+				<action function="refreshsizes"/>
+			</action>
+
+			<action>
+				<conditions>
+					<condition var1="tw_operation_state" var2="1"/>
+				</conditions>
+				<actions>
+					<action function="set">tw_page_done=1</action>
+					<action function="page">main</action>
+				</actions>
+			</action>
+		</page>
+
 		<page name="terminalcommand">
 			<template name="page"/>
 
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 825278093c..251e0f61a9 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -5458,10 +5458,7 @@
 			<button style="main_button_half_height">
 				<placement x="%col1_x_right%" y="%row4_y%"/>
 				<text>{@cancel_btn=Cancel}</text>
-				<actions>
-					<action function="set">tw_page_done=1</action>
-					<action function="page">main</action>
-				</actions>
+				<action function="page">canceldecrypt</action>
 			</button>
 
 			<template name="keyboardtemplate"/>
@@ -5522,10 +5519,7 @@
 				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
 				<image resource="back"/>
 				<condition var1="tw_busy" var2="0"/>
-				<actions>
-					<action function="set">tw_page_done=1</action>
-					<action function="page">main</action>
-				</actions>
+				<action function="page">canceldecrypt</action>
 			</button>
 
 			<button>
@@ -5626,6 +5620,35 @@
 			</action>
 		</page>
 
+		<page name="canceldecrypt">
+			<template name="page"/>
+
+			<template name="statusbar"/>
+
+			<text style="text_m">
+				<placement x="%col1_x_left%" y="%row1_header_y%"/>
+				<text>{@cancel_btn=Cancel} &gt; {@refresh_sizes_btn=Refresh Sizes}</text>
+			</text>
+
+			<template name="console"/>
+
+			<template name="progress_bar"/>
+
+			<action>
+				<action function="refreshsizes"/>
+			</action>
+
+			<action>
+				<conditions>
+					<condition var1="tw_operation_state" var2="1"/>
+				</conditions>
+				<actions>
+					<action function="set">tw_page_done=1</action>
+					<action function="page">main</action>
+				</actions>
+			</action>
+		</page>
+
 		<page name="terminalcommand">
 			<terminal>
 				<condition var1="tw_hide_kb" var2="0"/>

From 202df17e76db2bcecb98592ea83eace3e61ed6ba Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sun, 5 Sep 2021 15:11:07 -0400
Subject: [PATCH 176/207] copy log: add option to include logcat

Change-Id: I9689df4560d5209f385fbbc3e233859754b3ebbd
---
 data.cpp                          |  5 +++++
 gui/action.cpp                    |  4 ++++
 gui/theme/common/landscape.xml    |  9 ++++++++-
 gui/theme/common/languages/en.xml |  2 ++
 gui/theme/common/portrait.xml     |  9 ++++++++-
 gui/theme/common/watch.xml        |  7 +++++++
 twrp-functions.cpp                | 11 +++++++++++
 twrp-functions.hpp                |  1 +
 8 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/data.cpp b/data.cpp
index a40a7e59c8..bc31a65014 100755
--- a/data.cpp
+++ b/data.cpp
@@ -932,6 +932,11 @@ void DataManager::SetDefaultValues()
 
 	mData.SetValue("tw_enable_adb_backup", "0");
 
+	if (TWFunc::Path_Exists("/sbin/logcat"))
+		mConst.SetValue("tw_logcat_exists", "1");
+	else
+		mConst.SetValue("tw_logcat_exists", "0");
+
 	if (TWFunc::Path_Exists("/sbin/magiskboot"))
 		mConst.SetValue("tw_has_repack_tools", "1");
 	else
diff --git a/gui/action.cpp b/gui/action.cpp
index dbe4ae74f3..b23fdeb757 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -669,8 +669,10 @@ int GUIAction::copylog(std::string arg __unused)
 	{
 		string dst, curr_storage;
 		int copy_kernel_log = 0;
+		int copy_logcat = 1;
 
 		DataManager::GetValue("tw_include_kernel_log", copy_kernel_log);
+		DataManager::GetValue("tw_include_logcat", copy_logcat);
 		PartitionManager.Mount_Current_Storage(true);
 		curr_storage = DataManager::GetCurrentStoragePath();
 		dst = curr_storage + "/recovery.log";
@@ -678,6 +680,8 @@ int GUIAction::copylog(std::string arg __unused)
 		tw_set_default_metadata(dst.c_str());
 		if (copy_kernel_log)
 			TWFunc::copy_kernel_log(curr_storage);
+		if (copy_logcat)
+			TWFunc::copy_logcat(curr_storage);
 		sync();
 		gui_msg(Msg("copy_log=Copied recovery log to {1}")(dst));
 	} else
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 99cd126e74..ae9b4bea27 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2842,7 +2842,7 @@
 						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
 						<action function="page">rebootcheck</action>
 					</actions>
-				</button>
+				</listitem>
 			</listbox>
 
 			<button style="main_button">
@@ -3465,7 +3465,14 @@
 			</text>
 
 			<checkbox>
+				<condition var1="tw_logcat_exists" var2="1"/>
 				<placement x="%indent%" y="%row4_y%"/>
+				<text>{@include_logcat=Include Logcat}</text>
+				<data variable="tw_include_logcat" value="1"/>
+			</checkbox>
+
+			<checkbox>
+				<placement x="%indent%" y="%row6_y%"/>
 				<text>{@include_kernel_log=Include Kernel Log}</text>
 				<data variable="tw_include_kernel_log" value="1"/>
 			</checkbox>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index ac603e6e65..13b29758c0 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -740,7 +740,9 @@
 		<string name="twrp_adbbu_option">--twrp option is required to enable twrp adb backup</string>
 		<string name="partition_not_found">path: {1} not found in partititon list</string>
 		<string name="copy_kernel_log">Copied kernel log to {1}</string>
+		<string name="copy_logcat">Copied logcat to {1}</string>
 		<string name="include_kernel_log">Include Kernel Log</string>
+		<string name="include_logcat">Include Logcat</string>
 		<string name="sha2_chk">Use SHA2 for hashing</string>
 		<string name="unable_set_boot_slot">Error changing bootloader boot slot to {1}</string>
 		<string name="unmount_sys_install">Unmount System before installing a ZIP</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 4f36e46f04..4efed647c6 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2998,7 +2998,7 @@
 						<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
 						<action function="page">rebootcheck</action>
 					</actions>
-				</button>
+				</listitem>
 			</listbox>
 
 			<text style="text_m">
@@ -3586,7 +3586,14 @@
 			</text>
 
 			<checkbox>
+				<condition var1="tw_logcat_exists" var2="1"/>
 				<placement x="%indent%" y="%row4_y%"/>
+				<text>{@include_logcat=Include Logcat}</text>
+				<data variable="tw_include_logcat" value="1"/>
+			</checkbox>
+
+			<checkbox>
+				<placement x="%indent%" y="%row6_y%"/>
 				<text>{@include_kernel_log=Include Kernel Log}</text>
 				<data variable="tw_include_kernel_log" value="1"/>
 			</checkbox>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 251e0f61a9..171fc38252 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -266,6 +266,13 @@
 				<data variable="tw_include_kernel_log" value="1"/>
 			</checkbox>
 
+			<checkbox>
+				<condition var1="tw_logcat_exists" var2="1"/>
+				<placement x="%indent%" y="%row2_y%"/>
+				<text>{@include_logcat=Include Logcat}</text>
+				<data variable="tw_include_logcat" value="1"/>
+			</checkbox>
+
 			<slider>
 				<text>{@swipe_confirm=   Confirm}</text>
 				<actions>
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 983d277fa6..246d73e9ae 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1231,6 +1231,17 @@ void TWFunc::copy_kernel_log(string curr_storage) {
 	tw_set_default_metadata(dmesgDst.c_str());
 }
 
+void TWFunc::copy_logcat(string curr_storage) {
+	std::string logcatDst = curr_storage + "/logcat.txt";
+	std::string logcatCmd = "logcat -d";
+
+	std::string result;
+	Exec_Cmd(logcatCmd, result, false);
+	write_to_file(logcatDst, result);
+	gui_msg(Msg("copy_logcat=Copied logcat to {1}")(logcatDst));
+	tw_set_default_metadata(logcatDst.c_str());
+}
+
 bool TWFunc::isNumber(string strtocheck) {
 	int num = 0;
 	std::istringstream iss(strtocheck);
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index cd772e5a2f..0009c8b49d 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -113,6 +113,7 @@ class TWFunc
 	static void Disable_Stock_Recovery_Replace(); // Disable stock ROMs from replacing TWRP with stock recovery
 	static unsigned long long IOCTL_Get_Block_Size(const char* block_device);
 	static void copy_kernel_log(string curr_storage); // Copy Kernel Log to Current Storage (PSTORE/KMSG)
+	static void copy_logcat(string curr_storage); // Copy Logcat to Current Storage
 	static bool isNumber(string strtocheck); // return true if number, false if not a number
 	static int stream_adb_backup(string &Restore_Name); // Tell ADB Backup to Stream to TWRP from GUI selection
 	static std::string get_log_dir(); // return recovery log storage directory

From 5c1c24efcba5023a3abaae824eebc0465ae3e99d Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sun, 3 Oct 2021 01:30:44 -0400
Subject: [PATCH 177/207] repacker: add root overwrite warning

Change-Id: Ica03c62a04872cb0ff4705810a0e85efde0b0b54
(cherry picked from commit 210ebe3d4619c21ddaab44dfc37decbf79b9d2bc)
---
 gui/theme/common/languages/en.xml | 1 +
 twrpRepacker.cpp                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 13b29758c0..a85fa5334d 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -512,6 +512,7 @@
 		<string name="unpacking_image">Unpacking {1}...</string>
 		<string name="repacking_image">Repacking {1}...</string>
 		<string name="repack_image_hdr">Select Image</string>
+		<string name="repack_overwrite_warning">If device was previously rooted, then root has been overwritten and will need to be reinstalled.</string>
 		<string name="reflash_twrp">Flash Current TWRP</string>
 		<string name="reflash_twrp_confirm">Flash Current TWRP?</string>
 		<string name="reflashing_twrp">Flashing TWRP...</string>
diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index 93b70c22b2..dfe9cc9f1e 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -259,6 +259,7 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		TWFunc::removeDir(REPACK_ORIG_DIR, false);
 	}}
 	TWFunc::removeDir(REPACK_NEW_DIR, false);
+	gui_msg(Msg(msg::kWarning, "repack_overwrite_warning=If device was previously rooted, then root has been overwritten and will need to be reinstalled."));
 	return true;
 }
 

From c13796a1203e59e685c6f17de51a0d1475e5abb7 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 4 Nov 2021 15:50:36 -0400
Subject: [PATCH 178/207] keyboard: add num template for PIN input

Credit for the xml updates:
fordownloads (vnukov.d03@gmail.com)
MrYacha (yacha@orangefox.tech)

Change-Id: Ie776b7de206dbeda122184052d474ebf5fbd7d68
---
 gui/theme/common/landscape.xml  | 68 +++++++++++++++++++++++++++++++++
 gui/theme/common/portrait.xml   | 68 +++++++++++++++++++++++++++++++++
 gui/theme/common/watch.xml      | 65 +++++++++++++++++++++++++++++++
 gui/theme/landscape_hdpi/ui.xml | 23 +++++++++++
 gui/theme/landscape_mdpi/ui.xml | 23 +++++++++++
 gui/theme/portrait_hdpi/ui.xml  | 24 ++++++++++++
 gui/theme/portrait_mdpi/ui.xml  | 24 ++++++++++++
 gui/theme/watch_mdpi/ui.xml     | 24 ++++++++++++
 8 files changed, 319 insertions(+)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index ae9b4bea27..542e4b6230 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -4596,6 +4596,11 @@ edi				<conditions>
 				<action function="page">decrypt_pattern</action>
 			</action>
 
+			<action>
+				<condition var1="tw_crypto_pwtype" var2="3"/>
+				<action function="page">decrypt_pin</action>
+			</action>
+
 			<text style="text_l">
 				<placement x="%col1_x_header%" y="%row3_header_y%"/>
 				<text>{@mount_hdr=Mount}</text>
@@ -4725,6 +4730,69 @@ edi				<conditions>
 			</button>
 		</page>
 
+		<page name="decrypt_pin">
+			<template name="page"/>
+
+			<text style="text_l">
+				<placement x="%col1_x_header%" y="%row3_header_y%"/>
+				<text>{@mount_hdr=Mount}</text>
+			</text>
+
+			<text style="text_m">
+				<placement x="%col1_x_header%" y="%row4_header_y%"/>
+				<text>{@decrypt_data_hdr=Decrypt Data}</text>
+			</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 PIN:}</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 PIN 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>
+				<data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display"/>
+				<restrict minlen="1" maxlen="254"/>
+				<action function="page">trydecrypt</action>
+			</input>
+
+			<fill color="%accent_color%">
+				<placement x="%col1_x_left%" y="row5_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<fill color="%text_fail_color%">
+				<condition var1="tw_password_fail" var2="1"/>
+				<placement x="%col1_x_left%" y="row5_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<text style="text_m_fail">
+				<condition var1="tw_password_fail" var2="1"/>
+				<placement x="%col1_x_left%" y="%row5_y%"/>
+				<text>{@decrypt_data_failed=PIN failed, please try again!}</text>
+			</text>
+
+			<button style="main_button_half_width_low">
+				<placement x="%indent%" y="%row6_y%"/>
+				<text>{@cancel_btn=Cancel}</text>
+				<action function="page">canceldecrypt</action>
+			</button>
+
+			<button style="main_button_half_width_low">
+				<placement x="%indent_right%" y="%row6_y%" placement="1"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="overlay">select_language</action>
+			</button>
+
+			<template name="keyboardnum"/>
+		</page>
+
 		<page name="trydecrypt">
 			<template name="page"/>
 
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 4efed647c6..b742a6f8fe 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -4719,6 +4719,11 @@
 				<action function="page">decrypt_pattern</action>
 			</action>
 
+			<action>
+				<condition var1="tw_crypto_pwtype" var2="3"/>
+				<action function="page">decrypt_pin</action>
+			</action>
+
 			<text style="text_l">
 				<placement x="%col1_x_header%" y="%row3_header_y%"/>
 				<text>{@mount_hdr=Mount}</text>
@@ -4855,6 +4860,69 @@
 			</button>
 		</page>
 
+		<page name="decrypt_pin">
+			<template name="page"/>
+
+			<text style="text_l">
+				<placement x="%col1_x_header%" y="%row3_header_y%"/>
+				<text>{@mount_hdr=Mount}</text>
+			</text>
+
+			<text style="text_m">
+				<placement x="%col1_x_header%" y="%row4_header_y%"/>
+				<text>{@decrypt_data_hdr=Decrypt Data}</text>
+			</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 PIN:}</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 PIN 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>
+				<data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display"/>
+				<restrict minlen="1" maxlen="254"/>
+				<action function="page">trydecrypt</action>
+			</input>
+
+			<fill color="%accent_color%">
+				<placement x="%indent%" y="row4a_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<fill color="%text_fail_color%">
+				<condition var1="tw_password_fail" var2="1"/>
+				<placement x="%indent%" y="row4a_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<text style="text_m_fail">
+				<condition var1="tw_password_fail" var2="1"/>
+				<placement x="%indent%" y="%row5_y%"/>
+				<text>{@decrypt_data_failed=PIN failed, please try again!}</text>
+			</text>
+
+			<button style="main_button_half_height">
+				<placement x="%indent%" y="%row10_y%"/>
+				<text>{@cancel_btn=Cancel}</text>
+				<action function="page">canceldecrypt</action>
+			</button>
+
+			<button style="main_button_half_height">
+				<placement x="%center_x%" y="%row10_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="overlay">select_language</action>
+			</button>
+
+			<template name="keyboardnum"/>
+		</page>
+
 		<page name="trydecrypt">
 			<template name="page"/>
 
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 171fc38252..27a208e7d6 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -5416,6 +5416,11 @@
 				<action function="page">decrypt_pattern</action>
 			</action>
 
+			<action>
+				<condition var1="tw_crypto_pwtype" var2="3"/>
+				<action function="page">decrypt_pin</action>
+			</action>
+
 			<text style="text_m">
 				<placement x="%col1_x_left%" y="%row1_header_y%"/>
 				<text>{@mount_hdr=Mount} &gt; {@decrypt_data_hdr=Decrypt Data}</text>
@@ -5586,6 +5591,66 @@
 			</button>
 		</page>
 
+		<page name="decrypt_pin">
+			<template name="page"/>
+
+			<template name="statusbar"/>
+
+			<text style="text_m">
+				<placement x="%col1_x_left%" y="%row1_header_y%"/>
+				<text>{@mount_hdr=Mount} &gt; {@decrypt_data_hdr=Decrypt Data}</text>
+			</text>
+
+			<text style="text_m_accent">
+				<condition var1="tw_is_fbe" op="!=" var2="1"/>
+				<placement x="%col1_x_left%" y="%row1_y%"/>
+				<text>{@decrypt_data_enter_pass=Enter PIN:}</text>
+			</text>
+
+			<text style="text_m_accent">
+				<condition var1="tw_is_fbe" var2="1"/>
+				<placement x="%col1_x_left%" y="%row1_y%"/>
+				<text>{@decrypt_data_enter_pass_fbe=Enter PIN for User [%tw_crypto_user_id%]}</text>
+			</text>
+
+			<input>
+				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%input_height%"/>
+				<text>%tw_crypto_display%</text>
+				<data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display"/>
+				<restrict minlen="1" maxlen="254"/>
+				<action function="page">trydecrypt</action>
+			</input>
+
+			<fill color="%accent_color%">
+				<placement x="%col1_x_left%" y="row3_input_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<fill color="%text_fail_color%">
+				<condition var1="tw_password_fail" var2="1"/>
+				<placement x="%col1_x_left%" y="row3_input_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<text style="text_m_fail">
+				<condition var1="tw_password_fail" var2="1"/>
+				<placement x="%col1_x_left%" y="%row3_input_y%"/>
+				<text>{@decrypt_data_failed=PIN failed, please try again!}</text>
+			</text>
+
+			<button style="main_button_half_height">
+				<placement x="%col1_x_left%" y="%row4_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="page">settings_language</action>
+			</button>
+
+			<button style="main_button_half_height">
+				<placement x="%col1_x_right%" y="%row4_y%"/>
+				<text>{@cancel_btn=Cancel}</text>
+				<action function="page">canceldecrypt</action>
+			</button>
+
+			<template name="keyboardnum"/>
+		</page>
+
 		<page name="trydecrypt">
 			<template name="page"/>
 
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index 172788715a..4e39d4c364 100755
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -719,5 +719,28 @@
 				</layout4>
 			</keyboard>
 		</template>
+
+		<template name="keyboardnum">
+			<keyboard>
+				<placement x="0" y="%keyboard_y%" w="1920" h="512"/>
+				<keymargin x="6" y="6"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="40" y="4"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
+				<keylabel key="0:action" text="Enter" resource="enter"/>
+				<keylabel key=" " text="Space" resource="space"/>
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
+				<layout1>
+					<keysize height="127" width="376"/>
+					<row1 key01="396:" key02="1" key03="2" key04="3" key05="396:"/>
+					<row2 key01="396:" key02="4" key03="5" key04="6" key05="396:"/>
+					<row3 key01="396:" key02="7" key03="8" key04="9" key05="396:"/>
+					<row4 key01="396:" key02="376:c:8" key03="0" key04="378:action" key05="396:"/>
+				</layout1>
+			</keyboard>
+		</template>
 	</templates>
 </recovery>
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index b1b6dac890..42716ce324 100755
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -719,5 +719,28 @@
 				</layout4>
 			</keyboard>
 		</template>
+
+		<template name="keyboardnum">
+			<keyboard>
+				<placement x="0" y="%keyboard_y%" w="800" h="192"/>
+				<keymargin x="4" y="4"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="14" y="2"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
+				<keylabel key="0:action" text="Enter" resource="enter"/>
+				<keylabel key=" " text="Space" resource="space"/>
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
+				<layout1>
+					<keysize height="47" width="158"/>
+					<row1 key01="164:" key02="1" key03="2" key04="3" key05="164:"/>
+					<row2 key01="164:" key02="4" key03="5" key04="6" key05="164:"/>
+					<row3 key01="164:" key02="7" key03="8" key04="9" key05="164:"/>
+					<row4 key01="164:" key02="158:c:8" key03="0" key04="159:action" key05="164:"/>
+				</layout1>
+			</keyboard>
+		</template>
 	</templates>
 </recovery>
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index 95c227a56f..70df4e8865 100644
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -638,5 +638,29 @@
 				</layout4>
 			</keyboard>
 		</template>
+
+		<template name="keyboardnum">
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_y%" w="1080" h="644"/>
+				<keymargin x="8" y="8"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="12" y="0"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
+				<keylabel key="0:action" text="Enter" resource="enter"/>
+				<keylabel key=" " text="Space" resource="space"/>
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
+				<layout1>
+					<keysize height="160" width="212"/>
+					<row1 key01="225:" key02="1" key03="2" key04="3" key05="225:"/>
+					<row2 key01="225:" key02="4" key03="5" key04="6" key05="225:"/>
+					<row3 key01="225:" key02="7" key03="8" key04="9" key05="225:"/>
+					<row4 key01="225:" key02="212:c:8" key03="0" key04="214:action" key05="225:"/>
+				</layout1>
+			</keyboard>
+		</template>
 	</templates>
 </recovery>
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index c2cbd44d2a..9ed1a20a48 100755
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -638,5 +638,29 @@
 				</layout4>
 			</keyboard>
 		</template>
+
+		<template name="keyboardnum">
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_y%" w="480" h="284"/>
+				<keymargin x="4" y="4"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="6" y="0"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
+				<keylabel key="0:action" text="Enter" resource="enter"/>
+				<keylabel key=" " text="Space" resource="space"/>
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
+				<layout1>
+					<keysize height="70" width="94"/>
+					<row1 key01="100:" key02="1" key03="2" key04="3" key05="100:"/>
+					<row2 key01="100:" key02="4" key03="5" key04="6" key05="100:"/>
+					<row3 key01="100:" key02="7" key03="8" key04="9" key05="100:"/>
+					<row4 key01="100:" key02="94:c:8" key03="0" key04="95:action" key05="100:"/>
+				</layout1>
+			</keyboard>
+		</template>
 	</templates>
 </recovery>
diff --git a/gui/theme/watch_mdpi/ui.xml b/gui/theme/watch_mdpi/ui.xml
index 2af1249d84..967a4757e4 100644
--- a/gui/theme/watch_mdpi/ui.xml
+++ b/gui/theme/watch_mdpi/ui.xml
@@ -388,5 +388,29 @@
 				</layout4>
 			</keyboard>
 		</template>
+
+		<template name="keyboardnum">
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_y%" w="320" h="144"/>
+				<keymargin x="2" y="2"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="0" y="0"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
+				<keylabel key="0:action" text="Enter" resource="enter"/>
+				<keylabel key=" " text="Space" resource="space"/>
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
+				<layout1>
+					<keysize height="35" width="62"/>
+					<row1 key01="67:" key02="1" key03="2" key04="3" key05="67:"/>
+					<row2 key01="67:" key02="4" key03="5" key04="6" key05="67:"/>
+					<row3 key01="67:" key02="7" key03="8" key04="9" key05="67:"/>
+					<row4 key01="67:" key02="62:c:8" key03="0" key04="63:action" key05="67:"/>
+				</layout1>
+			</keyboard>
+		</template>
 	</templates>
 </recovery>

From 22be9c1a5edd39ec5483d1b3fb309b8515733d25 Mon Sep 17 00:00:00 2001
From: zhenyolka <zhenyolka@gmail.com>
Date: Mon, 8 Nov 2021 19:05:30 +0300
Subject: [PATCH 179/207] Handle XML files format properly

In A12 format of XML files changed to Android Binary XML
TWRP uses RapidXML to parse XMLs, but it don't support ABX format
So before parse check format of XML format and if it is in ABX, just ignore it for now

Change-Id: Ie40f5b3534db50143999984be22ade1d1af162e7
---
 partitionmanager.cpp | 44 +++++++++++++++++++++++++++++++-------------
 twrp-functions.cpp   | 16 ++++++++++++++++
 twrp-functions.hpp   |  1 +
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 3ab22a0e1d..01c1c9e11a 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1735,22 +1735,30 @@ void TWPartitionManager::Parse_Users() {
 			user.userId = to_string(userId);
 
 			// Attempt to get name of user. Fallback to user ID if this fails.
-			char* userFile = PageManager::LoadFileToBuffer("/data/system/users/" + to_string(userId) + ".xml", NULL);
-			if (userFile == NULL) 
-				user.userName = to_string(userId);
+			std::string path = "/data/system/users/" + to_string(userId) + ".xml";
+			if ((atoi(TWFunc::System_Property_Get("ro.build.version.sdk").c_str()) > 30) && TWFunc::Path_Exists(path)) {
+				if(!TWFunc::Check_Xml_Format(path))
+					user.userName = to_string(userId);
+			}
 			else {
-				xml_document<> *userXml = new xml_document<>();
-				userXml->parse<0>(userFile);
-				xml_node<>* userNode = userXml->first_node("user");
-				if (userNode == nullptr) {
+				char* userFile = PageManager::LoadFileToBuffer(path, NULL);
+				if (userFile == NULL) {
 					user.userName = to_string(userId);
-				} else {
-					xml_node<>* nameNode = userNode->first_node("name");
-					if (nameNode == nullptr)
+				}
+				else {
+					xml_document<> *userXml = new xml_document<>();
+					userXml->parse<0>(userFile);
+					xml_node<>* userNode = userXml->first_node("user");
+					if (userNode == nullptr) {
 						user.userName = to_string(userId);
-					else {
-						string userName = nameNode->value();
-						user.userName = userName + " (" + to_string(userId) + ")";
+					} else {
+						xml_node<>* nameNode = userNode->first_node("name");
+						if (nameNode == nullptr)
+							user.userName = to_string(userId);
+						else {
+							string userName = nameNode->value();
+							user.userName = userName + " (" + to_string(userId) + ")";
+						}
 					}
 				}
 			}
@@ -2876,6 +2884,16 @@ bool TWPartitionManager::Decrypt_Adopted() {
 		LOGERR("Cannot decrypt adopted storage because /data will not mount\n");
 		return false;
 	}
+
+	// In Android 12 xml format changed. Previously it was human-readable format with xml tags
+	// now it's ABX (Android Binary Xml). Sadly, rapidxml can't parse it, so check xml format firstly
+	std::string path = "/data/system/storage.xml";
+	if ((atoi(TWFunc::System_Property_Get("ro.build.version.sdk").c_str()) > 30) && TWFunc::Path_Exists(path))
+		if(!TWFunc::Check_Xml_Format(path)) {
+			LOGINFO("Android 12+: storage.xml is in ABX format. Skipping adopted storage decryption\n");
+			return false;
+		}
+
 	LOGINFO("Decrypt adopted storage starting\n");
 	char* xmlFile = PageManager::LoadFileToBuffer("/data/system/storage.xml", NULL);
 	xml_document<> *doc = NULL;
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 246d73e9ae..bc17c88a3a 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1519,4 +1519,20 @@ string TWFunc::Check_For_TwrpFolder(){
 exit:
 	return TW_DEFAULT_RECOVERY_FOLDER;
 }
+
+bool TWFunc::Check_Xml_Format(const std::string filename) {
+	std::string buffer(' ', 4);
+	std::string abx_hdr("ABX\x00", 4);
+	std::ifstream File;
+	File.open(filename);
+	if (File.is_open()) {
+		File.get(&buffer[0], buffer.size());
+		File.close();
+		// Android Binary Xml start from these bytes
+		if(!buffer.compare(0, abx_hdr.size(), abx_hdr))
+			return false; // bad format, not possible to parse
+	}
+	return true; // good format, possible to parse
+}
+
 #endif // ndef BUILD_TWRPTAR_MAIN
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 0009c8b49d..e686517399 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -124,6 +124,7 @@ class TWFunc
 	static bool Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path); // return encryption policy for path
 	static bool Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy); // set encryption policy for path
 	static string Check_For_TwrpFolder();
+	static bool Check_Xml_Format(const std::string filename); // Return whether a xml is in plain xml or ABX format
 
 private:
 	static void Copy_Log(string Source, string Destination);

From b7fd1eaea1d487064e636ccced34dc08733e723f Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sat, 13 Nov 2021 17:34:36 -0500
Subject: [PATCH 180/207] twrp release: 3.6.0 for a9

Change-Id: I3ceac6c55bcddb975eec6d92f09eceddf08098f2
---
 variables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.h b/variables.h
index 8efc902504..6889db3b3c 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.5.2_9"
+#define TW_MAIN_VERSION_STR       "3.6.0_9"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 #define TW_SETTINGS_FILE            ".twrps"
 #define TW_RECOVERY_NAME            "TWRP"

From 36aca764d90b27bf43ec5e6b4c79375b51c65205 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Mon, 15 Nov 2021 12:40:39 -0500
Subject: [PATCH 181/207] tzdata: remove any old symlinks in out folder

Change-Id: Ia1000b257a00f187ca43ad881b3035508c5cdb5c
---
 prebuilt/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 549a0c7324..049ebd026e 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -623,10 +623,12 @@ ifneq ($(TW_EXCLUDE_TZDATA), true)
 
     ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
         LOCAL_POST_INSTALL_CMD += \
+            rm -f $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/usr/share/zoneinfo/tzdata; \
             mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/usr/share/zoneinfo; \
             cp -f $(TARGET_OUT)/usr/share/zoneinfo/tzdata $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/usr/share/zoneinfo/;
     else
         LOCAL_POST_INSTALL_CMD += \
+            rm -f $(TARGET_RECOVERY_ROOT_OUT)/system/usr/share/zoneinfo/tzdata; \
             mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/usr/share/zoneinfo; \
             cp -f $(TARGET_OUT)/usr/share/zoneinfo/tzdata $(TARGET_RECOVERY_ROOT_OUT)/system/usr/share/zoneinfo/;
     endif

From fd445a79c07fb7d65c08503f0b1dc100bb22d446 Mon Sep 17 00:00:00 2001
From: LinkBoi00 <50962670+LinkBoi00@users.noreply.github.com>
Date: Fri, 13 Aug 2021 14:01:34 +0300
Subject: [PATCH 182/207] nano: Copy nano-related files to /sbin instead of
 /system

* It seems that when the system partition is mounted, nano cannot access the ramdisk files it needs to, and therefore errors (e.g. error opening terminal: pcansi)
* This patch addresses the said issue by moving the files nano needs to /sbin

Change-Id: I8a19a12a709b5ca20e449810a841ce421c038800
---
 etc/init.recovery.nano.rc |  2 +-
 prebuilt/Android.mk       | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/etc/init.recovery.nano.rc b/etc/init.recovery.nano.rc
index f57f656406..c8a3abe733 100644
--- a/etc/init.recovery.nano.rc
+++ b/etc/init.recovery.nano.rc
@@ -1,3 +1,3 @@
 on fs
-    export TERMINFO /system/etc/terminfo
+    export TERMINFO /sbin/etc/terminfo
     export TERM pcansi
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 049ebd026e..8769926e20 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -641,17 +641,10 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
 LOCAL_REQUIRED_MODULES := nano libncurses
-ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
-    LOCAL_POST_INSTALL_CMD += \
-        mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/nano; \
-        cp -rf external/nano/etc/* external/nano/syntax/*.nanorc $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/nano/; \
-        cp -rf external/libncurses/lib/terminfo $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/;
-else
-    LOCAL_POST_INSTALL_CMD += \
-        mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc/nano; \
-        cp -rf external/nano/etc/* external/nano/syntax/*.nanorc $(TARGET_RECOVERY_ROOT_OUT)/system/etc/nano/; \
-        cp -rf external/libncurses/lib/terminfo $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
-endif
+LOCAL_POST_INSTALL_CMD += \
+    mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/nano; \
+    cp -rf external/nano/etc/* external/nano/syntax/*.nanorc $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/nano/; \
+    cp -rf external/libncurses/lib/terminfo $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/;
 include $(BUILD_PHONY_PACKAGE)
 
 ifneq ($(TW_EXCLUDE_BASH), true)

From c497b2646d69198eda5f14c3411f68be1a0f47cf Mon Sep 17 00:00:00 2001
From: LinkBoi00 <50962670+LinkBoi00@users.noreply.github.com>
Date: Fri, 13 Aug 2021 14:36:39 +0300
Subject: [PATCH 183/207] prebuilt: bash: Copy bash related files to /sbin
 instead of /system

* It seems that when the system partition is mounted, bash cannot access the ramdisk files it needs to
* This patch addresses the said issue by moving the files bash needs to /sbin

Change-Id: I65788408b2f45b239467613a2c026f2ee410455b
---
 prebuilt/Android.mk | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 8769926e20..17636ae654 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -655,22 +655,12 @@ ifneq ($(TW_EXCLUDE_BASH), true)
 	LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
 	LOCAL_REQUIRED_MODULES := bash
 
-    ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
-        LOCAL_POST_INSTALL_CMD += \
-            mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash; \
-            cp -rf external/bash/etc/* $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/; \
-            sed -i 's/ro.cm.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/bashrc; \
-            sed -i 's/ro.lineage.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/bashrc; \
-            sed -i 's/ro.omni.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/bashrc; \
-            sed -i '/export TERM/d' $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/bash/bashrc;
-    else
-        LOCAL_POST_INSTALL_CMD += \
-            mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash; \
-            cp -rf external/bash/etc/* $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/; \
-            sed -i 's/ro.cm.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/bashrc; \
-            sed -i 's/ro.lineage.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/bashrc; \
-            sed -i 's/ro.omni.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/bashrc; \
-            sed -i '/export TERM/d' $(TARGET_RECOVERY_ROOT_OUT)/system/etc/bash/bashrc;
-    endif
+LOCAL_POST_INSTALL_CMD += \
+    mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/bash; \
+    cp -rf external/bash/etc/* $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/bash/; \
+    sed -i 's/ro.cm.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/bash/bashrc; \
+    sed -i 's/ro.lineage.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/bash/bashrc; \
+    sed -i 's/ro.omni.device/ro.product.device/' $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/bash/bashrc; \
+    sed -i '/export TERM/d' $(TARGET_RECOVERY_ROOT_OUT)/sbin/etc/bash/bashrc;
 	include $(BUILD_PHONY_PACKAGE)
 endif

From 168bc4caaedfdf655a71ba24a1c5a7f2b905a122 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 13 Aug 2021 19:49:31 +0300
Subject: [PATCH 184/207] action: Unmount vendor partition prior to switching
 slots

On some devices, having the vendor partition mounted makes
/vendor unable to be remounted after slot switching is done
Automatically unmount vendor partition prior to switching
slots to ensure /vendor is mountable afterwards

TEST: Mount vendor partition, then switch slots.
      Vendor partition should be unmounted when
      switching completes

[LinkBoi00] Adapt for android-9.0

Change-Id: Iac0a6ec0065256355778d319897f6ee10c8630df
---
 gui/action.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gui/action.cpp b/gui/action.cpp
index b23fdeb757..37534fa943 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1982,9 +1982,10 @@ int GUIAction::togglebacklight(std::string arg __unused)
 int GUIAction::setbootslot(std::string arg)
 {
 	operation_start("Set Boot Slot");
-	if (!simulate)
+	if (!simulate) {
+		PartitionManager.UnMount_By_Path("/vendor",true);
 		PartitionManager.Set_Active_Slot(arg);
-	else
+	} else
 		simulate_progress_bar();
 	operation_end(0);
 	return 0;

From ee353e0c6ceb3de689039d64a946dced10f9e6f2 Mon Sep 17 00:00:00 2001
From: LinkBoi00 <50962670+LinkBoi00@users.noreply.github.com>
Date: Tue, 16 Nov 2021 08:56:12 +0200
Subject: [PATCH 185/207] action: Only unmount /vendor if it actually exists

* Since commit 168bc4caaedfdf655a71ba24a1c5a7f2b905a122 the vendor partition gets unmounted prior to switching the slots. However, devices without a vendor partition (e.g. tissot's stock partition table) will have errors since the partition doesn't actually exist
* Therefore, it should be only mounted if that partition exists in the partition table

Change-Id: Id16ab55e25d05964ca0de1bf218914d66c2b0205
---
 gui/action.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gui/action.cpp b/gui/action.cpp
index 37534fa943..b51e8aa519 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1983,7 +1983,8 @@ int GUIAction::setbootslot(std::string arg)
 {
 	operation_start("Set Boot Slot");
 	if (!simulate) {
-		PartitionManager.UnMount_By_Path("/vendor",true);
+		if (PartitionManager.Find_Partition_By_Path("/vendor"))
+			PartitionManager.UnMount_By_Path("/vendor",true);
 		PartitionManager.Set_Active_Slot(arg);
 	} else
 		simulate_progress_bar();

From 14aeca548843f4f4a7068b62265ec72664500332 Mon Sep 17 00:00:00 2001
From: LinkBoi00 <50962670+LinkBoi00@users.noreply.github.com>
Date: Tue, 16 Nov 2021 09:22:19 +0200
Subject: [PATCH 186/207] gui: theme: Remove the TWRP app button from the
 reboot menu

* The TWRP app button results in a big delay to open the reboot page

Change-Id: I7390d5bff2142214dfb3e2aad821859ac03e8c2f
---
 gui/theme/common/landscape.xml | 18 ------------------
 gui/theme/common/portrait.xml  | 18 ------------------
 gui/theme/common/watch.xml     |  7 -------
 3 files changed, 43 deletions(-)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 542e4b6230..a3bbfa789b 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2734,13 +2734,6 @@
 		</page>
 
 		<page name="reboot">
-			<action>
-				<action function="checkforapp"></action>
-				<action function="page">reboot2</action>
-			</action>
-		</page>
-
-		<page name="reboot2">
 			<template name="page"/>
 
 			<text style="text_l">
@@ -2845,17 +2838,6 @@
 				</listitem>
 			</listbox>
 
-			<button style="main_button">
-				<condition var1="tw_app_install_status" var2="1"/>
-				<placement x="%center_x%" y="%row12_y%"/>
-				<text>{@reboot_install_app_hdr=Install TWRP App}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_appinstall_title={@reboot_hdr=Reboot}</action>
-					<action function="page">installapp</action>
-				</actions>
-			</button>
-
 			<text style="text_m">
 				<condition var1="tw_has_boot_slots" var2="1"/>
 				<placement x="%col1_x_header%" y="%row14_y%"/>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index b742a6f8fe..9d05082db6 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2890,13 +2890,6 @@
 		</page>
 
 		<page name="reboot">
-			<action>
-				<action function="checkforapp"></action>
-				<action function="page">reboot2</action>
-			</action>
-		</page>
-
-		<page name="reboot2">
 			<template name="page"/>
 
 			<text style="text_l">
@@ -3039,17 +3032,6 @@
 				</actions>
 			</button>
 
-			<button style="main_button_half_height">
-				<condition var1="tw_app_install_status" var2="1"/>
-				<placement x="%indent%" y="%row22_y%"/>
-				<text>{@reboot_install_app_hdr=Install TWRP App}</text>
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_appinstall_title={@reboot_hdr=Reboot}</action>
-					<action function="page">installapp</action>
-				</actions>
-			</button>
-
 			<action>
 				<touch key="home"/>
 				<action function="page">main</action>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 27a208e7d6..3684356109 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -3393,13 +3393,6 @@
 		</page>
 
 		<page name="reboot">
-			<action>
-				<action function="checkforapp"></action>
-				<action function="page">reboot2</action>
-			</action>
-		</page>
-
-		<page name="reboot2">
 			<template name="page"/>
 
 			<template name="statusbar"/>

From c6d463f75a464ff17d87197cc6d0ac663d83c2e4 Mon Sep 17 00:00:00 2001
From: LinkBoi00 <50962670+LinkBoi00@users.noreply.github.com>
Date: Tue, 16 Nov 2021 10:06:28 +0200
Subject: [PATCH 187/207] gui: theme: Switch to larger buttons in the reboot
 menu

Since the TWRP app button is gone from the reboot menu,
it would make sense to switch back to the larger buttons
for the slots and move down the active slot information
to fit the screen better

Change-Id: Iabf891da8799b063bb4902d583b67f0594b4fc19
---
 gui/theme/common/portrait.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 9d05082db6..1b48fb9896 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2996,11 +2996,11 @@
 
 			<text style="text_m">
 				<condition var1="tw_has_boot_slots" var2="1"/>
-				<placement x="%center_x%" y="%row15_y%" placement="5"/>
+				<placement x="%center_x%" y="%row17_y%" placement="5"/>
 				<text>{@current_boot_slot=Current Slot: %tw_active_slot%}</text>
 			</text>
 
-			<button style="main_button_half_height">
+			<button style="main_button">
 				<condition var1="tw_has_boot_slots" var2="1"/>
 				<placement x="%indent%" y="%row19_y%"/>
 				<text>{@boot_slot_a=Slot A}</text>
@@ -3016,7 +3016,7 @@
 				</actions>
 			</button>
 
-			<button style="main_button_half_height">
+			<button style="main_button">
 				<condition var1="tw_has_boot_slots" var2="1"/>
 				<placement x="%center_x%" y="%row19_y%"/>
 				<text>{@boot_slot_b=Slot B}</text>

From 543773227d45f84267dd101957cfb7077d6f0e45 Mon Sep 17 00:00:00 2001
From: nebrassy <nebras30@gmail.com>
Date: Thu, 18 Nov 2021 18:40:57 +0100
Subject: [PATCH 188/207] repacker: update partition details after switching
 slot

Change-Id: I9f6f396530ad40f70c02c917b01e9b8158add773
---
 twrpRepacker.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index dfe9cc9f1e..51645671a8 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -216,6 +216,7 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		else
 			PartitionManager.Override_Active_Slot("A");
 		DataManager::SetProgress(.25);
+		PartitionManager.Update_System_Details();
 		if (!Backup_Image_For_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
 			return false;
 		if (TWFunc::copy_file(REPACK_NEW_DIR "ramdisk.cpio", REPACK_ORIG_DIR "ramdisk.cpio", 0644)) {

From f940ba21b08706cf160eca8a021aa083c0bd1dac Mon Sep 17 00:00:00 2001
From: nkk71 <nkk71x@gmail.com>
Date: Fri, 24 Mar 2017 18:28:03 +0200
Subject: [PATCH 189/207] Adopted Storage: Add support for mixed mode sdcards

* Adds support for mixed adopted storage + removable
  storage partitioned sdcards.

* Also symlinks Adopted Storage datamedia folder to an
  available /sdcardN (N being 2 through 9) folder.

* Requires a suitable entry in fstab, for example:

    # Removable Storage
    /sd_ext ext4 /dev/block/mmcblk1p2 /dev/block/mmcblk1
        flags=storage;wipeingui;removable;encryptable=footer
    /external_sd vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1
        flags=storage;wipeingui;removable;encryptable=footer

  /sd_ext will be the mountpoint for adopted storage, and /sdcardN
  will become symlinked to /sd_ext/data/media[/0]

* Fix adopted storage nickname being ""

* Output adopted partition info after successful decrypt

* Mimic single lun code for multi lun devices:
  "Mount CurrentStoragePath if it's not /data"

Change-Id: I3874c09f1a1c3a81f04277e17f17cc03ecb4184a
---
 partition.cpp        | 34 +++++++++++++++++++++++++++++-----
 partitionmanager.cpp |  6 +++++-
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/partition.cpp b/partition.cpp
index 03eba4b1d0..8318c9bcba 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -1202,6 +1202,17 @@ void TWPartition::Setup_Data_Media() {
 		ExcludeAll(Mount_Point + "/.layout_version");
 		ExcludeAll(Mount_Point + "/system/storage.xml");
 	} else {
+		int i;
+		string path;
+		for (i = 2; i <= 9; i++) {
+			path = "/sdcard" + TWFunc::to_string(i);
+			if (!TWFunc::Path_Exists(path)) {
+				Make_Dir(path, false);
+				Symlink_Mount_Point = path;
+				LOGINFO("'%s' data/media emulated storage symlinked to %s.\n", Mount_Point.c_str(), Symlink_Mount_Point.c_str());
+				break;
+			}
+		}
 		if (Mount(true) && TWFunc::Path_Exists(Mount_Point + "/media/0")) {
 			Storage_Path = Mount_Point + "/media/0";
 			Symlink_Path = Storage_Path;
@@ -3344,7 +3355,14 @@ int TWPartition::Decrypt_Adopted() {
 	char type_guid[80];
 	char part_guid[80];
 
-	if (gpt_disk_get_partition_info(fd, 2, type_guid, part_guid) == 0) {
+	uint32_t p_num;
+	size_t last_digit = Primary_Block_Device.find_last_not_of("0123456789");
+	if ((last_digit != string::npos) && (last_digit != Primary_Block_Device.length()-1))
+		p_num = atoi(Primary_Block_Device.substr(last_digit + 1).c_str()) + 1;
+	else
+		p_num = 2;
+
+	if (gpt_disk_get_partition_info(fd, p_num, type_guid, part_guid) == 0) {
 		LOGINFO("type: '%s'\n", type_guid);
 		LOGINFO("part: '%s'\n", part_guid);
 		Adopted_GUID = part_guid;
@@ -3360,16 +3378,22 @@ int TWPartition::Decrypt_Adopted() {
 				 * to disable USB Mass Storage whenever adopted storage
 				 * is present.
 				 */
-				LOGINFO("Detected adopted storage, disabling USB mass storage mode\n");
-				DataManager::SetValue("tw_has_usb_storage", 0);
+				if (p_num == 2) {
+					// TODO: Properly detect mixed vs fully adopted storage. Maybe this
+					// should be moved to partitionmanager instead, and disable after
+					// checking all partitions. Also the presence of adopted storage does
+					// not necessarily mean it's being used as Internal Storage
+					LOGINFO("Detected adopted storage, disabling USB mass storage mode\n");
+					DataManager::SetValue("tw_has_usb_storage", 0);
+				}
 			}
 		}
 	}
 
 	if (Is_Adopted_Storage) {
-		string Adopted_Block_Device = Alternate_Block_Device + "p2";
+		string Adopted_Block_Device = Alternate_Block_Device + "p" + TWFunc::to_string(p_num);
 		if (!TWFunc::Path_Exists(Adopted_Block_Device)) {
-			Adopted_Block_Device = Alternate_Block_Device + "2";
+			Adopted_Block_Device = Alternate_Block_Device + TWFunc::to_string(p_num);
 			if (!TWFunc::Path_Exists(Adopted_Block_Device)) {
 				LOGINFO("Adopted block device does not exist\n");
 				goto exit;
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 01c1c9e11a..13a488c676 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2055,8 +2055,12 @@ int TWPartitionManager::usb_storage_enable(void) {
 			Mount2 = Find_Next_Storage(Mount1->Mount_Point, true);
 			if (Mount2 && Mount2->Mount_Point != Mount1->Mount_Point) {
 				Open_Lun_File(Mount2->Mount_Point, lun_file);
+			// Mimic single lun code: Mount CurrentStoragePath if it's not /data
+			} else if (TWFunc::Get_Root_Path(DataManager::GetCurrentStoragePath()) != "/data") {
+				Open_Lun_File(DataManager::GetCurrentStoragePath(), lun_file);
 			}
-		} else {
+		// Mimic single lun code: Mount CurrentStoragePath if it's not /data
+		} else if (TWFunc::Get_Root_Path(DataManager::GetCurrentStoragePath()) != "/data" && !Open_Lun_File(DataManager::GetCurrentStoragePath(), lun_file)) {
 			gui_err("unable_locate_storage=Unable to locate storage device.");
 			goto error_handle;
 		}

From 7671140bb96c4481172d52167bf5e8381f3420cf Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 18 Nov 2021 16:48:05 -0500
Subject: [PATCH 190/207] event-log-tags: force copy to recovery out

Change-Id: I230e60cae9bbf606be8fdd704b91288c8f8ed7f7
---
 Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index d5e023fe9b..53950348ea 100755
--- a/Android.mk
+++ b/Android.mk
@@ -530,11 +530,11 @@ ifeq ($(TWRP_INCLUDE_LOGCAT), true)
             ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
                 LOCAL_POST_INSTALL_CMD += \
                     $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc; \
-                    cp $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/;
+                    cp -f $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/;
             else
                 LOCAL_POST_INSTALL_CMD += \
                     $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc; \
-                    cp $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
+                    cp -f $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
             endif
         endif
     endif

From f46463a15c9515a5347798924767d2133eaafbe3 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 19 Nov 2021 17:34:33 -0500
Subject: [PATCH 191/207] ext4crypt: only include if TARGET_USERIMAGES_USE_EXT4
 is set

Fixes build error on legacy devices that don't have this defined

Change-Id: Iab74c5ab952bf1d142d981823ab67867a6f7d185
---
 Android.mk         | 2 --
 partitions.hpp     | 3 +++
 twrp-functions.cpp | 2 ++
 twrp-functions.hpp | 5 ++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 53950348ea..add042afd8 100755
--- a/Android.mk
+++ b/Android.mk
@@ -185,8 +185,6 @@ endif
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
     ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 28; echo $$?),0)
         LOCAL_CFLAGS += -DUSE_EXT4
-    endif
-    ifeq ($(shell test $(PLATFORM_SDK_VERSION) -le 28; echo $$?),0)
         LOCAL_C_INCLUDES += system/extras/ext4_utils \
             system/extras/ext4_utils/include \
 	    $(commands_TWRP_local_path)/crypto/ext4crypt
diff --git a/partitions.hpp b/partitions.hpp
index 637471bd76..58fcd818c5 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -26,7 +26,10 @@
 #include "exclude.hpp"
 #include "tw_atomic.hpp"
 #include "progresstracking.hpp"
+
+#ifdef USE_EXT4
 #include "ext4crypt_tar.h"
+#endif
 
 #define MAX_FSTAB_LINE_LENGTH 2048
 
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index bc17c88a3a..945f61dafc 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1396,6 +1396,7 @@ int TWFunc::Property_Override(string Prop_Name, string Prop_Value) {
 #endif
 }
 
+#ifdef USE_EXT4
 bool TWFunc::Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path) {
 #ifdef TW_INCLUDE_FBE
 	if (!TWFunc::Path_Exists(path)) {
@@ -1426,6 +1427,7 @@ bool TWFunc::Set_Encryption_Policy(std::string path, const ext4_encryption_polic
 #endif
 	return true;
 }
+#endif
 
 string TWFunc::Check_For_TwrpFolder(){
 	string oldFolder = "";
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index e686517399..4f3c5051c9 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -24,7 +24,8 @@
 
 #ifdef USE_FSCRYPT
 #include <ext4_utils/ext4_crypt.h>
-#else
+#endif
+#ifdef USE_EXT4
 #include "ext4crypt_tar.h"
 #endif
 
@@ -121,8 +122,10 @@ class TWFunc
 	static bool Is_TWRP_App_In_System(); // Check if the TWRP app is installed in the system partition
 	static void checkforapp();
 	static int Property_Override(string Prop_Name, string Prop_Value); // Override properties (including ro. properties)
+#ifdef USE_EXT4
 	static bool Get_Encryption_Policy(ext4_encryption_policy &policy, std::string path); // return encryption policy for path
 	static bool Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy); // set encryption policy for path
+#endif
 	static string Check_For_TwrpFolder();
 	static bool Check_Xml_Format(const std::string filename); // Return whether a xml is in plain xml or ABX format
 

From 0c4e6b85ed798393768e66fbfa866e679a21b6bf Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 19 Nov 2021 19:23:15 -0500
Subject: [PATCH 192/207] Fix build in 5.1 tree

Change-Id: Id1205f0dda771500f02195c53c5d49bb14c83fac
---
 partitionmanager.cpp | 2 +-
 twrp-functions.cpp   | 2 +-
 twrp-functions.hpp   | 2 +-
 twrpRepacker.cpp     | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 13a488c676..94b62c8064 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -2893,7 +2893,7 @@ bool TWPartitionManager::Decrypt_Adopted() {
 	// now it's ABX (Android Binary Xml). Sadly, rapidxml can't parse it, so check xml format firstly
 	std::string path = "/data/system/storage.xml";
 	if ((atoi(TWFunc::System_Property_Get("ro.build.version.sdk").c_str()) > 30) && TWFunc::Path_Exists(path))
-		if(!TWFunc::Check_Xml_Format(path)) {
+		if(!TWFunc::Check_Xml_Format(path.c_str())) {
 			LOGINFO("Android 12+: storage.xml is in ABX format. Skipping adopted storage decryption\n");
 			return false;
 		}
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 945f61dafc..96163f1962 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1522,7 +1522,7 @@ string TWFunc::Check_For_TwrpFolder(){
 	return TW_DEFAULT_RECOVERY_FOLDER;
 }
 
-bool TWFunc::Check_Xml_Format(const std::string filename) {
+bool TWFunc::Check_Xml_Format(const char* filename) {
 	std::string buffer(' ', 4);
 	std::string abx_hdr("ABX\x00", 4);
 	std::ifstream File;
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 4f3c5051c9..e61038e112 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -127,7 +127,7 @@ class TWFunc
 	static bool Set_Encryption_Policy(std::string path, const ext4_encryption_policy &policy); // set encryption policy for path
 #endif
 	static string Check_For_TwrpFolder();
-	static bool Check_Xml_Format(const std::string filename); // Return whether a xml is in plain xml or ABX format
+	static bool Check_Xml_Format(const char* filename); // Return whether a xml is in plain xml or ABX format
 
 private:
 	static void Copy_Log(string Source, string Destination);
diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index 51645671a8..ed1bbbce7e 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -16,6 +16,7 @@
 	along with TWRP.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <algorithm>
 #include <string>
 
 #include "data.hpp"

From 7ae713add967c124946829ad2f04298e09bd7b37 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 19 Nov 2021 20:17:38 -0500
Subject: [PATCH 193/207] One more path fix for partitionmanager

Change-Id: I877f293e1c411fe3450cf816e280ba02578ab1fd
---
 partitionmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 94b62c8064..f00e8e36a4 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1737,7 +1737,7 @@ void TWPartitionManager::Parse_Users() {
 			// Attempt to get name of user. Fallback to user ID if this fails.
 			std::string path = "/data/system/users/" + to_string(userId) + ".xml";
 			if ((atoi(TWFunc::System_Property_Get("ro.build.version.sdk").c_str()) > 30) && TWFunc::Path_Exists(path)) {
-				if(!TWFunc::Check_Xml_Format(path))
+				if(!TWFunc::Check_Xml_Format(path.c_str()))
 					user.userName = to_string(userId);
 			}
 			else {

From 66c9fb490fea86d17736ed945646af00e87620c5 Mon Sep 17 00:00:00 2001
From: nebrassy <nebras30@gmail.com>
Date: Sun, 21 Nov 2021 03:32:47 +0100
Subject: [PATCH 194/207] twrpRepacker: override slot back after flashing

and move updating partition details to the function

Change-Id: I6f27ab1191246b6a23e625b0e3459db9024691c7
(cherry picked from commit 0fc1ee2c1ab1775ac5f5115842b4aaea15ec9ad6)
---
 partitionmanager.cpp | 1 +
 twrpRepacker.cpp     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index f00e8e36a4..e58e8ff3f1 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -3007,6 +3007,7 @@ void TWPartitionManager::Override_Active_Slot(const string& Slot) {
 	LOGINFO("Overriding slot to '%s'\n", Slot.c_str());
 	Active_Slot_Display = Slot;
 	DataManager::SetValue("tw_active_slot", Slot);
+	PartitionManager.Update_System_Details();
 }
 
 void TWPartitionManager::Set_Active_Slot(const string& Slot) {
diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index ed1bbbce7e..c50435c2dc 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -217,7 +217,6 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 		else
 			PartitionManager.Override_Active_Slot("A");
 		DataManager::SetProgress(.25);
-		PartitionManager.Update_System_Details();
 		if (!Backup_Image_For_Repack(part, REPACK_ORIG_DIR, Repack_Options.Backup_First, gui_lookup("repack", "Repack")))
 			return false;
 		if (TWFunc::copy_file(REPACK_NEW_DIR "ramdisk.cpio", REPACK_ORIG_DIR "ramdisk.cpio", 0644)) {
@@ -262,6 +261,11 @@ bool twrpRepacker::Repack_Image_And_Flash(const std::string& Target_Image, const
 	}}
 	TWFunc::removeDir(REPACK_NEW_DIR, false);
 	gui_msg(Msg(msg::kWarning, "repack_overwrite_warning=If device was previously rooted, then root has been overwritten and will need to be reinstalled."));
+	string Current_Slot = PartitionManager.Get_Active_Slot_Display();
+		if (Current_Slot == "A")
+			PartitionManager.Override_Active_Slot("B");
+		else
+			PartitionManager.Override_Active_Slot("A");
 	return true;
 }
 

From 60642f05e8ad3526df6979e44dc15462145aad7a Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Mon, 22 Nov 2021 17:32:44 -0500
Subject: [PATCH 195/207] postinstall: fix logcat causing build to break

Change-Id: I334d26b04bfac217d276429ec74597a8255f934c
---
 Android.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index add042afd8..f084bc6f75 100755
--- a/Android.mk
+++ b/Android.mk
@@ -468,8 +468,8 @@ endif
 ifneq ($(TW_USE_TOOLBOX), true)
     ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0)
         LOCAL_POST_INSTALL_CMD += \
-            $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin && \
-            ln -sf /sbin/busybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh
+            $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin; \
+            ln -sf /sbin/busybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh;
     endif
 else
     ifneq ($(wildcard external/toybox/Android.mk),)
@@ -527,11 +527,11 @@ ifeq ($(TWRP_INCLUDE_LOGCAT), true)
             TWRP_REQUIRED_MODULES += event-log-tags
             ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
                 LOCAL_POST_INSTALL_CMD += \
-                    $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc; \
+                    mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc; \
                     cp -f $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/etc/;
             else
                 LOCAL_POST_INSTALL_CMD += \
-                    $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc; \
+                    mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc; \
                     cp -f $(TARGET_OUT_ETC)/event-log-tags $(TARGET_RECOVERY_ROOT_OUT)/system/etc/;
             endif
         endif
@@ -618,7 +618,7 @@ else
     LOCAL_ADDITIONAL_DEPENDENCIES := file_contexts.bin
 endif
 LOCAL_POST_INSTALL_CMD += \
-    $(hide) cp -f $(PRODUCT_OUT)/obj/ETC/file_contexts.bin_intermediates/file_contexts.concat.tmp $(TARGET_RECOVERY_ROOT_OUT)/file_contexts
+    cp -f $(PRODUCT_OUT)/obj/ETC/file_contexts.bin_intermediates/file_contexts.concat.tmp $(TARGET_RECOVERY_ROOT_OUT)/file_contexts;
 
 include $(BUILD_PHONY_PACKAGE)
 

From 4ea0719f9ccd161fe45a68aada29a7abcaf7a313 Mon Sep 17 00:00:00 2001
From: Ctapchuk <pilipenko0409@gmail.com>
Date: Sat, 13 Nov 2021 18:13:50 +0700
Subject: [PATCH 196/207] Update Russian language, sync with en.xml

Change-Id: I8ce2a4d9a8999c8e74d15ef2b86f840bd64423a8
---
 gui/theme/common/languages/ru.xml | 33 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index 37e6c0efb2..f8f6abcf1b 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -317,6 +317,7 @@
 		<string name="settings_gen_s_hdr">Основные</string>
 		<string name="settings_gen_btn">Основные</string>
 		<string name="use_rmrf_chk">Использовать rm -rf вместо форматирования</string>
+		<string name="auto_reflashtwrp_chk">Автоматически перепрошивать TWRP после установки прошивки</string>
 		<string name="use24clock_chk">Использовать 24-часовой формат времени</string>
 		<string name="rev_navbar_chk">Инвертировать порядок навигационных кнопок</string>
 		<string name="simact_chk">Имитация действий для тестирования темы</string>
@@ -334,7 +335,7 @@
 		<string name="time_zone_hdr">Часовой пояс</string>
 		<string name="sel_tz_list">Выбор часового пояса:</string>
 		<!-- Translator note: if it does not make sense to translate the locations or if it makes more sense,
-			 feel free to change the location listed or drop the location entirely and just call it UTC -6 -->
+				feel free to change the location listed or drop the location entirely and just call it UTC -6 -->
 		<string name="utcm11">(UTC-11, SST) о.Мидуэй, Самоа</string>
 		<string name="utcm10">(UTC-10, HAST) Гавайи</string>
 		<string name="utcm9">(UTC-9, AKST) Аляска</string>
@@ -506,9 +507,16 @@
 		<string name="install_complete">Установка завершена</string>
 		<string name="unpack_error">Ошибка распаковки образа.</string>
 		<string name="repack_error">Ошибка перепаковки образа.</string>
+		<string name="modified_ramdisk_error">файлы рамдиска были изменены, неудалось создать рамдиск для установки, используйте fastboot boot twrp и попробуйте эту функцию снова или воспользуйтесь Установка рекавери в ramdisk.</string>
+		<string name="create_ramdisk_error">неудалось создать рамдиск для установки.</string>
 		<string name="unpacking_image">Распаковка {1}...</string>
 		<string name="repacking_image">Перепаковка {1}...</string>
 		<string name="repack_image_hdr">Выбор образа</string>
+		<string name="repack_overwrite_warning">Если устройство ранее было рутовано, тогда рут перезапишется и нужно будет переустановить его.</string>
+		<string name="reflash_twrp">Установить текущее TWRP</string>
+		<string name="reflash_twrp_confirm">Установить текущее TWRP?</string>
+		<string name="reflashing_twrp">Установка TWRP...</string>
+		<string name="reflash_twrp_complete">TWRP успешно установлено</string>
 		<string name="fix_recovery_loop">Исправить циклическую перезагрузку рекавери</string>
 		<string name="fix_recovery_loop_confirm">Исправить циклическую перезагрузку рекавери?</string>
 		<string name="fixing_recovery_loop">Исправление циклической перезагрузки рекавери...</string>
@@ -518,16 +526,16 @@
 		<string name="decrypt_users">Расшифровка пользователей</string>
 		<string name="decrypt_users_selection">Выберите ID пользователя для расшифровки</string>
 		<string name="select_user">Выбор пользователя</string>
-        <string name="backup_storage_undecrypt_warning">В резервную копию не включены некоторые файлы пользователя {1}, потому что пользователь не расшифрован.</string>
-        <string name="decrypting_user_fbe">Попытка расшифровать FBE пользователя {1}...</string>
+		<string name="backup_storage_undecrypt_warning">В резервную копию не включены некоторые файлы пользователя {1}, потому что пользователь не расшифрован.</string>
+		<string name="decrypting_user_fbe">Попытка расшифровать FBE пользователя {1}...</string>
 		<string name="decrypt_user_success_fbe">Пользователь {1} расшифрован успешно</string>
 		<string name="decrypt_user_fail_fbe">Ошибка расшифровки пользователя {1}</string>
 		<string name="decrypt_data_enter_pass_fbe">Введите пароль пользователя [%tw_crypto_user_id%]</string>
 		<string name="decrypt_data_enter_pattern_fbe">Введите шаблон пользователя [%tw_crypto_user_id%]</string>
 		<string name="multiuser_warning1">Не все пользователи расшифрованы!</string>
-        <string name="multiuser_warning2">Резервное копирование или восстановление могут завершиться неудачно!</string>
+		<string name="multiuser_warning2">Резервное копирование или восстановление могут завершиться неудачно!</string>
 		<string name="multiuser_warning_accept">Всё равно продолжить</string>
-        <string name="multiuser_warning_hdr">Предупреждение о нескольких пользователях</string>
+		<string name="multiuser_warning_hdr">Предупреждение о нескольких пользователях</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Чтение SELinux-контекста не поддерживается ядром.</string>
@@ -628,7 +636,7 @@
 		<string name="cannot_resize">Невозможно изменить размер {1}.</string>
 		<string name="repair_resize">Восстановление {1} перед изменением размера.</string>
 		<string name="unable_resize">Не удаётся изменить размер {1}.</string>
-		<string name="no_digest_found" version="2">Отсутствует файл контрольной суммы для '{1}'. Пожалуйста отмените выбор проверки контрольных сумм при восстановлении.</string>
+		<string name="no_digest_found" version="2">Отсутствует файл контрольной суммы для '{1}'. Пожалуйста, отмените выбор проверки контрольных сумм при восстановлении.</string>
 		<string name="digest_fail_match" version="2">Контрольная сумма не соответствует '{1}'.</string>
 		<string name="digest_matched" version="2">Контрольная сумма соответствует '{1}'.</string>
 		<string name="fail_decrypt_tar">Не удаётся расшифровать tar-файл '{1}'</string>
@@ -733,7 +741,9 @@
 		<string name="twrp_adbbu_option">-- эта опция позволяет делать резервное копирование по ADB</string>
 		<string name="partition_not_found">путь: {1} отсутствует в списке разделов.</string>
 		<string name="copy_kernel_log">Kernel Log скопирован в {1}</string>
+		<string name="copy_logcat">Logcat скопирован в {1}</string>
 		<string name="include_kernel_log">Добавить Kernel Log</string>
+		<string name="include_logcat">Добавить Logcat</string>
 		<string name="sha2_chk">Использовать SHA2 для контрольных сумм (иначе - MD5)</string>
 		<string name="unable_set_boot_slot">Ошибка смены слота загрузки bootloader на {1}</string>
 		<string name="unmount_sys_install">Размонтировать System перед установкой ZIP</string>
@@ -744,16 +754,7 @@
 		<string name="flash_ab_both_slots">Прошить в оба слота</string>
 		<string name="ozip_decrypt_decryption">Начало расшифровки Ozip...</string>
 		<string name="ozip_decrypt_finish">Расшифровка Ozip завершена!</string>
-		<string name="fastboot_button">Fastboot</string>
-		<string name="enable_adb">Включить ADB</string>
-		<string name="enable_fastboot">Включить Fastboot</string>
-		<string name="fastboot_console_msg">Переход в режим Fastboot...</string>
-		<!-- Android Rescue Party trigger -->
-		<string name="rescue_party0">Обнаружен сбой Android Rescue Party! Возможные решения:</string>
-		<string name="rescue_party1"> 1. Очистить Cache и/или</string>
-		<string name="rescue_party2"> 2. Форматировать Data и/или</string>
-		<string name="rescue_party3"> 3. Заново установить прошивку.</string>
-		<string name="rescue_party4">Проблема: </string>
+		<string name="data_media_fbe_msg">TWRP не пересоздаёт /data/media на FBE устройствах. Пожалуйста, перезагрузитесь в систему чтобы создать /data/media</string>
 		<string name="restore_system_context">Невозможно получить контекст по умолчанию для {1} -- Android может не загрузиться.</string>
 		<string name="change_twrp_folder_btn">Сменить папку TWRP</string>
 		<string name="change_twrp_folder_on_process">Смена папки TWRP</string>

From 8d6dbd86c9bc0396b6300dd19d1a7f4d96761bfb Mon Sep 17 00:00:00 2001
From: kirillsvk <kirya.smir17@gmail.com>
Date: Fri, 3 Dec 2021 22:49:50 +0700
Subject: [PATCH 197/207] Russian language: fix spaces

Change-Id: I2e8a52421c4120cbdbc08de78a402c81fc3d73fd
---
 gui/theme/common/languages/ru.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index f8f6abcf1b..47f5faeafb 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -507,8 +507,8 @@
 		<string name="install_complete">Установка завершена</string>
 		<string name="unpack_error">Ошибка распаковки образа.</string>
 		<string name="repack_error">Ошибка перепаковки образа.</string>
-		<string name="modified_ramdisk_error">файлы рамдиска были изменены, неудалось создать рамдиск для установки, используйте fastboot boot twrp и попробуйте эту функцию снова или воспользуйтесь Установка рекавери в ramdisk.</string>
-		<string name="create_ramdisk_error">неудалось создать рамдиск для установки.</string>
+		<string name="modified_ramdisk_error">файлы рамдиска были изменены, не удалось создать рамдиск для установки, используйте fastboot boot twrp и попробуйте эту функцию снова или воспользуйтесь Установка рекавери в ramdisk.</string>
+		<string name="create_ramdisk_error">не удалось создать рамдиск для установки.</string>
 		<string name="unpacking_image">Распаковка {1}...</string>
 		<string name="repacking_image">Перепаковка {1}...</string>
 		<string name="repack_image_hdr">Выбор образа</string>

From a763dcd474a573ff5d5ef18d3ab1635350387372 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Tue, 7 Dec 2021 17:13:05 -0500
Subject: [PATCH 198/207] vold_decrypt: don't update patch level if fastboot
 booting

Change-Id: Ia0959e6467c1c721199f92a4f8de2ebc5f20ee60
---
 crypto/vold_decrypt/vold_decrypt.cpp | 212 ++++++++++++++-------------
 1 file changed, 112 insertions(+), 100 deletions(-)

diff --git a/crypto/vold_decrypt/vold_decrypt.cpp b/crypto/vold_decrypt/vold_decrypt.cpp
index c718dda60f..b15135bee2 100755
--- a/crypto/vold_decrypt/vold_decrypt.cpp
+++ b/crypto/vold_decrypt/vold_decrypt.cpp
@@ -782,123 +782,135 @@ void Set_Needed_Properties(void) {
 
 void Update_Patch_Level(void) {
 	// On Oreo and above, keymaster requires Android version & patch level to match installed system
-	string sdkverstr = TWFunc::System_Property_Get("ro.build.version.sdk");
-	if (!sdkverstr.empty()) {
-		sdkver = atoi(sdkverstr.c_str());
-	}
-	if (sdkver <= 25) {
-		property_set("vold_decrypt.legacy_system", "true");
-	} else {
-		LOGINFO("Current system is Oreo or above. Setting OS version and security patch level from installed system...\n");
-		property_set("vold_decrypt.legacy_system", "false");
-	}
-
+	// (unless recovery is fastboot booted)
 	char prop_value[PROPERTY_VALUE_MAX];
-	char legacy_system_value[PROPERTY_VALUE_MAX] = "false";
-	property_get("vold_decrypt.legacy_system", prop_value, "");
-
-	// Only set OS ver and patch level if device uses Oreo+ system
-	if (strcmp(prop_value, legacy_system_value) == 0) {
-		property_get("ro.build.version.release", prop_value, "");
-		std::string osver_orig = prop_value;
-		property_set("vold_decrypt.osver_orig", osver_orig.c_str());
-		LOGINFO("Current OS version: %s\n", osver_orig.c_str());
-
-		int error = 0;
-		std::string osver = TWFunc::System_Property_Get("ro.build.version.release");
-		if (!(osver == osver_orig)) {
-			if (!(error = TWFunc::Property_Override("ro.build.version.release", osver))) {
-				LOGINFO("Property override successful! New OS version: %s\n", osver.c_str());
-			} else {
-				LOGERROR("Property override failed, code %d\n", error);
-				return;
-			}
-			// TODO: Confirm whether we actually need to update the props in prop.default
-			std::string sed_osver = "sed -i 's/ro.build.version.release=.*/ro.build.version.release=" + osver + "/g' /prop.default";
-			TWFunc::Exec_Cmd(sed_osver);
-			property_set("vold_decrypt.osver_set", "true");
+	property_get("ro.boot.fastboot", prop_value, "error");
+	if (strcmp(prop_value, "error") != 0) {
+		LOGINFO("Fastboot boot detected. Aborting patch level setting...\n");
+		return;
+	} else {
+		string sdkverstr = TWFunc::System_Property_Get("ro.build.version.sdk");
+		if (!sdkverstr.empty()) {
+			sdkver = atoi(sdkverstr.c_str());
+		}
+		if (sdkver <= 25) {
+			property_set("vold_decrypt.legacy_system", "true");
 		} else {
-			LOGINFO("Current OS version & System OS version already match. Proceeding to next step.\n");
-			property_set("vold_decrypt.osver_set", "false");
+			LOGINFO("Current system is Oreo or above. Setting OS version and security patch level from installed system...\n");
+			property_set("vold_decrypt.legacy_system", "false");
 		}
 
-		property_get("ro.build.version.security_patch", prop_value, "");
-		std::string patchlevel_orig = prop_value;
-		property_set("vold_decrypt.patchlevel_orig", patchlevel_orig.c_str());
-		LOGINFO("Current security patch level: %s\n", patchlevel_orig.c_str());
+		char legacy_system_value[PROPERTY_VALUE_MAX] = "false";
+		property_get("vold_decrypt.legacy_system", prop_value, "");
+
+		// Only set OS ver and patch level if device uses Oreo+ system
+		if (strcmp(prop_value, legacy_system_value) == 0) {
+			property_get("ro.build.version.release", prop_value, "");
+			std::string osver_orig = prop_value;
+			property_set("vold_decrypt.osver_orig", osver_orig.c_str());
+			LOGINFO("Current OS version: %s\n", osver_orig.c_str());
+
+			int error = 0;
+			std::string osver = TWFunc::System_Property_Get("ro.build.version.release");
+			if (!(osver == osver_orig)) {
+				if (!(error = TWFunc::Property_Override("ro.build.version.release", osver))) {
+					LOGINFO("Property override successful! New OS version: %s\n", osver.c_str());
+				} else {
+					LOGERROR("Property override failed, code %d\n", error);
+					return;
+				}
+				// TODO: Confirm whether we actually need to update the props in prop.default
+				std::string sed_osver = "sed -i 's/ro.build.version.release=.*/ro.build.version.release=" + osver + "/g' /prop.default";
+				TWFunc::Exec_Cmd(sed_osver);
+				property_set("vold_decrypt.osver_set", "true");
+			} else {
+				LOGINFO("Current OS version & System OS version already match. Proceeding to next step.\n");
+				property_set("vold_decrypt.osver_set", "false");
+			}
 
-		std::string patchlevel = TWFunc::System_Property_Get("ro.build.version.security_patch");
-		if (!(patchlevel == patchlevel_orig)) {
-			if (!(error = TWFunc::Property_Override("ro.build.version.security_patch", patchlevel))) {
-				LOGINFO("Property override successful! New security patch level: %s\n", patchlevel.c_str());
+			property_get("ro.build.version.security_patch", prop_value, "");
+			std::string patchlevel_orig = prop_value;
+			property_set("vold_decrypt.patchlevel_orig", patchlevel_orig.c_str());
+			LOGINFO("Current security patch level: %s\n", patchlevel_orig.c_str());
+
+			std::string patchlevel = TWFunc::System_Property_Get("ro.build.version.security_patch");
+			if (!(patchlevel == patchlevel_orig)) {
+				if (!(error = TWFunc::Property_Override("ro.build.version.security_patch", patchlevel))) {
+					LOGINFO("Property override successful! New security patch level: %s\n", patchlevel.c_str());
+				} else {
+					LOGERROR("Property override failed, code %d\n", error);
+					return;
+				}
+				// TODO: Confirm whether we actually need to update the props in prop.default
+				std::string sed_patchlevel = "sed -i 's/ro.build.version.security_patch=.*/ro.build.version.security_patch=" + patchlevel + "/g' /prop.default";
+				TWFunc::Exec_Cmd(sed_patchlevel);
+				property_set("vold_decrypt.patchlevel_set", "true");
 			} else {
-				LOGERROR("Property override failed, code %d\n", error);
-				return;
+				LOGINFO("Current security patch level & System security patch level already match. Proceeding to next step.\n");
+				property_set("vold_decrypt.patchlevel_set", "false");
 			}
-			// TODO: Confirm whether we actually need to update the props in prop.default
-			std::string sed_patchlevel = "sed -i 's/ro.build.version.security_patch=.*/ro.build.version.security_patch=" + patchlevel + "/g' /prop.default";
-			TWFunc::Exec_Cmd(sed_patchlevel);
-			property_set("vold_decrypt.patchlevel_set", "true");
+			return;
 		} else {
-			LOGINFO("Current security patch level & System security patch level already match. Proceeding to next step.\n");
-			property_set("vold_decrypt.patchlevel_set", "false");
+			LOGINFO("Current system is Nougat or older. Skipping OS version and security patch level setting...\n");
+			return;
 		}
-		return;
-	} else {
-		LOGINFO("Current system is Nougat or older. Skipping OS version and security patch level setting...\n");
-		return;
 	}
 }
 
 void Revert_Patch_Level(void) {
-	char osver_set[PROPERTY_VALUE_MAX];
-	char patchlevel_set[PROPERTY_VALUE_MAX];
-	char osver_patchlevel_set[PROPERTY_VALUE_MAX] = "false";
-
-	property_get("vold_decrypt.osver_set", osver_set, "");
-	property_get("vold_decrypt.patchlevel_set", patchlevel_set, "");
-
-	int osver_result = strcmp(osver_set, osver_patchlevel_set);
-	int patchlevel_result = strcmp(patchlevel_set, osver_patchlevel_set);
-	if (!(osver_result == 0 && patchlevel_result == 0)) {
-		char prop_value[PROPERTY_VALUE_MAX];
-		LOGINFO("Reverting OS version and security patch level to original TWRP values...\n");
-		property_get("vold_decrypt.osver_orig", prop_value, "");
-		std::string osver_orig = prop_value;
-		property_get("ro.build.version.release", prop_value, "");
-		std::string osver = prop_value;
-
-		int error = 0;
-		if (!(osver == osver_orig)) {
-			if (!(error = TWFunc::Property_Override("ro.build.version.release", osver_orig))) {
-				LOGINFO("Property override successful! Original OS version: %s\n", osver_orig.c_str());
-			} else {
-				LOGERROR("Property override failed, code %d\n", error);
-				return;
+	char prop_value[PROPERTY_VALUE_MAX];
+	property_get("ro.boot.fastboot", prop_value, "error");
+	if (strcmp(prop_value, "error") != 0) {
+		return;
+	} else {
+		char osver_set[PROPERTY_VALUE_MAX];
+		char patchlevel_set[PROPERTY_VALUE_MAX];
+		char osver_patchlevel_set[PROPERTY_VALUE_MAX] = "false";
+
+		property_get("vold_decrypt.osver_set", osver_set, "");
+		property_get("vold_decrypt.patchlevel_set", patchlevel_set, "");
+
+		int osver_result = strcmp(osver_set, osver_patchlevel_set);
+		int patchlevel_result = strcmp(patchlevel_set, osver_patchlevel_set);
+		if (!(osver_result == 0 && patchlevel_result == 0)) {
+			LOGINFO("Reverting OS version and security patch level to original TWRP values...\n");
+			property_get("vold_decrypt.osver_orig", prop_value, "");
+			std::string osver_orig = prop_value;
+			property_get("ro.build.version.release", prop_value, "");
+			std::string osver = prop_value;
+
+			int error = 0;
+			if (!(osver == osver_orig)) {
+				if (!(error = TWFunc::Property_Override("ro.build.version.release", osver_orig))) {
+					LOGINFO("Property override successful! Original OS version: %s\n", osver_orig.c_str());
+				} else {
+					LOGERROR("Property override failed, code %d\n", error);
+					return;
+				}
+				// TODO: Confirm whether we actually need to update the props in prop.default
+				std::string sed_osver_orig = "sed -i 's/ro.build.version.release=.*/ro.build.version.release=" + osver_orig + "/g' /prop.default";
+				TWFunc::Exec_Cmd(sed_osver_orig);
 			}
-			// TODO: Confirm whether we actually need to update the props in prop.default
-			std::string sed_osver_orig = "sed -i 's/ro.build.version.release=.*/ro.build.version.release=" + osver_orig + "/g' /prop.default";
-			TWFunc::Exec_Cmd(sed_osver_orig);
-		}
-
-		property_get("vold_decrypt.patchlevel_orig", prop_value, "");
-		std::string patchlevel_orig = prop_value;
-		property_get("ro.build.version.security_patch", prop_value, "");
-		std::string patchlevel = prop_value;
 
-		if (!(patchlevel == patchlevel_orig)) {
-			if (!(error = TWFunc::Property_Override("ro.build.version.security_patch", patchlevel_orig))) {
-				LOGINFO("Property override successful! Original security patch level: %s\n", patchlevel_orig.c_str());
-			} else {
-				LOGERROR("Property override failed, code %d\n", error);
-				return;
+			property_get("vold_decrypt.patchlevel_orig", prop_value, "");
+			std::string patchlevel_orig = prop_value;
+			property_get("ro.build.version.security_patch", prop_value, "");
+			std::string patchlevel = prop_value;
+
+			if (!(patchlevel == patchlevel_orig)) {
+				if (!(error = TWFunc::Property_Override("ro.build.version.security_patch", patchlevel_orig))) {
+					LOGINFO("Property override successful! Original security patch level: %s\n", patchlevel_orig.c_str());
+				} else {
+					LOGERROR("Property override failed, code %d\n", error);
+					return;
+				}
+				// TODO: Confirm whether we actually need to update the props in prop.default
+				std::string sed_patchlevel_orig = "sed -i 's/ro.build.version.security_patch=.*/ro.build.version.security_patch=" + patchlevel_orig + "/g' /prop.default";
+				TWFunc::Exec_Cmd(sed_patchlevel_orig);
 			}
-			// TODO: Confirm whether we actually need to update the props in prop.default
-			std::string sed_patchlevel_orig = "sed -i 's/ro.build.version.security_patch=.*/ro.build.version.security_patch=" + patchlevel_orig + "/g' /prop.default";
-			TWFunc::Exec_Cmd(sed_patchlevel_orig);
+		} else {
+			return;
 		}
-	} else {
-		return;
 	}
 }
 

From 2b4b6f0913f94cbc8bf29329126617c5fb818b43 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Wed, 29 Dec 2021 10:56:48 -0500
Subject: [PATCH 199/207] vold_decrypt: only include patch_level functions with
 libresetprop

The functions use the Property_Override function from libresetprop,
so don't include if libresetprop isn't included in build

Change-Id: I5eb210f17fea908ec35cb223e4a55066419f55dc
---
 crypto/vold_decrypt/vold_decrypt.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/vold_decrypt/vold_decrypt.cpp b/crypto/vold_decrypt/vold_decrypt.cpp
index b15135bee2..c6e16f11ba 100755
--- a/crypto/vold_decrypt/vold_decrypt.cpp
+++ b/crypto/vold_decrypt/vold_decrypt.cpp
@@ -780,6 +780,7 @@ void Set_Needed_Properties(void) {
 	property_set("vendor.sys.listeners.registered", "false");
 }
 
+#ifdef TW_INCLUDE_LIBRESETPROP // Patch_Level_Overrides
 void Update_Patch_Level(void) {
 	// On Oreo and above, keymaster requires Android version & patch level to match installed system
 	// (unless recovery is fastboot booted)
@@ -913,6 +914,7 @@ void Revert_Patch_Level(void) {
 		}
 	}
 }
+#endif // Patch_Level_Overrides
 
 static unsigned int get_blkdev_size(int fd) {
 	unsigned long nr_sec;

From cd15a0ba5ffc4174774ca41d10f156d169c3cdd9 Mon Sep 17 00:00:00 2001
From: theincognito-inc <imags.bondoo7@gmail.com>
Date: Sat, 25 Dec 2021 18:40:38 +0530
Subject: [PATCH 200/207] Change TWRP nano TERM env variable from pcansi to
 bg1.25

pcansi TERM has always had some display and/or scrolling (up, down, left or right) issues in nano on TWRP's embedded Terminal.
Most frequently seen is misaligned/displaced text on long lines and files, either initially or once scrolled through.
bg1.25 seems to be the most compatible TERM for all devices currently.

Change-Id: If00a8352ca3576085f69c12dffb5b21637c7b21c
(cherry picked from commit 546ebc391d621b4cabd4e521d47a38cf3140b43b)
---
 etc/init.recovery.nano.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/init.recovery.nano.rc b/etc/init.recovery.nano.rc
index c8a3abe733..8a4e9e172c 100644
--- a/etc/init.recovery.nano.rc
+++ b/etc/init.recovery.nano.rc
@@ -1,3 +1,3 @@
 on fs
     export TERMINFO /sbin/etc/terminfo
-    export TERM pcansi
+    export TERM bg1.25

From b1dab14bfb94de6305e68d8e26823391bd13c342 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 6 Jan 2022 20:00:21 -0500
Subject: [PATCH 201/207] vold_decrypt: fix unused function build errors

Change-Id: I32b04a4c5089f928a614f693415415ae8acbba26
---
 crypto/vold_decrypt/vold_decrypt.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/vold_decrypt/vold_decrypt.cpp b/crypto/vold_decrypt/vold_decrypt.cpp
index c6e16f11ba..26801a1fb4 100755
--- a/crypto/vold_decrypt/vold_decrypt.cpp
+++ b/crypto/vold_decrypt/vold_decrypt.cpp
@@ -243,6 +243,7 @@ bool Service_Exists(const string& initrc_svc) {
 	return (Get_Service_State(initrc_svc) != "error");
 }
 
+#ifdef TW_CRYPTO_SYSTEM_VOLD_SERVICES
 bool Is_Service_Running(const string& initrc_svc) {
 	return (Get_Service_State(initrc_svc) == "running");
 }
@@ -250,6 +251,7 @@ bool Is_Service_Running(const string& initrc_svc) {
 bool Is_Service_Stopped(const string& initrc_svc) {
 	return (Get_Service_State(initrc_svc) == "stopped");
 }
+#endif
 
 bool Start_Service(const string& initrc_svc, int utimeout = SLEEP_MAX_USEC) {
 	string res = "error";
@@ -293,9 +295,11 @@ bool is_Firmware_Mounted(void) {
 	return is_mounted;
 }
 
+#ifdef TW_CRYPTO_SYSTEM_VOLD_SERVICES
 bool will_VendorBin_Be_Symlinked(void) {
 	return (!is_Vendor_Mounted() && TWFunc::Path_Exists("/system/vendor"));
 }
+#endif
 
 bool Symlink_Vendor_Folder(void) {
 	bool is_vendor_symlinked = false;

From 593f5316c541288c2a11093d3b682bf03b5be33e Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Wed, 19 Jan 2022 13:25:54 -0500
Subject: [PATCH 202/207] Add TW_QCOM_ATS_OFFSET flag to manually set time/date
 offset

Needed if no ats_ files are present on qcom device

Offset is the difference between the current time
and the time since_epoch

To calculate the offset in Android, the following expression
(from a root shell) can be used:
echo "$(( ($(date +%s) - $(cat /sys/class/rtc/rtc0/since_epoch)) ))"

Add 3 zeros to the output and use that in the TW_QCOM_ATS_OFFSET
flag in your BoardConfig.mk

For example, if the result of the calculation is 1642433544,
use 1642433544000 as the offset

Change-Id: I5d58125dffc3fdbfb76a5ffde4e27659376185f1
---
 Android.mk         |  3 +++
 twrp-functions.cpp | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/Android.mk b/Android.mk
index f084bc6f75..cdbfe2ac8a 100755
--- a/Android.mk
+++ b/Android.mk
@@ -418,6 +418,9 @@ ifneq ($(TW_DEFAULT_LANGUAGE),)
 else
     LOCAL_CFLAGS += -DTW_DEFAULT_LANGUAGE=en
 endif
+ifneq ($(TW_QCOM_ATS_OFFSET),)
+	LOCAL_CFLAGS += -DTW_QCOM_ATS_OFFSET=$(TW_QCOM_ATS_OFFSET)
+endif
 ifneq ($(TW_CLOCK_OFFSET),)
 	LOCAL_CFLAGS += -DTW_CLOCK_OFFSET=$(TW_CLOCK_OFFSET)
 endif
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 96163f1962..463f77cfa6 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1068,6 +1068,16 @@ void TWFunc::Fixup_Time_On_Boot(const string& time_paths /* = "" */)
 	}
 
 	if (!fixed) {
+#ifdef TW_QCOM_ATS_OFFSET
+		// Offset is the difference between the current time and the time since_epoch
+		// To calculate the offset in Android, the following expression (from a root shell) can be used:
+		// echo "$(( ($(date +%s) - $(cat /sys/class/rtc/rtc0/since_epoch)) ))"
+		// Add 3 zeros to the output and use that in the TW_QCOM_ATS_OFFSET flag in your BoardConfig.mk
+		// For example, if the result of the calculation is 1642433544, use 1642433544000 as the offset
+		offset = (uint64_t) TW_QCOM_ATS_OFFSET;
+		DataManager::SetValue("tw_qcom_ats_offset", (unsigned long long) offset, 1);
+		LOGINFO("TWFunc::Fixup_Time: Setting time offset from TW_QCOM_ATS_OFFSET, offset %llu\n", (unsigned long long) offset);
+#else
 		// Failed to get offset from ats file, check twrp settings
 		unsigned long long value;
 		if (DataManager::GetValue("tw_qcom_ats_offset", value) < 0) {
@@ -1077,6 +1087,7 @@ void TWFunc::Fixup_Time_On_Boot(const string& time_paths /* = "" */)
 			LOGINFO("TWFunc::Fixup_Time: Setting time offset from twrp setting file, offset %llu\n", (unsigned long long) offset);
 			// Do not consider the settings file as a definitive answer, keep fixed=false so next run will try ats files again
 		}
+#endif
 	}
 
 	gettimeofday(&tv, NULL);

From 9cf5fe697c9e38cbef4c9f066fe0e08fd1fac7ef Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 31 Dec 2021 21:35:52 -0500
Subject: [PATCH 203/207] System_Property_Get: Allow specifying multiple prop
 file paths

Some OEMs include prop files in custom locations. Add these to
a list and parse when setting properties.

Use the flag TW_SYSTEM_BUILD_PROP_ADDITIONAL_PATHS followed
by a semi-colon-separated list of paths (relative to /system)
where the additional prop files can be found.

The standard build.prop file does not need to be specified and
will always be parsed.

Example:
TW_SYSTEM_BUILD_PROP_ADDITIONAL_PATHS := etc/buildinfo/oem_build.prop;etc/prop.default

Change-Id: Ie0e25c7d2575d928310ff1b4fc1aef44a83784ca
---
 Android.mk         |  4 ++++
 twrp-functions.cpp | 10 +++++-----
 twrp-functions.hpp |  2 +-
 twrp.cpp           | 25 +++++++++++++++++--------
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Android.mk b/Android.mk
index cdbfe2ac8a..30efc384c2 100755
--- a/Android.mk
+++ b/Android.mk
@@ -203,6 +203,10 @@ ifeq ($(AB_OTA_UPDATER),true)
     TWRP_REQUIRED_MODULES += libhardware
 endif
 
+ifneq ($(TW_SYSTEM_BUILD_PROP_ADDITIONAL_PATHS),)
+    LOCAL_CFLAGS += -DTW_SYSTEM_BUILD_PROP_ADDITIONAL_PATHS='"$(TW_SYSTEM_BUILD_PROP_ADDITIONAL_PATHS)"'
+endif
+
 LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
 
 #ifeq ($(TARGET_RECOVERY_UI_LIB),)
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 463f77cfa6..4ab6299f06 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -899,20 +899,20 @@ string TWFunc::Get_Current_Date() {
 }
 
 string TWFunc::System_Property_Get(string Prop_Name) {
-	return System_Property_Get(Prop_Name, PartitionManager, PartitionManager.Get_Android_Root_Path());
+	return System_Property_Get(Prop_Name, PartitionManager, PartitionManager.Get_Android_Root_Path(), "build.prop");
 }
 
-string TWFunc::System_Property_Get(string Prop_Name, TWPartitionManager &PartitionManager, string Mount_Point) {
+string TWFunc::System_Property_Get(string Prop_Name, TWPartitionManager &PartitionManager, string Mount_Point, string prop_file_name) {
 	bool mount_state = PartitionManager.Is_Mounted_By_Path(Mount_Point);
 	std::vector<string> buildprop;
 	string propvalue;
 	if (!PartitionManager.Mount_By_Path(Mount_Point, true))
 		return propvalue;
-	string prop_file = Mount_Point + "/build.prop";
+	string prop_file = Mount_Point + "/" + prop_file_name;
 	if (!TWFunc::Path_Exists(prop_file))
-		prop_file = Mount_Point + "/system/build.prop"; // for devices with system as a root file system (e.g. Pixel)
+		prop_file = Mount_Point + "/system/" + prop_file_name; // for devices with system as a root file system (e.g. Pixel)
 	if (TWFunc::read_file(prop_file, buildprop) != 0) {
-		LOGINFO("Unable to open build.prop for getting '%s'.\n", Prop_Name.c_str());
+		LOGINFO("Unable to open %s for getting '%s'.\n", prop_file_name.c_str(), Prop_Name.c_str());
 		DataManager::SetValue(TW_BACKUP_NAME, Get_Current_Date());
 		if (!mount_state)
 			PartitionManager.UnMount_By_Path(Mount_Point, false);
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index e61038e112..b04447b2af 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -101,7 +101,7 @@ class TWFunc
 	static int write_to_file(const string& fn, const string& line);             //write to file
 	static bool Try_Decrypting_Backup(string Restore_Path, string Password); // true for success, false for failed to decrypt
 	static string System_Property_Get(string Prop_Name);                // Returns value of Prop_Name from reading /system/build.prop
-	static string System_Property_Get(string Prop_Name, TWPartitionManager &PartitionManager, string Mount_Point);                // Returns value of Prop_Name from reading /system/build.prop
+	static string System_Property_Get(string Prop_Name, TWPartitionManager &PartitionManager, string Mount_Point, string prop_file_name);     // Returns value of Prop_Name from reading provided prop file
 	static string Get_Current_Date(void);                               // Returns the current date in ccyy-m-dd--hh-nn-ss format
 	static void Auto_Generate_Backup_Name();                            // Populates TW_BACKUP_NAME with a backup name based on current date and ro.build.display.id from /system/build.prop
 	static void Fixup_Time_On_Boot(const string& time_paths = ""); // Fixes time on devices which need it (time_paths is a space separated list of paths to check for ats_* files)
diff --git a/twrp.cpp b/twrp.cpp
index 96d995895f..ce3b99aa86 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -161,6 +161,11 @@ int main(int argc, char **argv) {
 #if defined(TW_INCLUDE_LIBRESETPROP) && defined(TW_OVERRIDE_SYSTEM_PROPS)
 			stringstream override_props(EXPAND(TW_OVERRIDE_SYSTEM_PROPS));
 			string current_prop;
+			std::vector<std::string> build_prop_list = {"build.prop"};
+#ifdef TW_SYSTEM_BUILD_PROP_ADDITIONAL_PATHS
+			std::vector<std::string> additional_build_prop_list = TWFunc::Split_String(TW_SYSTEM_BUILD_PROP_ADDITIONAL_PATHS, ";");
+			build_prop_list.insert(build_prop_list.end(), additional_build_prop_list.begin(), additional_build_prop_list.end());
+#endif
 			while (getline(override_props, current_prop, ';')) {
 				string other_prop;
 				if (current_prop.find("=") != string::npos) {
@@ -171,15 +176,19 @@ int main(int argc, char **argv) {
 				}
 				other_prop = android::base::Trim(other_prop);
 				current_prop = android::base::Trim(current_prop);
-				string sys_val = TWFunc::System_Property_Get(other_prop, SarPartitionManager, "/s");
-				if (!sys_val.empty()) {
-					LOGINFO("Overriding %s with value: \"%s\" from system property %s\n", current_prop.c_str(), sys_val.c_str(), other_prop.c_str());
-					int error = TWFunc::Property_Override(current_prop, sys_val);
-					if (error) {
-						LOGERR("Failed overriding property %s, error_code: %d\n", current_prop.c_str(), error);
+
+				for (auto&& prop_file:build_prop_list) {
+					string sys_val = TWFunc::System_Property_Get(other_prop, SarPartitionManager, "/s", prop_file);
+					if (!sys_val.empty()) {
+						LOGINFO("Overriding %s with value: \"%s\" from system property %s from %s\n", current_prop.c_str(), sys_val.c_str(), other_prop.c_str(), prop_file.c_str());
+						int error = TWFunc::Property_Override(current_prop, sys_val);
+						if (error) {
+							LOGERR("Failed overriding property %s, error_code: %d\n", current_prop.c_str(), error);
+						}
+						break;
+					} else {
+						LOGINFO("Not overriding %s with empty value from system property %s from %s\n", current_prop.c_str(), other_prop.c_str(), prop_file.c_str());
 					}
-				} else {
-					LOGINFO("Not overriding %s with empty value from system property %s\n", current_prop.c_str(), other_prop.c_str());
 				}
 			}
 #endif

From acb6c5f0725bdd7914dec5b0f1fd2e653763d79f Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sat, 29 Jan 2022 12:45:35 -0500
Subject: [PATCH 204/207] theme: move TW_THEME_VERSION to variables.h

Automatically add the current theme version to the
splash and ui xmls during the build

Change-Id: I52f8cb41fabe34a8849ecc54ece3c0fb645dcd74
---
 Android.mk                          | 6 ++++++
 gui/pages.cpp                       | 4 +---
 gui/theme/landscape_hdpi/splash.xml | 2 +-
 gui/theme/landscape_hdpi/ui.xml     | 2 +-
 gui/theme/landscape_mdpi/splash.xml | 2 +-
 gui/theme/landscape_mdpi/ui.xml     | 2 +-
 gui/theme/portrait_hdpi/splash.xml  | 2 +-
 gui/theme/portrait_hdpi/ui.xml      | 2 +-
 gui/theme/portrait_mdpi/splash.xml  | 2 +-
 gui/theme/portrait_mdpi/ui.xml      | 2 +-
 gui/theme/watch_mdpi/splash.xml     | 2 +-
 gui/theme/watch_mdpi/ui.xml         | 2 +-
 variables.h                         | 6 ++++++
 13 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Android.mk b/Android.mk
index 30efc384c2..d17b83e134 100755
--- a/Android.mk
+++ b/Android.mk
@@ -612,6 +612,12 @@ else
     LOCAL_ADDITIONAL_DEPENDENCIES += $(TWRP_REQUIRED_MODULES)
 endif
 
+TW_THEME_VERSION := $(shell echo "`grep TW_THEME_VERSION bootable/recovery/variables.h | cut -d ' ' -f 3`")
+
+LOCAL_POST_INSTALL_CMD += \
+    sed -i "s/{themeversion}/$(TW_THEME_VERSION)/" $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)splash.xml; \
+    sed -i "s/{themeversion}/$(TW_THEME_VERSION)/" $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)ui.xml;
+
 include $(BUILD_EXECUTABLE)
 
 # Symlink for file_contexts
diff --git a/gui/pages.cpp b/gui/pages.cpp
index 989da9a5ec..5f104f1391 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -56,9 +56,7 @@ extern "C" {
 #include "objects.hpp"
 #include "blanktimer.hpp"
 
-// version 2 requires theme to handle power button as action togglebacklight
-// version 4 adds listbox support to reboot page
-#define TW_THEME_VERSION 4
+#include "../variables.h"
 
 #define TW_THEME_VER_ERR -2
 
diff --git a/gui/theme/landscape_hdpi/splash.xml b/gui/theme/landscape_hdpi/splash.xml
index b9d785362e..56391bde44 100644
--- a/gui/theme/landscape_hdpi/splash.xml
+++ b/gui/theme/landscape_hdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>4</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index 4e39d4c364..48afdd1a20 100755
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -6,7 +6,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>4</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<include>
diff --git a/gui/theme/landscape_mdpi/splash.xml b/gui/theme/landscape_mdpi/splash.xml
index a2098fbba0..ea87310d32 100644
--- a/gui/theme/landscape_mdpi/splash.xml
+++ b/gui/theme/landscape_mdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>4</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index 42716ce324..e06dba4d19 100755
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -6,7 +6,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>4</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<include>
diff --git a/gui/theme/portrait_hdpi/splash.xml b/gui/theme/portrait_hdpi/splash.xml
index f0b0756840..f793afaa85 100644
--- a/gui/theme/portrait_hdpi/splash.xml
+++ b/gui/theme/portrait_hdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>4</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index 70df4e8865..f7d21da3ff 100644
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -6,7 +6,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>4</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<include>
diff --git a/gui/theme/portrait_mdpi/splash.xml b/gui/theme/portrait_mdpi/splash.xml
index 4ce64b3577..b0b97ee5b8 100644
--- a/gui/theme/portrait_mdpi/splash.xml
+++ b/gui/theme/portrait_mdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>4</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index 9ed1a20a48..9189df0c76 100755
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -6,7 +6,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>4</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<include>
diff --git a/gui/theme/watch_mdpi/splash.xml b/gui/theme/watch_mdpi/splash.xml
index 62e8dc37b5..2ce71b385b 100644
--- a/gui/theme/watch_mdpi/splash.xml
+++ b/gui/theme/watch_mdpi/splash.xml
@@ -5,7 +5,7 @@
 		<author>TeamWin</author>
 		<title>TWRP</title>
 		<description>splash screen</description>
-		<themeversion>3</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<resources>
diff --git a/gui/theme/watch_mdpi/ui.xml b/gui/theme/watch_mdpi/ui.xml
index 967a4757e4..ed7ac825c8 100644
--- a/gui/theme/watch_mdpi/ui.xml
+++ b/gui/theme/watch_mdpi/ui.xml
@@ -7,7 +7,7 @@
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
 		<preview>preview.png</preview>
-		<themeversion>3</themeversion>
+		<themeversion>{themeversion}</themeversion>
 	</details>
 
 	<include>
diff --git a/variables.h b/variables.h
index 6889db3b3c..77dc45c288 100644
--- a/variables.h
+++ b/variables.h
@@ -147,6 +147,12 @@
 #define TW_UNMOUNT_SYSTEM           "tw_unmount_system"
 #define TW_AUTO_REFLASHTWRP_VAR     "tw_auto_reflashtwrp"
 
+// Theme versioning
+// version 2 requires theme to handle power button as action togglebacklight
+// version 4 adds listbox support to reboot page
+// version 5 adds File Manager options, nano & Flash Current TWRP
+#define TW_THEME_VERSION 5
+
 // Also used:
 //   tw_boot_is_mountable
 //   tw_system_is_mountable

From 4dee05a351b92d0db6a2a3bdcdd8876f672fb262 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sat, 29 Jan 2022 15:58:53 -0500
Subject: [PATCH 205/207] theme: clean up TW_THEME_VERSION shell command

Change-Id: I6be1f15d05e6ad53bf239674cf41173879eef37a
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index d17b83e134..bc078d4e64 100755
--- a/Android.mk
+++ b/Android.mk
@@ -612,7 +612,7 @@ else
     LOCAL_ADDITIONAL_DEPENDENCIES += $(TWRP_REQUIRED_MODULES)
 endif
 
-TW_THEME_VERSION := $(shell echo "`grep TW_THEME_VERSION bootable/recovery/variables.h | cut -d ' ' -f 3`")
+TW_THEME_VERSION := $(shell grep TW_THEME_VERSION bootable/recovery/variables.h | cut -d ' ' -f 3)
 
 LOCAL_POST_INSTALL_CMD += \
     sed -i "s/{themeversion}/$(TW_THEME_VERSION)/" $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)splash.xml; \

From e4274559ae5ea37fee9ab3a992d6d29ae50276bd Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sat, 26 Feb 2022 18:48:09 -0500
Subject: [PATCH 206/207] A9: 3.6.1 release

Change-Id: Id0a7f6597f3a76a692abc611778de78f2c481afe
---
 variables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.h b/variables.h
index 77dc45c288..daced0b0a6 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.6.0_9"
+#define TW_MAIN_VERSION_STR       "3.6.1_9"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 #define TW_SETTINGS_FILE            ".twrps"
 #define TW_RECOVERY_NAME            "TWRP"

From 36e2663a5dfca13a5d359782155a8940c9a3f526 Mon Sep 17 00:00:00 2001
From: bialy69-git <189705172+bialy69-git@users.noreply.github.com>
Date: Tue, 16 Dec 2025 09:09:30 -0800
Subject: [PATCH 207/207] Create devcontainer.json

---
 .devcontainer/devcontainer.json | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..39bbd2681d
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,4 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {}
+}