Allow plus unescaped

Stephen Paul Weber created 2 years ago

It is not special in XMPP URIs

Change summary

src/main/java/eu/siacs/conversations/entities/Account.java             | 2 
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 2 
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java    | 2 
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 2 
4 files changed, 4 insertions(+), 4 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Account.java

@@ -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 {

src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java

@@ -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;

src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java

@@ -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(), "@/+");
         }
     }
 

src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java

@@ -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)));