Commit Graph

1027 Commits (c365481aee39bd40c337e25f7fd5b978ed23dbf5)

Author SHA1 Message Date
Beaudan Brown 030264c689 Fix misuse of getAllDevicePubKeysForPrimaryPubKey and rename some vars 6 years ago
Beaudan Brown bce18b7ae6 Revert change so we are always friends with our secondary devices, check validSyncSender from primary pubkey rather than ourNumber 6 years ago
Beaudan Brown 74045d58d7 Use Int32 for the contact list buffer 6 years ago
Beaudan Campbell-Brown 6611a10855
Merge pull request #590 from BeaudanBrown/session-reset-on-fr
Session reset on fr
6 years ago
Beaudan Brown 1c022856b1 Address review 6 years ago
Beaudan Brown 370dee5abb Ensure we have the correct apis and listeners during the pairing process. Catch upnp error. Remove redundant friend requests 6 years ago
Beaudan Brown c31535edb4 Rename blockSync, only send contacts and profile if sending a GRANT request, do *not* always be friends with secondary devices because we still need to complete a friend request exchange 6 years ago
Beaudan Brown 332cd30052 Send contact sync message when becoming friends with contact and auto accept/send friend requests when receiving contact sync 6 years ago
Beaudan Campbell-Brown e88aca57f2
Merge pull request #603 from sachaaaaa/Fix_secondary_nickname
[multi-device] Fix secondary nickname
6 years ago
Beaudan Campbell-Brown 0f74a002df
Merge pull request #601 from BeaudanBrown/sync-messages
[multi-device] Sync messages
6 years ago
Beaudan Brown accd16cae1 Trigger friend request received update for the correct device conversation, throttle the sending of automated friend requests and don't send them to devices which sent *us* a friend request 6 years ago
Beaudan Brown 41fdcef695 Ensure that we can't miss the apisReady event and only listen for single emit 6 years ago
sachaaaaa dc626ec4d0 use primary device pubkey when setting nickname 6 years ago
Beaudan Brown 7e275ac266 Don't sync secondary devices and make sure initAPIs has been called before sending friend requests to synced contacts 6 years ago
Beaudan Brown f16b032056 Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message 6 years ago
Beaudan Brown 722c10dd70 Verify that incoming sync messages are from one of our devices, don't send messages to ourselves 6 years ago
Beaudan Brown 4aaa9ba26d Update sendSyncMessage to use primary pubkey and don't send to itsself, don't send typing messages for primary conversation (note to self) 6 years ago
Maxim Shishmarev 7c05939f55 Add group admins and the ability to remove members from private groups 6 years ago
Maxim Shishmarev cf18572049 Adding new group members; establishing sessions between non-friends 6 years ago
Maxim Shishmarev 0d19b708f9 Creating private group chats between friends 6 years ago
Beaudan Brown e9dc3b531e Simplify auto accept check 6 years ago
Beaudan Campbell-Brown 8235662518
Merge pull request #589 from Mikunj/pairing-fix
Fix cross platform device linking
6 years ago
Beaudan Brown 8ccf62ed4e Trigger endSession code if we receive a friend request from a friend 6 years ago
Mikunj 589b3f3233 Infer pairing message type from the content.
This should fix device pairing cross platform.
6 years ago
Beaudan Brown 72b60077c7 Give a simple error instead of logging a failed null check 6 years ago
Beaudan Brown 883feb668d The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device 6 years ago
Beaudan Campbell-Brown aa66b28ffe
Merge pull request #579 from BeaudanBrown/friends-with-any
Add isFriendsWithAnyDevice and use it in relevant places
6 years ago
Beaudan Brown 76b36845bb Add isFriendsWithAnyDevice and use it in relevant places 6 years ago
Beaudan Brown 08ad913105 Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc 6 years ago
Beaudan Brown d97eced37b Merge branch 'clearnet' into multi-device 6 years ago
Beaudan Brown 638f1c0e6c Bringing together all the stuff for attachments and link previews 6 years ago
Beaudan Brown f0c198c7b7 Split uploadData to public and private 6 years ago
Beaudan Brown a1921cfff3 Enable link previews to be sent as attachments, might need some more tweaking 6 years ago
Beaudan Brown c7a91686a8 Update proto id and use the server id as the attachmentpointer id 6 years ago
Beaudan Brown 5710c1268c Revert id field and add new url field to be compatible with mobile 6 years ago
Beaudan Brown 4e85435bf7 Update attachment pipeline to upload and download from loki fileserver 6 years ago
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…
6 years ago
sachaaaaa c38e145be7 lint 6 years ago
sachaaaaa f268fbb552
Merge pull request #534 from sachaaaaa/use_file_server_device_mapping
[multi-device] Use file server device mapping
6 years ago
sachaaaaa cc04bee38a Start all the receivers only after the secondary registration is finished 6 years ago
sachaaaaa 91a79ea57c Fetch device mapping from server when after receiving friend request 6 years ago
sachaaaaa a314721cce Both devices to update their mapping after secondary registration 6 years ago
sachaaaaa 4929f8d8db Move high-level authorisation from message_receivier to libloki.crypto 6 years ago
sachaaaaa 77bfee8892 No need to handle authorisations sent in friend requests 6 years ago
sachaaaaa d5ddc1c536 No need to attach authorisation with every friend request 6 years ago
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
  ...
