From 609230b66dd98b825f737874ff3fa17326da0c3f Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 17 Feb 2020 10:18:46 +1100 Subject: [PATCH 1/7] various --- ts/components/session/SessionChannelSettings.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/session/SessionChannelSettings.tsx b/ts/components/session/SessionChannelSettings.tsx index 353becb2f..d2165d8b5 100644 --- a/ts/components/session/SessionChannelSettings.tsx +++ b/ts/components/session/SessionChannelSettings.tsx @@ -234,7 +234,7 @@ export class SessionChannelSettings extends React.Component {
{window.i18n('members', memberCount)}
-
+
)} Date: Mon, 23 Mar 2020 10:13:49 +1100 Subject: [PATCH 2/7] session nomenclature updates --- js/conversation_controller.js | 3 ++- js/models/conversations.js | 4 +++- package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/conversation_controller.js b/js/conversation_controller.js index 5e102420d..852f2c46c 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -187,6 +187,7 @@ } await conversation.destroyMessages(); + await window.Signal.Data.removeConversation(id, { Conversation: Whisper.Conversation, }); @@ -195,7 +196,7 @@ getOrCreateAndWait(id, type) { return this._initialPromise.then(() => { const conversation = this.getOrCreate(id, type); - +5 if (conversation) { return conversation.initialPromise.then(() => conversation); } diff --git a/js/models/conversations.js b/js/models/conversations.js index 1889996a7..58d09b552 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -2763,7 +2763,9 @@ window.confirmationDialog({ title, message, - resolve: () => ConversationController.deleteContact(this.id), + resolve: () => { + ConversationController.deleteContact(this.id); + }, }); }, diff --git a/package.json b/package.json index bfeb9b735..c8d46a32a 100644 --- a/package.json +++ b/package.json @@ -210,7 +210,7 @@ "node": "^10.13.0" }, "build": { - "appId": "com.loki-project.messenger-desktop", + "appId": "org.getsession.session-desktop", "afterSign": "build/notarize.js", "artifactName": "${name}-${os}-${arch}-${version}.${ext}", "mac": { From 4ed1e42caed262901fbe20dba0f35b48dbe1e291 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 24 Mar 2020 11:58:11 +1100 Subject: [PATCH 3/7] Message selection debug and onenter --- ts/components/conversation/Message.tsx | 12 +++++++++++- ts/components/session/SessionClosableOverlay.tsx | 4 ++-- ts/components/session/SessionIdEditable.tsx | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index c8dd2a98d..07b400580 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -1116,11 +1116,21 @@ export class Message extends React.PureComponent { expiring ? 'module-message--expired' : null )} role="button" - onClick={() => { + onClick={e => { const selection = window.getSelection(); + // Text is being selected if (selection && selection.type === 'Range') { return; } + + // User clicked on message body + // if (e.target === 'span.text-selectable'){ + + // } + console.log(`[event] EVENT: `, e); + console.log(`[event] Target: `, e.target); + console.log(`[event] Tagname: `, e.target); + this.props.onSelectMessage(); }} > diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx index de9119337..67e34231b 100644 --- a/ts/components/session/SessionClosableOverlay.tsx +++ b/ts/components/session/SessionClosableOverlay.tsx @@ -176,9 +176,8 @@ export class SessionClosableOverlay extends React.Component { value={this.state.groupName} maxLength={window.CONSTANTS.MAX_GROUPNAME_LENGTH} onChange={this.onGroupNameChanged} + onPressEnter={onButtonClick ?? onButtonClick()} /> - - {/* */}
) : ( { groupName: event, }); } + } diff --git a/ts/components/session/SessionIdEditable.tsx b/ts/components/session/SessionIdEditable.tsx index cf2f8da9d..dc4bab8bc 100644 --- a/ts/components/session/SessionIdEditable.tsx +++ b/ts/components/session/SessionIdEditable.tsx @@ -61,7 +61,7 @@ export class SessionIdEditable extends React.PureComponent { private handleKeyDown(e: any) { const { editable, onPressEnter } = this.props; - if (editable && e.keyCode === 13) { + if (editable && e.key === 'Enter') { e.preventDefault(); // tslint:disable-next-line: no-unused-expression onPressEnter && onPressEnter(); From c27dd095fc385fcb090b1571dc436c43708b2ddb Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 24 Mar 2020 12:13:09 +1100 Subject: [PATCH 4/7] Join open group on enter --- ts/components/session/SessionClosableOverlay.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx index 67e34231b..6b195366e 100644 --- a/ts/components/session/SessionClosableOverlay.tsx +++ b/ts/components/session/SessionClosableOverlay.tsx @@ -176,7 +176,7 @@ export class SessionClosableOverlay extends React.Component { value={this.state.groupName} maxLength={window.CONSTANTS.MAX_GROUPNAME_LENGTH} onChange={this.onGroupNameChanged} - onPressEnter={onButtonClick ?? onButtonClick()} + onPressEnter={() => onButtonClick(this.state.groupName)} />
) : ( From 6135f4d33493377a299ee62a3bfa9bbf4436142c Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 24 Mar 2020 12:54:13 +1100 Subject: [PATCH 5/7] Message selection correction --- ts/components/conversation/Message.tsx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 07b400580..913f83568 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -1116,7 +1116,7 @@ export class Message extends React.PureComponent { expiring ? 'module-message--expired' : null )} role="button" - onClick={e => { + onClick={event => { const selection = window.getSelection(); // Text is being selected if (selection && selection.type === 'Range') { @@ -1124,12 +1124,8 @@ export class Message extends React.PureComponent { } // User clicked on message body - // if (e.target === 'span.text-selectable'){ - - // } - console.log(`[event] EVENT: `, e); - console.log(`[event] Target: `, e.target); - console.log(`[event] Tagname: `, e.target); + const target = (event.target as HTMLDivElement); + if(target.className === 'text-selectable') return; this.props.onSelectMessage(); }} From 6360b539a3fe3f91198dea3658ee7f80a56d4366 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 24 Mar 2020 13:32:12 +1100 Subject: [PATCH 6/7] linting --- js/conversation_controller.js | 2 +- ts/components/conversation/Message.tsx | 6 ++++-- ts/components/session/SessionClosableOverlay.tsx | 1 - ts/components/session/SessionGroupSettings.tsx | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/js/conversation_controller.js b/js/conversation_controller.js index 852f2c46c..171703716 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -196,7 +196,7 @@ getOrCreateAndWait(id, type) { return this._initialPromise.then(() => { const conversation = this.getOrCreate(id, type); -5 + if (conversation) { return conversation.initialPromise.then(() => conversation); } diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 913f83568..99f1b3d97 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -1124,8 +1124,10 @@ export class Message extends React.PureComponent { } // User clicked on message body - const target = (event.target as HTMLDivElement); - if(target.className === 'text-selectable') return; + const target = event.target as HTMLDivElement; + if (target.className === 'text-selectable') { + return; + } this.props.onSelectMessage(); }} diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx index 6b195366e..e86ed1ef0 100644 --- a/ts/components/session/SessionClosableOverlay.tsx +++ b/ts/components/session/SessionClosableOverlay.tsx @@ -285,5 +285,4 @@ export class SessionClosableOverlay extends React.Component { groupName: event, }); } - } diff --git a/ts/components/session/SessionGroupSettings.tsx b/ts/components/session/SessionGroupSettings.tsx index e514b633e..123f17d23 100644 --- a/ts/components/session/SessionGroupSettings.tsx +++ b/ts/components/session/SessionGroupSettings.tsx @@ -243,7 +243,7 @@ export class SessionGroupSettings extends React.Component {
{window.i18n('members', memberCount)}
-
+
)} Date: Tue, 24 Mar 2020 13:41:19 +1100 Subject: [PATCH 7/7] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c8d46a32a..bfeb9b735 100644 --- a/package.json +++ b/package.json @@ -210,7 +210,7 @@ "node": "^10.13.0" }, "build": { - "appId": "org.getsession.session-desktop", + "appId": "com.loki-project.messenger-desktop", "afterSign": "build/notarize.js", "artifactName": "${name}-${os}-${arch}-${version}.${ext}", "mac": {