Nice UI for adding a contact through a Gateway #378
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
singpolyma
force-pushed
the
jabber-iq-gateway
branch
from
44567f9
to
3309c03
Compare
singpolyma
force-pushed
the
jabber-iq-gateway
branch
4 times, most recently
from
e9b25fe
to
f45ade8
Compare
If there are any. Same as the old UI when there are no gateways.
singpolyma
force-pushed
the
jabber-iq-gateway
branch
from
f45ade8
to
f0d1e4d
Compare
singpolyma
changed the title
|
@edhelas this one is ready for initial review now, and is fully functional in my tests :) |
edhelas
reviewed
Apr 3, 2017
app/widgets/Roster/Roster.php
Outdated
| $this->rpc( | ||
| 'Roster.addGatewayPrompt', | ||
| $packet->from, | ||
| ''.$packet->content->prompt, |
There was a problem hiding this comment.
When you're casting to string please use (string)$variable and not ''. ;)
app/widgets/Roster/Roster.php
Outdated
|
|
||
| function onIqGatewaySet($packet) | ||
| { | ||
| $form = json_decode($packet->content->extra); |
There was a problem hiding this comment.
No need of this extra step if it's an array, what do you think?
There was a problem hiding this comment.
I was getting an error about not serializing SimpleXML without this.
There was a problem hiding this comment.
after other changes, this no longer happens, it seems. So I've removed the json encoding again
singpolyma
force-pushed
the
jabber-iq-gateway
branch
from
a9da059
to
566ef34
Compare
If the Gateway doesn't actually support jabber:iq:gateway, use a reasonable fallback.
Otherwise we sometimes get errors about not being allowed to serialize SimpleXML stuff.
singpolyma
force-pushed
the
jabber-iq-gateway
branch
from
566ef34
to
fae151a
Compare
If we got a prompt back earlier, then we know that the gateway supports jabber:iq:gateway. So we send off the user input, and then re-run our form handler on whatever comes back. Don't dismiss the dialog right away in JavaScript, but wait for the server to be really done first.
The gateway may perform some validation on the user input, and we need to show any errors to the user so they can correct their mistakes.
singpolyma
force-pushed
the
jabber-iq-gateway
branch
from
fae151a
to
859ff1a
Compare
|
@edhelas I believe I have made all your suggested changes :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implements https://xmpp.org/extensions/xep-0100.html#addressing as well as a final fallback to the old %-encoding hack that some gateways still use for historical reasons.
Closes #367
Depends on https://github.com/movim/moxl/pull/17