From 9afafe387aca9f8793f5a9e3d76d841ada7658b7 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 29 May 2016 20:21:53 +0200 Subject: fix creation of conferences with 1 participant --- src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 9af83edd8..548682dfb 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -699,7 +699,6 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU if (xmppConnectionServiceBound) { this.mPostponedActivityResult = null; if (requestCode == REQUEST_CREATE_CONFERENCE) { - Log.d(Config.LOGTAG,"account jid: "+ intent.getStringExtra(EXTRA_ACCOUNT)); Account account = extractAccount(intent); final String subject = intent.getStringExtra("subject"); List jids = new ArrayList<>(); @@ -719,7 +718,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU //ignored } } - if (account != null && jids.size() > 1) { + if (account != null && jids.size() > 0) { xmppConnectionService.createAdhocConference(account, subject, jids, mAdhocConferenceCallback); mToast = Toast.makeText(this, R.string.creating_conference,Toast.LENGTH_LONG); mToast.show(); -- cgit v1.2.3 From 49cefd1c0ccbd727fe13bc0c5f0ed3dfe7ebca15 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 29 May 2016 20:44:58 +0200 Subject: handle app links invites in the form of https://conversations/i/localpart/domainpart --- src/main/AndroidManifest.xml | 9 +++++++++ src/main/java/eu/siacs/conversations/utils/XmppUri.java | 12 +++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 182a8ee9e..90727b8c0 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -76,6 +76,15 @@ + + + + + + + + + segments = uri.getPathSegments(); + if ("https".equalsIgnoreCase(scheme) && "conversations.im".equalsIgnoreCase(host) && segments.size() >= 3) { + // sample : https://conversations.im/i/foo/bar.com + jid = segments.get(1)+"@"+segments.get(2); + } else if ("xmpp".equalsIgnoreCase(scheme)) { + // sample: xmpp:foo@bar.com muc = "join".equalsIgnoreCase(uri.getQuery()); if (uri.getAuthority() != null) { jid = uri.getAuthority(); @@ -42,7 +48,7 @@ public class XmppUri { } fingerprint = parseFingerprint(uri.getQuery()); } else if ("imto".equalsIgnoreCase(scheme)) { - // sample: imto://xmpp/jid@foo.com + // sample: imto://xmpp/foo@bar.com try { jid = URLDecoder.decode(uri.getEncodedPath(), "UTF-8").split("/")[1]; } catch (final UnsupportedEncodingException ignored) { -- cgit v1.2.3 From 71787bd2e1fbfe6faf34a38378a90c5df19e9ba1 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 29 May 2016 20:54:41 +0200 Subject: version bump to 1.12.6 --- CHANGELOG.md | 3 +++ build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 779d4f33b..a4fab8b3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ###Changelog +####Version 1.12.6 +* bug fixes + ####Version 1.12.5 * new create conference dialog * show first unread message on top diff --git a/build.gradle b/build.gradle index dc0dde1e4..59cf30194 100644 --- a/build.gradle +++ b/build.gradle @@ -54,8 +54,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 146 - versionName "1.12.5" + versionCode 147 + versionName "1.12.6" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" } -- cgit v1.2.3 From ea18ceae4adfaed63879673fa0109778caf97fbd Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 29 May 2016 21:25:27 +0200 Subject: avoid npe when sending omemo messages to group --- src/main/java/eu/siacs/conversations/generator/MessageGenerator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java index 823af397a..09c882932 100644 --- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java @@ -12,6 +12,7 @@ import java.util.TimeZone; import eu.siacs.conversations.crypto.axolotl.AxolotlService; import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage; import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.services.XmppConnectionService; @@ -81,7 +82,8 @@ public class MessageGenerator extends AbstractGenerator { } private static boolean recipientSupportsOmemo(Message message) { - return message.getContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY); + Contact c = message.getContact(); + return c != null && c.getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY); } public static void addMessageHints(MessagePacket packet) { -- cgit v1.2.3 From 762820072a4cdc5ee420ac75321b5416d5d31df3 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 29 May 2016 21:25:39 +0200 Subject: version bump to 1.12.7 --- CHANGELOG.md | 3 +++ build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4fab8b3a..e2f4c5c9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ###Changelog +####Version 1.12.7 +* bug fixes + ####Version 1.12.6 * bug fixes diff --git a/build.gradle b/build.gradle index 59cf30194..57a3021bc 100644 --- a/build.gradle +++ b/build.gradle @@ -54,8 +54,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 147 - versionName "1.12.6" + versionCode 148 + versionName "1.12.7" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" } -- cgit v1.2.3