Beaudan Campbell-Brown
|
5a630118ed
|
Merge pull request #613 from BeaudanBrown/bugfixes
[multi-device] Bugfixes and throttle pairing check
|
6 years ago |
|
Beaudan Campbell-Brown
|
350bf28f9b
|
Merge pull request #620 from BeaudanBrown/multi-string
[multi-device] Update multi device string to match mobile
|
6 years ago |
|
Beaudan Brown
|
c168e34adf
|
Update multi device string to match mobile
|
6 years ago |
|
Beaudan Campbell-Brown
|
b42a8aab1f
|
Typo
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
|
6 years ago |
|
Beaudan Brown
|
807f4cbd2a
|
Storing primary device pubkey on the conversation model for easier access, ensuring that we accept all the friend requests from the primary conversation rather than the secondary
|
6 years ago |
|
Beaudan Brown
|
24a687c106
|
Throttle the refreshing of device mappings to once every minute
|
6 years ago |
|
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 Brown
|
8c79800cee
|
Use oninput for secondary devices names and allow for consecutive pairings without closing the dialog
|
6 years ago |
|
Beaudan Campbell-Brown
|
deedcc1d64
|
Merge pull request #606 from BeaudanBrown/contact-sync
[multi-device]Contact syncing
|
6 years ago |
|
Beaudan Brown
|
1c022856b1
|
Address review
|
6 years ago |
sachaaaaa
|
b4295918da
|
Merge pull request #609 from sachaaaaa/fix_status_contact_sync
[multi-device] Fix contact status in createContactSyncProtoMessage
|
6 years ago |
sachaaaaa
|
843c5b5ebc
|
Fix contact status in createContactSyncProtoMessage
|
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 |
|
sachaaaaa
|
5529deb019
|
Merge pull request #602 from sachaaaaa/unpairing_device
[multi-device] Allow unpairing device
|
6 years ago |
|
Beaudan Campbell-Brown
|
e83d0f6635
|
Merge pull request #605 from Mikunj/mnemonic-word-fix
Use first 3 mnemonic words instead of the last 3 when displaying secret words.
|
6 years ago |
Mikunj
|
f61de2cf8e
|
Use first 3 mnemonic words instead of the last 3.
|
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
|
15c07ea7df
|
Sync secondary devices again but handle the receiving of them properly
|
6 years ago |
|
sachaaaaa
|
86168ef870
|
lower case variable
|
6 years ago |
|
Mikunj
|
f87c9d2222
|
Fix up numbers in pairing type.
|
6 years ago |
|
Beaudan Campbell-Brown
|
f80e86ce74
|
Merge pull request #604 from BeaudanBrown/throttle-auto-fr
Throttle automated friend requests + bugfix
|
6 years ago |
|
sachaaaaa
|
3f52b9df93
|
Make unpairing a toggle-able feature (enable with window.lokiFeatureFlags.multiDeviceUnpairing = true)
|
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
|
cd2c4b993a
|
lint
|
6 years ago |
|
sachaaaaa
|
dc626ec4d0
|
use primary device pubkey when setting nickname
|
6 years ago |
|
sachaaaaa
|
9ab3626149
|
Fix italic tags showing up
|
6 years ago |
|
sachaaaaa
|
497f42165a
|
Allow unpairing device
|
6 years ago |
|
sachaaaaa
|
30b26807e8
|
Merge pull request #600 from sachaaaaa/paired_device_alias
[multi-device]Allow primary device to assign local aliases to paired devices
|
6 years ago |
|
sachaaaaa
|
13572c3524
|
Merge branch 'multi-device' into paired_device_alias
|
6 years ago |
|
sachaaaaa
|
ea267fb952
|
Merge pull request #597 from sachaaaaa/show_secondary_secret_words
[multi-device]Show secondary secret words
|
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 |
|
sachaaaaa
|
46613de846
|
lint
|
6 years ago |
|
sachaaaaa
|
b324421534
|
Allow primary device to assign local aliases to paired devices
|
6 years ago |
|
sachaaaaa
|
d350e4adfb
|
Merge pull request #598 from sachaaaaa/secret_words_on_primary_device
[multi-device]show pairing words on paired device list
|
6 years ago |
|
sachaaaaa
|
9ddc237f6d
|
show pairing words instead of pubkeys on the primary device's paired devices list.
|
6 years ago |
|
Beaudan Campbell-Brown
|
09da4af2df
|
Merge pull request #591 from BeaudanBrown/type-fix
Fix pairing error
|
6 years ago |
|
sachaaaaa
|
65361d33f5
|
New menu item "show pairing words" for secondary devices
|
6 years ago |
|
Beaudan Brown
|
94b0faf2aa
|
Remove (hopefully) last place the type of a pairing request is being checked
|
6 years ago |
|
Beaudan Campbell-Brown
|
8235662518
|
Merge pull request #589 from Mikunj/pairing-fix
Fix cross platform device linking
|
6 years ago |
|
Beaudan Campbell-Brown
|
d52a08a9e2
|
Merge pull request #586 from BeaudanBrown/robust-sessions
[multi-device] Robust sessions
|
6 years ago |
|
Mikunj
|
589b3f3233
|
Infer pairing message type from the content.
This should fix device pairing cross platform.
|
6 years ago |