fix notifications with bencode packet encoder

Xpra-org · Feb 7, 2022 · a9292f3 · a9292f3
1 parent 8e69aa1
commit a9292f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/html5/js/Client.js b/html5/js/Client.js
@@ -3032,7 +3032,7 @@ XpraClient.prototype._process_notify_show = function(packet, ctx) {
 	function notify() {
 		let icon_url = "";
 		if (icon && icon[0]=="png") {
-			icon_url = "data:image/png;base64," + Utilities.ArrayBufferToBase64(icon[3]);
+			icon_url = "data:image/png;base64," + Utilities.ToBase64(icon[3]);
 			console.log("notification icon_url=", icon_url);
 		}
 		/*

diff --git a/html5/js/Utilities.js b/html5/js/Utilities.js
@@ -460,6 +460,15 @@ const Utilities = {
 		return window.btoa(s);
 	},
 
+	ToBase64 : function(v) {
+		try {
+			return window.btoa(v);
+		}
+		catch (e) {
+			return ArrayBufferToBase64(v);
+		}
+	},
+
 	convertDataURIToBinary : function (dataURI) {
 		const BASE64_MARKER = ';base64,';
 		const base64Index = dataURI.indexOf(BASE64_MARKER) + BASE64_MARKER.length;