Add support to change TWRP Folder
Change-Id: Id3b3b46d492bf83d1d9d3f535c880ea9d15b4107
diff --git a/data.cpp b/data.cpp
index c45f27c..e7b2f61 100755
--- a/data.cpp
+++ b/data.cpp
@@ -526,7 +526,7 @@
{
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 @@
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);
@@ -1111,8 +1113,8 @@
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))
{
@@ -1152,3 +1154,11 @@
}
#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