Merge branch 'fix/810' into dev

llaske · Jun 2, 2020 · 95e9cd2 · 95e9cd2
2 parents 1a352a4 + df4ded6
commit 95e9cd2
Show file tree

Hide file tree

Showing 30 changed files with 266 additions and 96 deletions.
diff --git a/activities/ActivityTemplate/VanillaJS/lib/sugar-web/graphics/presencepalette.js b/activities/ActivityTemplate/VanillaJS/lib/sugar-web/graphics/presencepalette.js
@@ -28,6 +28,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 	var xoLogo = '<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC \'-//W3C//DTD SVG 1.1//EN\'  \'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\' [<!ENTITY stroke_color "#010101"><!ENTITY fill_color "#FFFFFF">]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="stock-xo_1_"><path d="M33.233,35.1l10.102,10.1c0.752,0.75,1.217,1.783,1.217,2.932   c0,2.287-1.855,4.143-4.146,4.143c-1.145,0-2.178-0.463-2.932-1.211L27.372,40.961l-10.1,10.1c-0.75,0.75-1.787,1.211-2.934,1.211   c-2.284,0-4.143-1.854-4.143-4.141c0-1.146,0.465-2.184,1.212-2.934l10.104-10.102L11.409,24.995   c-0.747-0.748-1.212-1.785-1.212-2.93c0-2.289,1.854-4.146,4.146-4.146c1.143,0,2.18,0.465,2.93,1.214l10.099,10.102l10.102-10.103   c0.754-0.749,1.787-1.214,2.934-1.214c2.289,0,4.146,1.856,4.146,4.145c0,1.146-0.467,2.18-1.217,2.932L33.233,35.1z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/><circle cx="27.371" cy="10.849" fill="&fill_color;" r="8.122" stroke="&stroke_color;" stroke-width="3.5"/></g></svg>';
 	var timerInterval = 500;
 
