Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multi device #623

Merged
merged 197 commits into from Nov 18, 2019
Merged

Multi device #623

merged 197 commits into from Nov 18, 2019

Conversation

BeaudanBrown
Copy link

THE BIG ONE

sachaaaaa and others added 30 commits August 12, 2019 15:07
@sachaaaaa
Multi-device part 1: make primary account generate and send authorisa…
d208614 
…tion to secondary
@sachaaaaa
Use Loki Schema for database versioning
88c1454
@sachaaaaa
remove stale comment and simplify conversation creation
bf8bb23
@sachaaaaa
Make linter happy
edd800d
@sachaaaaa
Merge pull request #381 from sachaaaaa/multidevice
c308155 
Multi-device part 1: make primary account generate and send authorisa…
@sachaaaaa
Fix pubkey validation
713e9a3
@sachaaaaa
Merge pull request #426 from sachaaaaa/pubKeyValidation
33d789b 
[multi-device] Fix pubkey validation
@sachaaaaa
Add requestPairing high-level function
794e641
@sachaaaaa
Pairing authorisations: refactor proto, change sql table, add getters
a441100
@sachaaaaa
Handle incoming pairing authorisation message
6ab05e2
@sachaaaaa
Secondary device registration UI
632e35c
@sachaaaaa
Display "Pair New Device" in menu for non-secondary devices
b5aee4f
@sachaaaaa
Dialogs for device pairing requests - Primary device side
ac4038e
@sachaaaaa
Improve object validation in createPairingAuthorisationProtoMessage
a2463f7
@sachaaaaa
Fix main header being redrawn every 100ms
4a35492
@sachaaaaa
Merge pull request #427 from sachaaaaa/refactor_db_proto
434b6f6 
[multi-device] DB and proto changes
@sachaaaaa
Fix missing awaits!
c7dc79e
@sachaaaaa @Mikunj
Update libtextsecure/message_receiver.js
8ef5489 
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
@sachaaaaa
Merge pull request #432 from sachaaaaa/pair_device_menu_item
1ced8e3 
[multi-device] Display "Pair New Device" in menu
@sachaaaaa
Ensure one listener and one event for 'secondaryDeviceRegistration'
2754969
@sachaaaaa
fix events registration issues
79d8426
@sachaaaaa
Merge pull request #434 from sachaaaaa/fix_clipboard_redraws
59e1bb4 
[multi-device] Fix main header being redrawn every 100ms
@sachaaaaa
Merge pull request #433 from sachaaaaa/primary_accept_request
24cf1ef 
[multi-device] UI for accepting pairing request on Primary devices
@sachaaaaa
Merge pull request #431 from sachaaaaa/secondary_device_registration_…
06d60fd 
…view

[multi-device] Secondary device registration UI
@sachaaaaa
Merge pull request #428 from sachaaaaa/request_pairing
5f2f9d5 
[multi-device] Add high-level function to send a pairing request
@sachaaaaa
Merge pull request #430 from sachaaaaa/handle_incoming_authorisation
5eab209 
[multi-device] Handle incoming pairing authorisation message
@sachaaaaa
Allow receiving and sending messages before lokiP2PApi is defined.
4dd62a2
@sachaaaaa
Prevent showing inbox if secondary device registration is still ongoing
415ea79
@sachaaaaa
Display incoming messages in the primary device conversation
2c052a6
@sachaaaaa
Send messages to every devices linked to a primary device
53b974d
Beaudan Brown and others added 23 commits November 13, 2019 13:34
Throttle the refreshing of device mappings to once every minute
24a687c
Storing primary device pubkey on the conversation model for easier ac…
807f4cb 
…cess, ensuring that we accept all the friend requests from the primary conversation rather than the secondary
@neuroscr
Merge branch 'multi-device' of https://github.com/loki-project/loki-m…
eab53e1 
…essenger into multidevice-publicchat
@neuroscr
rename getUsersAnnotations => getUsers
1a59ef5
@neuroscr
use renamed getUsers
0b05753
@neuroscr
improve comments
60cefc7
@neuroscr
verifyUserObjectDeviceMap removed notFoundHandler from prototype/redu…
cad9a89 
…ced branching depth/returns users pub keys not found
@sachaaaaa
Typo
b42a8aa 
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
Reduce indentation and simplify code by using existing verification f…
ac762d4 
…unctions
@neuroscr
Merge pull request #1 from BeaudanBrown/public-incoming
a7b1540 
Prepare for public sync
Stop sending sync messages to public chats and mark messages from any…
f1c155b 
… of our devices as outgoing
@neuroscr
Merge pull request #2 from BeaudanBrown/public-incoming
0825181 
Public outgoing
@neuroscr
lint
bd17c4b
Update multi device string to match mobile
c168e34
@neuroscr
refactor verifyAuthorisation out of validateAuthorisation
66eae90
@neuroscr
diable checkSigs, use libloki.crypto.validateAuthorisation, lint, rem…
d1526b9 
…ove dead code
@neuroscr
reduce branching depth, prefer reduce over forEach, add comments, lin…
c40fe1d 
…t, dead code removal
Merge pull request #620 from BeaudanBrown/multi-string
350bf28 
[multi-device] Update multi device string to match mobile
Merge pull request #613 from BeaudanBrown/bugfixes
5a63011 
[multi-device] Bugfixes and throttle pairing check
Merge pull request #539 from neuroscr/multidevice-publicchat
a2e8e64 
[multi-device] public chat
Merge branch 'clearnet' into prep-merge
685ada5
Ensure we can still send messages to ourselves (sync) and disable gro…
56a1c31 
…up chats
Merge pull request #622 from BeaudanBrown/prep-merge
502d471 
Prep merge
@sachaaaaa
Copy link

I just saw my life flash before me

@sachaaaaa sachaaaaa merged commit 6c28b1a into clearnet Nov 18, 2019
@vincentbavitz vincentbavitz deleted the multi-device branch March 24, 2020 02:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@BeaudanBrown @sachaaaaa @Mikunj @neuroscr