mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-29 00:14:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Allow plus unescaped (Cheogram) + version 1.7

Browse source
This commit is contained in:
Arne 2023-05-23 00:46:52 +02:00
parent 4d60ef3c4b
commit b8534714d8
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

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

2
src/main/java/eu/siacs/conversations/entities/Account.java
View file

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

2
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View file

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

2
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
View file

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

2
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

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