mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix conversations opening from the background

Browse source 
From a notification, for example, we were opening the inbox but not the
conversation.

// FREEBIE
This commit is contained in:
lilia 2015-09-04 18:33:14 -07:00
parent 24a18e91b3
commit 98aed2975c
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/panel_controller.js
View file

@ -118,12 +118,6 @@
}
};
function openConversation(conversation) {
openInbox();
var appWindow = chrome.app.window.get(inboxWindowId);
appWindow.contentWindow.trigger('open', {conversation: conversation});
}
/* Inbox window controller */
var inboxOpened = false;
var inboxWindowId = 'inbox';
@ -164,6 +158,22 @@
}
};
var open;
function openConversation(conversation) {
if (inboxOpened === true) {
var appWindow = chrome.app.window.get(inboxWindowId);
appWindow.contentWindow.openConversation(conversation);
} else {
open = conversation;
openInbox();
}
}
window.getOpenConversation = function() {
var o = open;
open = null;
return o;
};
extension.onLaunched(function() {
storage.onready(function() {
if (textsecure.registration.isDone()) {