~singpolyma/cheogram-android

2483f4f50b92e87c6164d851bbcea764777edfed — Stephen Paul Weber 1 year, 4 months ago 7f65863
Allow plus unescaped

It is not special in XMPP URIs
M src/main/java/eu/siacs/conversations/entities/Account.java => src/main/java/eu/siacs/conversations/entities/Account.java +1 -1
@@ 691,7 691,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable 

    public String getShareableUri() {
        List<XmppUri.Fingerprint> fingerprints = this.getFingerprints();
        String uri = "xmpp:" + Uri.encode(getJid().asBareJid().toEscapedString(), "@/");
        String uri = "xmpp:" + Uri.encode(getJid().asBareJid().toEscapedString(), "@/+");
        if (fingerprints.size() > 0) {
            return XmppUri.getFingerprintUri(uri, fingerprints, ';');
        } else {

M src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java => src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +1 -1
@@ 388,7 388,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
            if (http) {
                return "https://conversations.im/j/" + XmppUri.lameUrlEncode(mConversation.getJid().asBareJid().toEscapedString());
            } else {
                return "xmpp:" + Uri.encode(mConversation.getJid().asBareJid().toEscapedString(), "@/") + "?join";
                return "xmpp:" + Uri.encode(mConversation.getJid().asBareJid().toEscapedString(), "@/+") + "?join";
            }
        } else {
            return null;

M src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java => src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +1 -1
@@ 203,7 203,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
        if (http) {
            return "https://conversations.im/i/" + XmppUri.lameUrlEncode(contact.getJid().asBareJid().toEscapedString());
        } else {
            return "xmpp:" + Uri.encode(contact.getJid().asBareJid().toEscapedString(), "@/");
            return "xmpp:" + Uri.encode(contact.getJid().asBareJid().toEscapedString(), "@/+");
        }
    }


M src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java => src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +1 -1
@@ 454,7 454,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
    public static void shareAsChannel(final Context context, final String address) {
        Intent shareIntent = new Intent();
        shareIntent.setAction(Intent.ACTION_SEND);
        shareIntent.putExtra(Intent.EXTRA_TEXT, "xmpp:" + Uri.encode(address, "@/") + "?join");
        shareIntent.putExtra(Intent.EXTRA_TEXT, "xmpp:" + Uri.encode(address, "@/+") + "?join");
        shareIntent.setType("text/plain");
        try {
            context.startActivity(Intent.createChooser(shareIntent, context.getText(R.string.share_uri_with)));