6 years ago
Ryan Tharp c921d3e3b3 allow mixpanel to be already set up elsewhere 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 6 years ago
sachaaaaa d3653e8665 lint after manual merge 6 years ago
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
6 years ago
sachaaaaa d17f86679f
Merge pull request #495 from sachaaaaa/fix_unknown_signedkey
[multi-device] Ensure the latest contact signed prekey is used
6 years ago
sachaaaaa 712afef8e2 simplify 6 years ago
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 6 years ago
sachaaaaa cf0628a001 Secondary device to send friend request automatically to all sync contact received 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Campbell-Brown a6abcaf826
Merge pull request #453 from Mikunj/profile-simplification
Profile simplification
6 years ago
Beaudan Campbell-Brown 43bd167965
Merge pull request #463 from loki-project/public-chat
Public chat
6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
sachaaaaa 1ea934d69c
Merge pull request #457 from sachaaaaa/share_profile_name
[multi-device] Share primary device profile name upon secondary registration
6 years ago
sachaaaaa 9f8ee875b7 address review 6 years ago
sachaaaaa 97970ff465 Share primary device profile name upon secondary registration 6 years ago
sachaaaaa 7b9e578d8a lint 6 years ago
sachaaaaa aa2438ad00 Shorter TTL for pairing requests 6 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 6 years ago
Beaudan Brown 700ed5d2a8 Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api 6 years ago
Beaudan Brown b5fd01a468 Add required metadata to sending pipeline and send to public channels 6 years ago
sachaaaaa 1d4c98adf0
Merge pull request #444 from sachaaaaa/logic_fixes
[multi-device] Fix bugs revealed during reviews
6 years ago
Beaudan Brown eec4f22b50 Add crypto helpers and public error 6 years ago
sachaaaaa bb0150624f Address reviews 6 years ago
sachaaaaa 661b207245 Various fixes for bugs introduced during reviews 6 years ago
sachaaaaa 53b974d63f Send messages to every devices linked to a primary device 6 years ago
sachaaaaa 5eab2098b6
Merge pull request #430 from sachaaaaa/handle_incoming_authorisation
[multi-device] Handle incoming pairing authorisation message
6 years ago
sachaaaaa 8ef54890b2
Update libtextsecure/message_receiver.js
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
6 years ago
sachaaaaa c7dc79e7f9 Fix missing awaits! 6 years ago
sachaaaaa 6ab05e28df Handle incoming pairing authorisation message 6 years ago
sachaaaaa 794e6416c8 Add requestPairing high-level function 6 years ago
Beaudan Brown 895cedc801 Lint 6 years ago
sachaaaaa 713e9a3acf Fix pubkey validation 6 years ago
Beaudan Brown 3f4b94ba74 Transition to initialising rss feeds in schema update 6 years ago
Ryan Tharp 48f2637ff9 lint 6 years ago
Ryan Tharp 0a1655b03d poll all feeds 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
sachaaaaa edd800d382 Make linter happy 6 years ago
sachaaaaa bf8bb23683 remove stale comment and simplify conversation creation 6 years ago
sachaaaaa d208614909 Multi-device part 1: make primary account generate and send authorisation to secondary 6 years ago
Beaudan f857744e88 Revert sending id 6 years ago
Beaudan f718bf15d2 Prepare to delete message, send message id to server 6 years ago
Beaudan 21f0149e22 Send profile and update it 6 years ago
Beaudan 014558d939 Squash and clean of old PRs, move towards sending cleartext again 6 years ago
sachaaaaa 0e61ab8ccc Better document magic numbers 6 years ago
sachaaaaa 16e51a2c7a use variable for magic number 6 years ago
sachaaaaa b15799e7cb Generate 13 word seeds by default - still accept 25 word seeds. 6 years ago
Beaudan 7dd155eb16 Remove empty event trigger, doesn't seem to be required any more but could be wrong 6 years ago
Beaudan Campbell-Brown b76f84acc5
Merge pull request #377 from msgmaxim/typing-indicators
Add a toggle option for typing indicators; use short ttl for them
6 years ago
Maxim Shishmarev cdd374a4b2 Add a toggle option for typing indicators; use short ttl for them 6 years ago
Beaudan Campbell-Brown 0e9372d3d5
Merge pull request #373 from msgmaxim/timestamp-error
Show correct error on incorrect timestamp
6 years ago
Maxim Shishmarev 09d279dd93 Show correct error on incorrect timestamp 6 years ago
Beaudan 63396669bc Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore 6 years ago
Beaudan Campbell-Brown c1efa93137
Merge pull request #349 from BeaudanBrown/fix-disappearing
Fix disappearing messages and deleting contact
6 years ago