From a85dcead6bc9870fc87ed4c2c4f2caeae7da58ae Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 28 Apr 2018 00:22:03 +0200
Subject: [PATCH] add chat_id to qr-code

---
 .../src/main/java/com/b44t/messenger/ProfileActivity.java | 3 +++
 .../src/main/java/com/b44t/messenger/QRshowActivity.java  | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/messenger/ProfileActivity.java
index 9ba68f050..bc2f89676 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/ProfileActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/ProfileActivity.java
@@ -402,6 +402,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                 else if( position == showQrRow )
                 {
                     Intent intent2 = new Intent(getParentActivity(), QRshowActivity.class);
+                    Bundle b = new Bundle();
+                    b.putInt("chat_id", chat_id);
+                    intent2.putExtras(b);
                     getParentActivity().startActivity(intent2);
                 }
                 else if (position == blockContactRow)
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/QRshowActivity.java b/MessengerProj/src/main/java/com/b44t/messenger/QRshowActivity.java
index 1975c1bcf..521735334 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/QRshowActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/QRshowActivity.java
@@ -23,9 +23,15 @@ public class QRshowActivity extends Activity implements NotificationCenter.Notif
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_qrshow);
 
+        Bundle b = getIntent().getExtras();
+        int chat_id = 0;
+        if(b != null) {
+            chat_id = b.getInt("chat_id");
+        }
+
         ImageView imageView = (ImageView) findViewById(R.id.myImage);
         try {
-            Bitmap bitmap = encodeAsBitmap(MrMailbox.getSecurejoinQr(0));
+            Bitmap bitmap = encodeAsBitmap(MrMailbox.getSecurejoinQr(chat_id));
             imageView.setImageBitmap(bitmap);
         } catch (WriterException e) {
             e.printStackTrace();