From 10f067cd89aaf18cc280e4a02e770278c419fec5 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 30 Mar 2018 22:16:35 +0200
Subject: fixed showing QR code on long press

---
 src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 2 +-
 src/main/java/de/pixart/messenger/ui/XmppActivity.java         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 5db052b10..93b8146dc 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1080,7 +1080,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                     }
                 }
             } else {
-                activity.showQrCode();
+                activity.showQrCode(conversation.getAccount().getShareableUri());
             }
         });
         messageListAdapter.setOnQuoteListener(this::quoteText);
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 81d87261c..5d4d1e49f 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -1061,7 +1061,10 @@ public abstract class XmppActivity extends AppCompatActivity {
     }
 
     protected void showQrCode() {
-        final String uri = getShareableUri();
+        showQrCode(getShareableUri());
+    }
+
+    protected void showQrCode(final String uri) {
         if (uri == null || uri.isEmpty()) {
             return;
         }
-- 
cgit v1.2.3