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

[multi-device] No secondary timeout #541

Merged

Conversation

@sachaaaaa
Copy link
Collaborator

commented Oct 2, 2019

As discussed with Mik and Niels, when registering the secondary device, the timeout on desktop is not necessary and will actually lead to a mismatched pairing more easily (i.e. primary thinks the pairing is successful while the secondary actually had reset after a timeout).
Instead, we now show a cancel button that allows the user to manually cancel and then retry.

Copy link
Collaborator

left a comment

Nit pick

);
this.$('#register-secondary-device')
.removeAttr('disabled')
.text('Link');

This comment has been minimized.

Copy link
@BeaudanBrown

BeaudanBrown Oct 2, 2019

Collaborator

Not sure how consistent we are being with using the i18n stuff or if we are just resigning to doing a big sweep up in future when we want to do translations?

This comment has been minimized.

Copy link
@sachaaaaa

sachaaaaa Oct 2, 2019

Author Collaborator

You're right, I guess we'll have to do a big sweep...

@sachaaaaa sachaaaaa merged commit b73e603 into loki-project:multi-device Oct 2, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@sachaaaaa sachaaaaa deleted the sachaaaaa:no_secondary_timeout branch Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.