Complete signals

Author: purejava

src/main/java/org/cryptomator/linux/update/FlatpakUpdater.java

@@ -6,6 +6,8 @@
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.update.Progress;
 import org.cryptomator.integrations.update.ProgressListener;
+import org.cryptomator.integrations.update.SpawnExitedListener;
+import org.cryptomator.integrations.update.SpawnStartedListener;
 import org.cryptomator.integrations.update.UpdateAvailable;
 import org.cryptomator.integrations.update.UpdateAvailableListener;
 import org.cryptomator.integrations.update.UpdateFailedException;
@@ -38,6 +40,8 @@ public class FlatpakUpdater implements UpdateService, AutoCloseable {
 
 	private final List<UpdateAvailableListener> updateAvailableListeners = new CopyOnWriteArrayList<>();
 	private final List<ProgressListener> progressListeners = new CopyOnWriteArrayList<>();
+	private final List<SpawnStartedListener> spawnStartedListeners = new CopyOnWriteArrayList<>();
+	private final List<SpawnExitedListener> spawnExitedListeners = new CopyOnWriteArrayList<>();
 
 	private final UpdatePortal portal;
 	private Flatpak.UpdateMonitor updateMonitor;
@@ -136,13 +140,6 @@ public void removeUpdateAvailableListener(UpdateAvailableListener listener) {
 		updateAvailableListeners.remove(listener);
 	}
 
-	private void notifyOnUpdateAvailable(Flatpak.UpdateMonitor.UpdateAvailable signal) {
-		UpdateAvailable updateAvailable = new UpdateAvailable((String) signal.update_info.get("remote-commit").getValue());
-		for (UpdateAvailableListener listener : updateAvailableListeners) {
-			listener.onUpdateAvailable(updateAvailable);
-		}
-	}
-
 	@Override
 	public void addProgressListener(ProgressListener listener) {
 		progressListeners.add(listener);
@@ -153,14 +150,76 @@ public void removeProgressListener(ProgressListener listener) {
 		progressListeners.remove(listener);
 	}
 
+	@Override
+	public void addSpawnStartedListener(SpawnStartedListener listener) {
+		spawnStartedListeners.add(listener);
+	}
+
+	@Override
+	public void removeSpawnStartedListener(SpawnStartedListener listener) {
+		spawnStartedListeners.remove(listener);
+	}
+
+	@Override
+	public void addSpawnExitedListener(SpawnExitedListener listener) {
+		spawnExitedListeners.add(listener);
+	}
+
+	@Override
+	public void removeSpawnExitedListener(SpawnExitedListener listener) {
+		spawnExitedListeners.remove(listener);
+	}
+
+	private void notifyOnUpdateAvailable(Flatpak.UpdateMonitor.UpdateAvailable signal) {
+		String remoteCommit = "";
+		Variant<?> remoteCommitVariant = signal.update_info.get("remote-commit");
+		if (null != remoteCommitVariant) {
+			remoteCommit = (String) remoteCommitVariant.getValue();
+		}
+		String runningCommit = "";
+		Variant<?> runningCommitVariant = signal.update_info.get("running-commit");
+		if (null != runningCommitVariant) {
+			runningCommit = (String) runningCommitVariant.getValue();
+		}
+		String localCommit = "";
+		Variant<?> localCommitVariant = signal.update_info.get("local-commit");
+		if (null != localCommitVariant) {
+			localCommit = (String) localCommitVariant.getValue();
+		}
+		UpdateAvailable updateAvailable = new UpdateAvailable(runningCommit, localCommit, remoteCommit);
+		for (UpdateAvailableListener listener : updateAvailableListeners) {
+			listener.onUpdateAvailable(updateAvailable);
+		}
+	}
+
 	private void notifyOnUpdateProceeds(Flatpak.UpdateMonitor.Progress signal) {
 		long status = ((UInt32) signal.info.get("status").getValue()).longValue();
 		long progress = 0;
 		Variant<?> progressVariant = signal.info.get("progress");
 		if (null != progressVariant) {
 			progress = ((UInt32) progressVariant.getValue()).longValue();
 		}
-		Progress p = new Progress(status, progress);
+		long nOps = -1;
+		Variant<?> nOpsVariant = signal.info.get("n_ops");
+		if (null != nOpsVariant) {
+			nOps = ((UInt32) nOpsVariant.getValue()).longValue();
+		}
+		long oP = -1;
+		Variant<?> oPVariant = signal.info.get("op");
+		if (null != oPVariant) {
+			oP = ((UInt32) oPVariant.getValue()).longValue();
+		}
+		String error = "";
+		Variant<?> errorVariant = signal.info.get("error");
+		if (null != errorVariant) {
+			error = (String) errorVariant.getValue();
+		}
+		String errorMessage = "";
+		Variant<?> errorMessageVariant = signal.info.get("error_message");
+		if (null != errorMessageVariant) {
+			errorMessage = (String) errorMessageVariant.getValue();
+		}
+		Progress p = new Progress(nOps, oP, status, progress, error, errorMessage);
 		for (ProgressListener listener : progressListeners) {
 			listener.onProgress(p);
 		}