diff --git a/build.gradle b/build.gradle index d96eade18..e0a21f906 100644 --- a/build.gradle +++ b/build.gradle @@ -134,7 +134,7 @@ android { //versionNameSuffix " beta_(2023-01-10)" // " beta_(XXXX-XX-XX)" // activate for beta versions versionCode 132 - versionName "1.6.5" + versionName "1.7" //resConfigs "en" archivesBaseName += "-$versionName" diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java index e6a75bf74..0fda9555a 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/eu/siacs/conversations/entities/Account.java @@ -730,7 +730,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 { diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 52ad3d3c0..b17327abf 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -519,7 +519,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; diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index 083e823f9..23dd85fea 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -270,7 +270,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(), "@/+"); } } diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 46014b548..9ac68a74b 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -460,7 +460,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)));