+	var wasShared = false;
+
 	var presence = activity.getPresenceObject();
 	function generateXOLogoWithColor(color) {
 		var coloredLogo = xoLogo;
@@ -86,6 +88,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		sharedbutton.setAttribute('id','shared-button');
 		sharedbutton.onclick = function() {
 			that.setShared(true);
+			wasShared = true;
+			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 		this.setSharedUI = function(state) {
 			var usersList = document.getElementById("users-list");
@@ -110,7 +114,6 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		}
 		this.setShared = function(state) {
 			that.setSharedUI(state);
-			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 
 		h4.appendChild(txt);
@@ -155,7 +158,7 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 
 		// Detect disconnection
 		var testConnection = setInterval(function() {
-			if (!presence.isConnected()) {
+			if (wasShared && !presence.isConnected()) {
 				that.setShared(false);
 				privatebutton.disabled = true;
 				sharedbutton.disabled = true;

diff --git a/activities/ActivityTemplate/VueJS/lib/sugar-web/graphics/presencepalette.js b/activities/ActivityTemplate/VueJS/lib/sugar-web/graphics/presencepalette.js
@@ -28,6 +28,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 	var xoLogo = '<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC \'-//W3C//DTD SVG 1.1//EN\'  \'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\' [<!ENTITY stroke_color "#010101"><!ENTITY fill_color "#FFFFFF">]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="stock-xo_1_"><path d="M33.233,35.1l10.102,10.1c0.752,0.75,1.217,1.783,1.217,2.932   c0,2.287-1.855,4.143-4.146,4.143c-1.145,0-2.178-0.463-2.932-1.211L27.372,40.961l-10.1,10.1c-0.75,0.75-1.787,1.211-2.934,1.211   c-2.284,0-4.143-1.854-4.143-4.141c0-1.146,0.465-2.184,1.212-2.934l10.104-10.102L11.409,24.995   c-0.747-0.748-1.212-1.785-1.212-2.93c0-2.289,1.854-4.146,4.146-4.146c1.143,0,2.18,0.465,2.93,1.214l10.099,10.102l10.102-10.103   c0.754-0.749,1.787-1.214,2.934-1.214c2.289,0,4.146,1.856,4.146,4.145c0,1.146-0.467,2.18-1.217,2.932L33.233,35.1z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/><circle cx="27.371" cy="10.849" fill="&fill_color;" r="8.122" stroke="&stroke_color;" stroke-width="3.5"/></g></svg>';
 	var timerInterval = 500;
 
+	var wasShared = false;
+
 	var presence = activity.getPresenceObject();
 	function generateXOLogoWithColor(color) {
 		var coloredLogo = xoLogo;
@@ -86,6 +88,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		sharedbutton.setAttribute('id','shared-button');
 		sharedbutton.onclick = function() {
 			that.setShared(true);
+			wasShared = true;
+			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 		this.setSharedUI = function(state) {
 			var usersList = document.getElementById("users-list");
@@ -110,7 +114,6 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		}
 		this.setShared = function(state) {
 			that.setSharedUI(state);
-			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 
 		h4.appendChild(txt);
@@ -155,7 +158,7 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 
 		// Detect disconnection
 		var testConnection = setInterval(function() {
-			if (!presence.isConnected()) {
+			if (wasShared && !presence.isConnected()) {
 				that.setShared(false);
 				privatebutton.disabled = true;
 				sharedbutton.disabled = true;

diff --git a/activities/Calligra.activity/lib/sugar-web/graphics/presencepalette.js b/activities/Calligra.activity/lib/sugar-web/graphics/presencepalette.js
@@ -28,6 +28,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 	var xoLogo = '<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC \'-//W3C//DTD SVG 1.1//EN\'  \'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\' [<!ENTITY stroke_color "#010101"><!ENTITY fill_color "#FFFFFF">]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="stock-xo_1_"><path d="M33.233,35.1l10.102,10.1c0.752,0.75,1.217,1.783,1.217,2.932   c0,2.287-1.855,4.143-4.146,4.143c-1.145,0-2.178-0.463-2.932-1.211L27.372,40.961l-10.1,10.1c-0.75,0.75-1.787,1.211-2.934,1.211   c-2.284,0-4.143-1.854-4.143-4.141c0-1.146,0.465-2.184,1.212-2.934l10.104-10.102L11.409,24.995   c-0.747-0.748-1.212-1.785-1.212-2.93c0-2.289,1.854-4.146,4.146-4.146c1.143,0,2.18,0.465,2.93,1.214l10.099,10.102l10.102-10.103   c0.754-0.749,1.787-1.214,2.934-1.214c2.289,0,4.146,1.856,4.146,4.145c0,1.146-0.467,2.18-1.217,2.932L33.233,35.1z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/><circle cx="27.371" cy="10.849" fill="&fill_color;" r="8.122" stroke="&stroke_color;" stroke-width="3.5"/></g></svg>';
 	var timerInterval = 500;
 
+	var wasShared = false;
+
 	var presence = activity.getPresenceObject();
 	function generateXOLogoWithColor(color) {
 		var coloredLogo = xoLogo;
@@ -86,6 +88,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		sharedbutton.setAttribute('id','shared-button');
 		sharedbutton.onclick = function() {
 			that.setShared(true);
+			wasShared = true;
+			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 		this.setSharedUI = function(state) {
 			var usersList = document.getElementById("users-list");
@@ -110,7 +114,6 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		}
 		this.setShared = function(state) {
 			that.setSharedUI(state);
-			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 
 		h4.appendChild(txt);
@@ -155,7 +158,7 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 
 		// Detect disconnection
 		var testConnection = setInterval(function() {
-			if (!presence.isConnected()) {
+			if (wasShared && !presence.isConnected()) {
 				that.setShared(false);
 				privatebutton.disabled = true;
 				sharedbutton.disabled = true;

diff --git a/activities/ChatPrototype.activity/lib/sugar-web/graphics/presencepalette.js b/activities/ChatPrototype.activity/lib/sugar-web/graphics/presencepalette.js
@@ -28,6 +28,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 	var xoLogo = '<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC \'-//W3C//DTD SVG 1.1//EN\'  \'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\' [<!ENTITY stroke_color "#010101"><!ENTITY fill_color "#FFFFFF">]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="stock-xo_1_"><path d="M33.233,35.1l10.102,10.1c0.752,0.75,1.217,1.783,1.217,2.932   c0,2.287-1.855,4.143-4.146,4.143c-1.145,0-2.178-0.463-2.932-1.211L27.372,40.961l-10.1,10.1c-0.75,0.75-1.787,1.211-2.934,1.211   c-2.284,0-4.143-1.854-4.143-4.141c0-1.146,0.465-2.184,1.212-2.934l10.104-10.102L11.409,24.995   c-0.747-0.748-1.212-1.785-1.212-2.93c0-2.289,1.854-4.146,4.146-4.146c1.143,0,2.18,0.465,2.93,1.214l10.099,10.102l10.102-10.103   c0.754-0.749,1.787-1.214,2.934-1.214c2.289,0,4.146,1.856,4.146,4.145c0,1.146-0.467,2.18-1.217,2.932L33.233,35.1z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/><circle cx="27.371" cy="10.849" fill="&fill_color;" r="8.122" stroke="&stroke_color;" stroke-width="3.5"/></g></svg>';
 	var timerInterval = 500;
 
+	var wasShared = false;
+
 	var presence = activity.getPresenceObject();
 	function generateXOLogoWithColor(color) {
 		var coloredLogo = xoLogo;
@@ -86,6 +88,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		sharedbutton.setAttribute('id','shared-button');
 		sharedbutton.onclick = function() {
 			that.setShared(true);
+			wasShared = true;
+			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 		this.setSharedUI = function(state) {
 			var usersList = document.getElementById("users-list");
@@ -110,7 +114,6 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		}
 		this.setShared = function(state) {
 			that.setSharedUI(state);
-			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 
 		h4.appendChild(txt);
@@ -155,7 +158,7 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 
 		// Detect disconnection
 		var testConnection = setInterval(function() {
-			if (!presence.isConnected()) {
+			if (wasShared && !presence.isConnected()) {
 				that.setShared(false);
 				privatebutton.disabled = true;
 				sharedbutton.disabled = true;

diff --git a/activities/Constellation.activity/lib/sugar-web/graphics/presencepalette.js b/activities/Constellation.activity/lib/sugar-web/graphics/presencepalette.js
@@ -28,6 +28,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 	var xoLogo = '<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC \'-//W3C//DTD SVG 1.1//EN\'  \'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\' [<!ENTITY stroke_color "#010101"><!ENTITY fill_color "#FFFFFF">]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="stock-xo_1_"><path d="M33.233,35.1l10.102,10.1c0.752,0.75,1.217,1.783,1.217,2.932   c0,2.287-1.855,4.143-4.146,4.143c-1.145,0-2.178-0.463-2.932-1.211L27.372,40.961l-10.1,10.1c-0.75,0.75-1.787,1.211-2.934,1.211   c-2.284,0-4.143-1.854-4.143-4.141c0-1.146,0.465-2.184,1.212-2.934l10.104-10.102L11.409,24.995   c-0.747-0.748-1.212-1.785-1.212-2.93c0-2.289,1.854-4.146,4.146-4.146c1.143,0,2.18,0.465,2.93,1.214l10.099,10.102l10.102-10.103   c0.754-0.749,1.787-1.214,2.934-1.214c2.289,0,4.146,1.856,4.146,4.145c0,1.146-0.467,2.18-1.217,2.932L33.233,35.1z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/><circle cx="27.371" cy="10.849" fill="&fill_color;" r="8.122" stroke="&stroke_color;" stroke-width="3.5"/></g></svg>';
 	var timerInterval = 500;
 
+	var wasShared = false;
+
 	var presence = activity.getPresenceObject();
 	function generateXOLogoWithColor(color) {
 		var coloredLogo = xoLogo;
@@ -86,6 +88,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		sharedbutton.setAttribute('id','shared-button');
 		sharedbutton.onclick = function() {
 			that.setShared(true);
+			wasShared = true;
+			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 		this.setSharedUI = function(state) {
 			var usersList = document.getElementById("users-list");
@@ -110,7 +114,6 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		}
 		this.setShared = function(state) {
 			that.setSharedUI(state);
-			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 
 		h4.appendChild(txt);
@@ -155,7 +158,7 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 
 		// Detect disconnection
 		var testConnection = setInterval(function() {
-			if (!presence.isConnected()) {
+			if (wasShared && !presence.isConnected()) {
 				that.setShared(false);
 				privatebutton.disabled = true;
 				sharedbutton.disabled = true;

diff --git a/activities/EbookReader.activity/lib/sugar-web/graphics/presencepalette.js b/activities/EbookReader.activity/lib/sugar-web/graphics/presencepalette.js
@@ -28,6 +28,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 	var xoLogo = '<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC \'-//W3C//DTD SVG 1.1//EN\'  \'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\' [<!ENTITY stroke_color "#010101"><!ENTITY fill_color "#FFFFFF">]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="stock-xo_1_"><path d="M33.233,35.1l10.102,10.1c0.752,0.75,1.217,1.783,1.217,2.932   c0,2.287-1.855,4.143-4.146,4.143c-1.145,0-2.178-0.463-2.932-1.211L27.372,40.961l-10.1,10.1c-0.75,0.75-1.787,1.211-2.934,1.211   c-2.284,0-4.143-1.854-4.143-4.141c0-1.146,0.465-2.184,1.212-2.934l10.104-10.102L11.409,24.995   c-0.747-0.748-1.212-1.785-1.212-2.93c0-2.289,1.854-4.146,4.146-4.146c1.143,0,2.18,0.465,2.93,1.214l10.099,10.102l10.102-10.103   c0.754-0.749,1.787-1.214,2.934-1.214c2.289,0,4.146,1.856,4.146,4.145c0,1.146-0.467,2.18-1.217,2.932L33.233,35.1z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/><circle cx="27.371" cy="10.849" fill="&fill_color;" r="8.122" stroke="&stroke_color;" stroke-width="3.5"/></g></svg>';
 	var timerInterval = 500;
 
+	var wasShared = false;
+
 	var presence = activity.getPresenceObject();
 	function generateXOLogoWithColor(color) {
 		var coloredLogo = xoLogo;
@@ -86,6 +88,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		sharedbutton.setAttribute('id','shared-button');
 		sharedbutton.onclick = function() {
 			that.setShared(true);
+			wasShared = true;
+			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 		this.setSharedUI = function(state) {
 			var usersList = document.getElementById("users-list");
@@ -110,7 +114,6 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		}
 		this.setShared = function(state) {
 			that.setSharedUI(state);
-			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 
 		h4.appendChild(txt);
@@ -155,7 +158,7 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 
 		// Detect disconnection
 		var testConnection = setInterval(function() {
-			if (!presence.isConnected()) {
+			if (wasShared && !presence.isConnected()) {
 				that.setShared(false);
 				privatebutton.disabled = true;
 				sharedbutton.disabled = true;

diff --git a/activities/Exerciser.activity/asset-manifest.json b/activities/Exerciser.activity/asset-manifest.json
@@ -1,8 +1,8 @@
 {
   "main.css": "static/css/main.27bba0fe.css",
   "main.css.map": "static/css/main.27bba0fe.css.map",
-  "main.js": "static/js/main.566f88d8.js",
-  "main.js.map": "static/js/main.566f88d8.js.map",
+  "main.js": "static/js/main.ddc3d1ab.js",
+  "main.js.map": "static/js/main.ddc3d1ab.js.map",
   "static/media/ArrowSmall.cur": "static/media/ArrowSmall.8817744e.cur",
   "static/media/README.md": "static/media/README.7a41b899.md",
   "static/media/activity-icon.svg": "static/media/activity-icon.4b722852.svg",

diff --git a/activities/Exerciser.activity/index.html b/activities/Exerciser.activity/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"/><title>Exerciser Activity</title><meta name="viewport" content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width,viewport-fit=cover"/><link rel="stylesheet" media="not screen and (device-width:1200px) and (device-height:900px)" href="lib/sugar-web/graphics/css/sugar-96dpi.css"><link rel="stylesheet" media="screen and (device-width:1200px) and (device-height:900px)" href="lib/sugar-web/graphics/css/sugar-200dpi.css"><link href="./static/css/main.27bba0fe.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.566f88d8.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"/><title>Exerciser Activity</title><meta name="viewport" content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width,viewport-fit=cover"/><link rel="stylesheet" media="not screen and (device-width:1200px) and (device-height:900px)" href="lib/sugar-web/graphics/css/sugar-96dpi.css"><link rel="stylesheet" media="screen and (device-width:1200px) and (device-height:900px)" href="lib/sugar-web/graphics/css/sugar-200dpi.css"><link href="./static/css/main.27bba0fe.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.ddc3d1ab.js"></script></body></html>
diff --git a/activities/Exerciser.activity/lib/sugar-web/graphics/presencepalette.js b/activities/Exerciser.activity/lib/sugar-web/graphics/presencepalette.js
@@ -28,6 +28,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 	var xoLogo = '<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC \'-//W3C//DTD SVG 1.1//EN\'  \'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\' [<!ENTITY stroke_color "#010101"><!ENTITY fill_color "#FFFFFF">]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="stock-xo_1_"><path d="M33.233,35.1l10.102,10.1c0.752,0.75,1.217,1.783,1.217,2.932   c0,2.287-1.855,4.143-4.146,4.143c-1.145,0-2.178-0.463-2.932-1.211L27.372,40.961l-10.1,10.1c-0.75,0.75-1.787,1.211-2.934,1.211   c-2.284,0-4.143-1.854-4.143-4.141c0-1.146,0.465-2.184,1.212-2.934l10.104-10.102L11.409,24.995   c-0.747-0.748-1.212-1.785-1.212-2.93c0-2.289,1.854-4.146,4.146-4.146c1.143,0,2.18,0.465,2.93,1.214l10.099,10.102l10.102-10.103   c0.754-0.749,1.787-1.214,2.934-1.214c2.289,0,4.146,1.856,4.146,4.145c0,1.146-0.467,2.18-1.217,2.932L33.233,35.1z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/><circle cx="27.371" cy="10.849" fill="&fill_color;" r="8.122" stroke="&stroke_color;" stroke-width="3.5"/></g></svg>';
 	var timerInterval = 500;
 
+	var wasShared = false;
+
 	var presence = activity.getPresenceObject();
 	function generateXOLogoWithColor(color) {
 		var coloredLogo = xoLogo;
@@ -86,6 +88,8 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		sharedbutton.setAttribute('id','shared-button');
 		sharedbutton.onclick = function() {
 			that.setShared(true);
+			wasShared = true;
+			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 		this.setSharedUI = function(state) {
 			var usersList = document.getElementById("users-list");
@@ -110,7 +114,6 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 		}
 		this.setShared = function(state) {
 			that.setSharedUI(state);
-			that.getPalette().dispatchEvent(that.sharedEvent);
 		}
 
 		h4.appendChild(txt);
@@ -155,7 +158,7 @@ define(["sugar-web/graphics/palette","sugar-web/env","sugar-web/activity/activit
 
 		// Detect disconnection
 		var testConnection = setInterval(function() {
-			if (!presence.isConnected()) {
+			if (wasShared && !presence.isConnected()) {
 				that.setShared(false);
 				privatebutton.disabled = true;
 				sharedbutton.disabled = true;