aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-04 12:15:14 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-04 12:15:14 +0100
commitb3582c970e31dd02af1ec6f1126f330c8b54720a (patch)
treeb7ce6514cfd779568c1c130cb246c833717b6d31 /src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
parent12e2f0bdd72414b702138ff919a42f3bee1fa918 (diff)
made qr code available from muc and contact details as well
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 52687c81..5606208c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -140,6 +140,15 @@ public class ConferenceDetailsActivity extends XmppActivity {
}
@Override
+ protected String getShareableUri() {
+ if (conversation!=null) {
+ return "xmpp:"+conversation.getContactJid().split("/")[0]+"?join";
+ } else {
+ return super.getShareableUri();
+ }
+ }
+
+ @Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.muc_details, menu);
return true;