From 7cf31ad64589d956e02a1c751192d583fd5c8cc4 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 24 Sep 2017 20:33:01 +0200
Subject: unified share with menu

---
 .../pixart/messenger/ui/ConferenceDetailsActivity.java  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java')

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 7e45afa6d..77f571433 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -311,8 +311,11 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                             this.onSubjectEdited);
                 }
                 break;
-            case R.id.action_share:
-                shareUri();
+            case R.id.action_share_http:
+                shareLink(true);
+                break;
+            case R.id.action_share_uri:
+                shareLink(false);
                 break;
             case R.id.action_save_as_bookmark:
                 saveAsBookmark();
@@ -333,11 +336,15 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     }
 
     @Override
-    protected String getShareableUri() {
+    protected String getShareableUri(boolean http) {
         if (mConversation != null) {
-            return "xmpp:" + mConversation.getJid().toBareJid().toString() + "?join";
+            if (http) {
+                return Config.inviteMUCURL + mConversation.getJid().toBareJid();
+            } else {
+                return "xmpp:" + mConversation.getJid().toBareJid() + "?join";
+            }
         } else {
-            return "";
+            return null;
         }
     }
 
-- 
cgit v1.2.3