aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-16 22:23:42 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-16 22:23:42 +0100
commit8c4236b01bc1d594ee80909e8a84b5b672e86725 (patch)
tree56db08186ecf10b4d12c7b9ee1a3ea43b4bc45e8
parent155b607f4dbef1399196d4bdc43c6e10cfc142b0 (diff)
fixed regression of xmpp uris not working
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java19
-rw-r--r--src/main/java/eu/siacs/conversations/utils/XmppUri.java6
2 files changed, 11 insertions, 14 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 21ca5153..cdd096f5 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -547,7 +547,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
Invite invite = new Invite(data);
if (xmppConnectionServiceBound) {
invite.invite();
- } else if (invite.jid != null) {
+ } else if (invite.getJid() != null) {
this.mPendingInvite = invite;
} else {
this.mPendingInvite = null;
@@ -622,14 +622,14 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
}
private boolean handleJid(Invite invite) {
- List<Contact> contacts = xmppConnectionService.findContacts(invite.jid);
+ List<Contact> contacts = xmppConnectionService.findContacts(invite.getJid().toString());
if (contacts.size() == 0) {
- showCreateContactDialog(invite.jid,invite.fingerprint);
+ showCreateContactDialog(invite.getJid().toString(),invite.getFingerprint());
return false;
} else if (contacts.size() == 1) {
Contact contact = contacts.get(0);
- if (invite.fingerprint != null) {
- if (contact.addOtrFingerprint(invite.fingerprint)) {
+ if (invite.getFingerprint() != null) {
+ if (contact.addOtrFingerprint(invite.getFingerprint())) {
Log.d(Config.LOGTAG,"added new fingerprint");
xmppConnectionService.syncRosterToDisk(contact.getAccount());
}
@@ -640,10 +640,10 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
if (mMenuSearchView != null) {
mMenuSearchView.expandActionView();
mSearchEditText.setText("");
- mSearchEditText.append(invite.jid);
- filter(invite.jid);
+ mSearchEditText.append(invite.getJid().toString());
+ filter(invite.getJid().toString());
} else {
- mInitialJid = invite.jid;
+ mInitialJid = invite.getJid().toString();
}
return true;
}
@@ -754,9 +754,6 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
}
private class Invite extends XmppUri {
- private String jid;
- private boolean muc;
- private String fingerprint;
public Invite(Uri uri) {
super(uri);
diff --git a/src/main/java/eu/siacs/conversations/utils/XmppUri.java b/src/main/java/eu/siacs/conversations/utils/XmppUri.java
index 09abd049..a9b8d1c0 100644
--- a/src/main/java/eu/siacs/conversations/utils/XmppUri.java
+++ b/src/main/java/eu/siacs/conversations/utils/XmppUri.java
@@ -11,9 +11,9 @@ import eu.siacs.conversations.xmpp.jid.Jid;
public class XmppUri {
- private String jid;
- private boolean muc;
- private String fingerprint;
+ protected String jid;
+ protected boolean muc;
+ protected String fingerprint;
public XmppUri(String uri) {
try {