aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-03-30 22:16:35 +0200
committerChristian Schneppe <christian@pix-art.de>2018-03-30 22:16:35 +0200
commit10f067cd89aaf18cc280e4a02e770278c419fec5 (patch)
tree72532ed5edd28572bc790bf7548f6eb9a6dd2fac /src/main/java/de
parent048c6acf340c1225e7cfd295bb34412a62ea2f16 (diff)
fixed showing QR code on long press
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java5
2 files changed, 5 insertions, 2 deletions
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;
}