handle escaped @ symbol fixes Apple AddressBook problems

[MarvAmBass]

Hi there,

the Apple AddressBook has troubles to login since NextCloud 12.0.0

fix nextcloud/contacts#233

It's because it escapes the @ symbol with %40.

This will replace a escaped @ symbol %40, but only if there is no other @ Symbol present

[skjnldsv]

Please review or provide another way of doing this! :)

See related issue from nextcloud/contacts#233

[skjnldsv]

@MarvAmBass could you sign your pr please?

[MarvAmBass]

gpg sign?

[skjnldsv]

Nop, commit sign off :)

[nickvergessen]

See https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md#sign-your-work for more information.

You can do this manually for now:

git commit --amend -s
git push --force origin <your branch>

[MarvAmBass]

thanks, didn't know I had to do that.

I will do this within the next 8 hours. (not possible at the moment, unless it's possible via web interface)

[MarvAmBass]

I followed @nickvergessen's hint and hopefully signed it now.

[nickvergessen]

Hmpf, I didn't see that @skjnldsv already had commits in here.

Try:

git checkout master
git pull upstream master
git checkout patch1
git rebase -i upstream/master
git commit --amend -s
git push --force origin patch1

[MarvAmBass]

Hi,

thanks for the detailed instructions. I followed them - hope it worked this time

P.S. it gave me some errors - but I was working on a newly cloned branch since I no longer have the old one.

I think this was the most important error.

$ git rebase -i upstream/master
fatal: Needed a single revision
invalid upstream upstream/master

[nickvergessen]

What does git remote -v tell?

[MarvAmBass]

$ git remote -v
origin  https://www.github.com/MarvAmBass/apps (fetch)
origin  https://www.github.com/MarvAmBass/apps (push)

[nickvergessen]

git remote add upstream https://www.github.com/nextcloud/apps
git checkout master
git fetch upstream
git pull upstream master
git checkout patch1
git rebase -i upstream/master
git commit --amend -s
git push --force origin patch1

PS: if you dont want to continue this journey, it's okay and we can take it over. But if you want to continue to learn this I will happily continue 😉

[MarvAmBass]

thanks, ahh okay now it makes sense to me.

no problem I can continue.

Okay now I did everything and it seems that everything worked without an error.

Thanks for all the patience and help!

[skjnldsv]

@MorrisJobke @nickvergessen We should backport to 12

[MorrisJobke]

@MorrisJobke @nickvergessen We should backport to 12

Could you open the backport request?