Commit graph

952 commits

Author SHA1 Message Date
Mikunj
589b3f3233 Infer pairing message type from the content.
This should fix device pairing cross platform.
2019-10-29 15:51:40 +11:00
Beaudan Campbell-Brown
aa66b28ffe
Merge pull request #579 from BeaudanBrown/friends-with-any
Add isFriendsWithAnyDevice and use it in relevant places
2019-10-28 16:46:42 +11:00
Beaudan Brown
76b36845bb Add isFriendsWithAnyDevice and use it in relevant places 2019-10-28 14:03:44 +11:00
Beaudan Brown
08ad913105 Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc 2019-10-28 12:17:21 +11:00
Beaudan Brown
d97eced37b Merge branch 'clearnet' into multi-device 2019-10-23 16:34:56 +11:00
Beaudan Brown
638f1c0e6c Bringing together all the stuff for attachments and link previews 2019-10-22 13:37:39 +11:00
Beaudan Brown
f0c198c7b7 Split uploadData to public and private 2019-10-22 13:36:30 +11:00
Beaudan Brown
a1921cfff3 Enable link previews to be sent as attachments, might need some more tweaking 2019-10-18 10:33:31 +11:00
Beaudan Brown
c7a91686a8 Update proto id and use the server id as the attachmentpointer id 2019-10-17 16:49:44 +11:00
Beaudan Brown
5710c1268c Revert id field and add new url field to be compatible with mobile 2019-10-16 16:37:31 +11:00
Beaudan Brown
4e85435bf7 Update attachment pipeline to upload and download from loki fileserver 2019-10-16 15:58:49 +11:00
sachaaaaa
73d90a5277
Merge pull request #537 from sachaaaaa/secondary_device_minimum_receiver
[multi-device] Start all the receivers only after the secondary registration is fini…
2019-10-02 12:36:22 +10:00
sachaaaaa
c38e145be7 lint 2019-09-30 17:53:12 +10:00
sachaaaaa
f268fbb552
Merge pull request #534 from sachaaaaa/use_file_server_device_mapping
[multi-device] Use file server device mapping
2019-09-30 17:03:03 +10:00
sachaaaaa
cc04bee38a Start all the receivers only after the secondary registration is finished 2019-09-30 12:22:21 +10:00
sachaaaaa
91a79ea57c Fetch device mapping from server when after receiving friend request 2019-09-26 17:04:31 +10:00
sachaaaaa
a314721cce Both devices to update their mapping after secondary registration 2019-09-26 16:53:45 +10:00
sachaaaaa
4929f8d8db Move high-level authorisation from message_receivier to libloki.crypto 2019-09-26 16:53:06 +10:00
sachaaaaa
77bfee8892 No need to handle authorisations sent in friend requests 2019-09-26 16:51:41 +10:00
sachaaaaa
d5ddc1c536 No need to attach authorisation with every friend request 2019-09-26 16:49:01 +10:00
sachaaaaa
b63d8ec84f Merge branch 'clearnet' into multi-device
* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ...
2019-09-26 11:08:55 +10:00
Ryan Tharp
c921d3e3b3 allow mixpanel to be already set up elsewhere 2019-09-18 16:12:16 -07:00
Ryan Tharp
88b44390bf Desktop Analytics 2019-09-17 01:14:29 -07:00
sachaaaaa
d3653e8665 lint after manual merge 2019-09-16 16:09:16 +10:00
sachaaaaa
0426d85e7a Merge branch 'clearnet' into multi-device
* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix #355 Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...

# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js
2019-09-16 15:59:40 +10:00
sachaaaaa
d17f86679f
Merge pull request #495 from sachaaaaa/fix_unknown_signedkey
[multi-device] Ensure the latest contact signed prekey is used
2019-09-16 13:05:30 +10:00
sachaaaaa
712afef8e2 simplify 2019-09-16 10:41:47 +10:00
sachaaaaa
6de6b762e6 Ensure the latest contact signed prekey is used 2019-09-16 09:33:17 +10:00
sachaaaaa
cf0628a001 Secondary device to send friend request automatically to all sync contact received 2019-09-12 10:18:28 +10:00
sachaaaaa
b10835ffc7 Share contact upon authorising secondary device 2019-09-05 21:29:20 +10:00
Beaudan Brown
9beea2cbd3 Enforce curlies completely and lint with new settings 2019-09-05 11:48:10 +10:00
Beaudan Campbell-Brown
a6abcaf826
Merge pull request #453 from Mikunj/profile-simplification
Profile simplification
2019-09-02 15:27:34 +10:00
Beaudan Campbell-Brown
43bd167965
Merge pull request #463 from loki-project/public-chat
Public chat
2019-09-02 15:03:28 +10:00
Mikunj
831ae09576 Cherry pick "profile simplification" from Mik 2019-09-02 14:16:23 +10:00
sachaaaaa
1ea934d69c
Merge pull request #457 from sachaaaaa/share_profile_name
[multi-device] Share primary device profile name upon secondary registration
2019-09-02 14:08:11 +10:00
sachaaaaa
9f8ee875b7 address review 2019-09-02 13:44:56 +10:00
sachaaaaa
97970ff465 Share primary device profile name upon secondary registration 2019-08-30 12:12:06 +10:00
sachaaaaa
7b9e578d8a lint 2019-08-30 11:33:56 +10:00
sachaaaaa
aa2438ad00 Shorter TTL for pairing requests 2019-08-30 10:54:52 +10:00
Mikunj
c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 2019-08-30 09:49:02 +10:00
Beaudan Brown
700ed5d2a8 Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api 2019-08-29 14:19:35 +10:00
Beaudan Brown
b5fd01a468 Add required metadata to sending pipeline and send to public channels 2019-08-29 13:34:11 +10:00
sachaaaaa
1d4c98adf0
Merge pull request #444 from sachaaaaa/logic_fixes
[multi-device] Fix bugs revealed during reviews
2019-08-28 17:08:57 +10:00
Beaudan Brown
eec4f22b50 Add crypto helpers and public error 2019-08-28 17:08:32 +10:00
sachaaaaa
bb0150624f Address reviews 2019-08-28 16:32:21 +10:00
sachaaaaa
661b207245 Various fixes for bugs introduced during reviews 2019-08-27 17:29:37 +10:00
sachaaaaa
53b974d63f Send messages to every devices linked to a primary device 2019-08-27 15:18:25 +10:00
sachaaaaa
5eab2098b6
Merge pull request #430 from sachaaaaa/handle_incoming_authorisation
[multi-device] Handle incoming pairing authorisation message
2019-08-27 09:43:34 +10:00
sachaaaaa
8ef54890b2
Update libtextsecure/message_receiver.js
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
2019-08-26 15:17:51 +10:00
sachaaaaa
c7dc79e7f9 Fix missing awaits! 2019-08-26 15:00:41 +10:00