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

Fix (Auto Generate) handling for backup names

Browse Source 
Change-Id: I29f3823d03c005fb55a0e0a98818d40bd1eb039d
This commit is contained in:
Ethan Yonker
2016-01-22 16:08:07 -06:00
parent 6193e73a16
commit 4adc33ebff
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/action.cpp
+2 -3
View File
@@ -1169,9 +1169,8 @@ int GUIAction::nandroid(std::string arg)
if (arg == "backup") {
string Backup_Name;
DataManager::GetValue(TW_BACKUP_NAME, Backup_Name);
string auto_gen = gui_lookup("auto_gen", "(Auto Generate)");
string curr_date = gui_lookup("curr_date", "(Current Date)");
if (Backup_Name == "(Auto Generate)" || Backup_Name == "(Current Date)" || Backup_Name == "0" || Backup_Name == "(" || PartitionManager.Check_Backup_Name(true) == 0) {
string auto_gen = gui_lookup("auto_generate", "(Auto Generate)");
if (Backup_Name == auto_gen || Backup_Name == gui_lookup("curr_date", "(Current Date)") || Backup_Name == "0" || Backup_Name == "(" || PartitionManager.Check_Backup_Name(true) == 0) {
ret = PartitionManager.Run_Backup();
}
else {
gui/pages.cpp
+4 -2
View File
@@ -687,6 +687,7 @@ int PageSet::LoadLanguage(char* languageFile, ZipArchive* package)
xml_node<>* parent;
xml_node<>* child;
std::string resource_source;
int ret = 0;
if (languageFile) {
printf("parsing languageFile\n");
@@ -717,9 +718,10 @@ int PageSet::LoadLanguage(char* languageFile, ZipArchive* package)
if (child)
mResources->LoadResources(child, package, resource_source);
else
return -1;
ret = -1;
DataManager::SetValue("tw_backup_name", gui_lookup("auto_generate", "(Auto Generate)"));
lang.clear();
return 0;
return ret;
}
int PageSet::Load(ZipArchive* package, char* xmlFile, char* languageFile, char* baseLanguageFile)
partitionmanager.cpp
+3 -3
View File
@@ -447,7 +447,7 @@ int TWPartitionManager::Check_Backup_Name(bool Display_Error) {
// and -_.{}[]
} else {
if (Display_Error)
gui_msg(Msg(msg::kError, "backup_name_invalid=Backup name '{1}' contains invalid character: '{1}'")(backup_name)((char)cur_char));
gui_msg(Msg(msg::kError, "backup_name_invalid=Backup name '{1}' contains invalid character: '{1}'")(Backup_Name)((char)cur_char));
return -3;
}
}
@@ -682,9 +682,9 @@ int TWPartitionManager::Run_Backup(void) {
DataManager::GetValue(TW_BACKUPS_FOLDER_VAR, Backup_Folder);
DataManager::GetValue(TW_BACKUP_NAME, Backup_Name);
if (Backup_Name == gui_parse_text("{@current_date}")) {
if (Backup_Name == gui_lookup("curr_date", "(Current Date)")) {
Backup_Name = TWFunc::Get_Current_Date();
} else if (Backup_Name == gui_parse_text("{@auto_generate}") || Backup_Name == "0" || Backup_Name.empty()) {
} else if (Backup_Name == gui_lookup("auto_generate", "(Auto Generate)") || Backup_Name == "0" || Backup_Name.empty()) {
TWFunc::Auto_Generate_Backup_Name();
DataManager::GetValue(TW_BACKUP_NAME, Backup_Name);
}