Only show urgent and subject in MMS if appropriate

Former-commit-id: 0e7b9d5

appdashboardhelpernotifications.js

@@ -51,7 +51,7 @@ export class AppDashboardNotifications extends AppHelperBase{
         const {NotificationInfo} = await import("./v2/notification/notificationinfo.js")
         this.controlNotifications.notifications = options.map(optionsSingle=>new NotificationInfo(optionsSingle,optionsSingle.device));
         await this.controlNotifications.render();
-        await Util.sleep(500);
+        await Util.sleep(50);
         ServerEventBus.post(new RequestResize(this.controlNotifications.notificationsListSize));
     }
     async onRequestReplyMessage(request){

server/servernotification.js

@@ -63,6 +63,7 @@ class WindowNotifications extends Array{
 
         const request = EventBus.waitFor(RequestNotificationInfo,3000);
         this.window = new BrowserWindow(args)
+        this.window.showInactive();
         this.window.loadFile('index.html',{ query: { notificationpopup: true }});
         if(debugging){
             this.window.webContents.toggleDevTools();

v2/control.js

@@ -169,11 +169,11 @@ export class Control extends ExtendableProxy {
         return root;
     }
     //open
-    async unload(){
-        await Control.unloadControls(this);
+    async unload(justSelf){
+        await Control.unloadControls(this,justSelf);
     }
-    async dispose(){
-        await this.unload();
+    async dispose(justSelf){
+        await this.unload(justSelf);
         const parent = this.root.parentElement;
         if(!parent) return;
 
@@ -192,8 +192,10 @@ export class Control extends ExtendableProxy {
     //abstract
     getStyle(){}
 
-    static async unloadControls(obj){
+    static async unloadControls(obj,justSelf){
         await EventBus.unregister(obj);
+        if(justSelf) return;
+
         for(const prop in obj){
             const value = obj[prop];
             // if(Util.isArray(value)){

v2/device/device.js

@@ -666,8 +666,9 @@ export class Device{
 		return AppContext.context.localStorage.get(this.canContactLocalNetworkKey);
 	}
 	get canContactViaLocalNetwork(){ 
-		if(this.socket) return true;
 		// return false;
+		if(this.socket) return true;
+
 		return this.localNetworkServerAddress ? true : false;
 	}
 	set canContactViaLocalNetwork(value) {

v2/gcm/notificationclickhandler/controlnotificationclickhandler.js

@@ -97,8 +97,13 @@ export class ControlNotificationClickHandler extends Control{
         const index = this.controlsNotifications.findIndex(criteriaFunc);
         if(index < 0) return;
 
+        const controlNotification = this.controlsNotifications[index];
         this.controlsNotifications.splice(index,1);
-        await this.render();
+        if(controlNotification){
+            await controlNotification.dispose(true);
+        }else{
+            await this.render();
+        }
     }
     /**
      * 

v2/sms/conversation/controlsmsconveration.js

@@ -122,7 +122,11 @@ export class ControlSMSConversation extends Control{
         //     UtilDOM.hide(this.contactPictureElement);
         // }
 
-        this.inputElement.placeholder = `Send message to ${this.smsConversation.contact.address}`;
+
+        const contact = this.smsConversation.contact;
+        if(contact){
+            this.inputElement.placeholder = `Send message to ${contact.address}`;
+        }
         this.listenToEnterKey();
         UtilDOM.onclickandlongclick(this.sendButtonElement, async ()=> await this.sendSms(), async () => UtilDOM.toggleShow(this.mmsExtrasElement))
 
@@ -201,8 +205,8 @@ export class ControlSMSMessage extends Control{
 
         const isMMS = this.smsMessage.isMMS;
         UtilDOM.showOrHide(this.attachmentElement,isMMS);
-        UtilDOM.showOrHide(this.urgentElement,isMMS);
-        UtilDOM.showOrHide(this.subjectElement,isMMS);
+        UtilDOM.showOrHide(this.urgentElement,isMMS && this.smsMessage.urgent);
+        UtilDOM.showOrHide(this.subjectElement,isMMS && this.smsMessage.subject);
         UtilDOM.addOrRemoveClass(this.senderPictureContainerElement,!this.isLastMultiple,"invisible");
         UtilDOM.addOrRemoveClass(this.containerElement,this.isLastMultiple && this.multipleReceived,"lastofmultiple");
         UtilDOM.addOrRemoveClass(this.containerElement,!this.isLastMultiple && this.multipleReceived,"oneofmultiple");