merges: allow user to perform snapshot merges in advanced menu

Change-Id: I894a0ef5a0ec8e208053358f09a6b8a6d4ee408a

gui/action.cpp

@@ -254,6 +254,7 @@ GUIAction::GUIAction(xml_node<>* node)
 #ifndef TW_EXCLUDE_NANO
 		ADD_ACTION(editfile);
 #endif
+		ADD_ACTION(mergesnapshots);
 
 		ADD_ACTION(shrp_init);
 		ADD_ACTION(shrp_magisk_info);
@@ -2453,6 +2454,14 @@ int GUIAction::applycustomtwrpfolder(string arg __unused)
 	return 0;
 }
 
+int GUIAction::mergesnapshots(string arg __unused) {
+	int op_status = 1;
+	if (PartitionManager.Check_Pending_Merges()) {
+		op_status = 0;
+	}
+	operation_end(op_status);
+	return 0;
+}
 //SHRP_GUI_Funcs()
 int GUIAction::shrp_init(std::string arg __unused){
 	LOGINFO("Running GUI function : shrp_init\n");

gui/objects.hpp

@@ -382,6 +382,7 @@ class GUIAction : public GUIObject, public ActionObject
 	int enableadb(std::string arg);
 	int enablefastboot(std::string arg);
 	int changeterminal(std::string arg);
+	int mergesnapshots(std::string arg);
 #ifndef TW_EXCLUDE_NANO
 	int editfile(std::string arg);
 #endif

gui/theme/shrp_portrait_hdpi/languages/en.xml

@@ -748,6 +748,10 @@
 		<string name="restore_with_pattern1">Pattern is enabled</string>
 		<string name="restore_with_pattern2">Pattern should be disabled before restore</string>
 		<string name="reboot_after_restore">It is recommended to reboot Android once after first boot.</string>
+		<string name="merges_snapshots">Merge Snapshots</string>
+		<string name="merge_snapshots_confirm">Merge Snapshots?</string>
+		<string name="merging_snapshots">Merging Snapshots...</string>
+		<string name="merging_snapshots_complete">Merged Snapshots</string>
 		<!--Change All The strings from here-->
 		<string name="Tcredit">None</string>
 		<string name="c_enter_pass">Enter Password</string>

partition.cpp

@@ -3467,24 +3467,3 @@ std::string TWPartition::Get_Display_Name() {
 bool TWPartition::Is_SlotSelect() {
 	return SlotSelect;
 }
-
-bool TWPartition::Check_Pending_Merges() {
-	auto sm = android::snapshot::SnapshotManager::NewForFirstStageMount();
-	if (!sm) {
-		LOGERR("Unable to call snapshot manager\n");
-		return false;
-	}
-
-	auto callback = [&]() -> void {
-		double progress;
-		sm->GetUpdateState(&progress);
-		LOGINFO("waiting for merge to complete: %.2f\n", progress);
-	};
-
-	LOGINFO("checking for merges\n");
-	if (!sm->HandleImminentDataWipe(callback)) {
-		LOGERR("Unable to check merge status\n");
-		return false;
-	}
-	return true;
-}

partitionmanager.cpp

@@ -1604,7 +1604,7 @@ int TWPartitionManager::Format_Data(void) {
 #endif
 			if (metadata != NULL)
 				metadata->Mount(true);
-			if (!dat->Check_Pending_Merges())
+			if (!Check_Pending_Merges())
 				return false;
 		}
 		return dat->Wipe_Encryption();
@@ -3612,4 +3612,4 @@ bool TWPartitionManager::Check_Pending_Merges() {
 		return false;
 	}
 	return true;
-}
+}

partitions.hpp

@@ -178,7 +178,6 @@ class TWPartition
 	bool Has_Data_Media;                                                      // Indicates presence of /data/media, may affect wiping and backup methods
 	void Setup_Data_Media();                                                  // Sets up a partition as a /data/media emulated storage partition
 	void Set_Block_Device(std::string block_device);                          // Allow super partition setup to change block device
-	bool Check_Pending_Merges();                                              // Check and run pending merges on data for VAB devices
 
 private:
 	bool Process_Fstab_Line(const char *fstab_line, bool Display_Error, std::map<string, Flags_Map> *twrp_flags); // Processes a fstab line
@@ -405,6 +404,7 @@ class TWPartitionManager
 	int Set_Crypto_Type(const char* crypto_type);                             // Sets encryption type for FDE (block) and FBE (file) devices (ro.crypto.type)
 	void Unlock_Block_Partitions();                                           // Unlock all block devices after update_engine runs
 	bool Unmap_Super_Devices();                                               // Unmap super devices in TWRP
+	bool Check_Pending_Merges();                                              // Check and run pending merges on data for VAB devices
 
 private:
 	void Setup_Settings_Storage_Partition(TWPartition* Part);                 // Sets up settings storage