From 863ad4c343abcb2849401383f97d3f42111b774b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 10:52:30 +0100
Subject: [PATCH 1/3] Show syncthing QR code

---
 src/freedombone-app-syncthing | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 18398425..9426aed4 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -94,7 +94,11 @@ function syncthing_show_id {
     SYNCTHING_ID=$(cat ~/.syncthing-server-id)
     dialog --title $"Device ID for ${PROJECT_NAME}" \
            --backtitle $"Freedombone User Control Panel" \
-           --msgbox $"In a desktop terminal press shift and select the ID below,\nthen right click and copy.\n\nWithin Connectbot select Menu/Copy and then highlight the ID below\n\n$SYNCTHING_ID" 12 78
+           --msgbox $"In a desktop terminal press shift and select the ID below,\nthen right click and copy.\n\nWithin Connectbot select Menu/Copy and then highlight the ID below\n\n$SYNCTHING_ID\n\nAlternatively press Enter to display a QR code which can be scanned." 13 78
+    clear
+    echo $'Your Syncthing ID code'
+    echo ''
+    echo "$SYNCTHING_ID" | qrencode -t UTF8
 }
 
 function syncthing_add_id {

From 1d441d393da3a5759e254f60fe1065aba6b34191 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 10:55:04 +0100
Subject: [PATCH 2/3] Wait for keypress when displaying qr code

---
 src/freedombone-app-syncthing | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 9426aed4..76b9ea8d 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -99,6 +99,8 @@ function syncthing_show_id {
     echo $'Your Syncthing ID code'
     echo ''
     echo "$SYNCTHING_ID" | qrencode -t UTF8
+    echo ''
+    read -n1 -rsp $"Press any key to continue..." key
 }
 
 function syncthing_add_id {

From 249d56eb2463e474b1b806b59bb10e227e03afbe Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 11:02:50 +0100
Subject: [PATCH 3/3] Ensure no carriage return in qr code

---
 src/freedombone-app-syncthing | 2 +-
 src/freedombone-controlpanel  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 76b9ea8d..3a2e053a 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -98,7 +98,7 @@ function syncthing_show_id {
     clear
     echo $'Your Syncthing ID code'
     echo ''
-    echo "$SYNCTHING_ID" | qrencode -t UTF8
+    echo -n "$SYNCTHING_ID" | qrencode -t UTF8
     echo ''
     read -n1 -rsp $"Press any key to continue..." key
 }
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 8be2d32a..c4eb712d 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1312,7 +1312,7 @@ function show_tripwire_verification_code {
     echo $'Tripwire Verification Code'
     echo ''
     DBHASH=$(sha512sum  /var/lib/tripwire/${HOSTNAME}.twd)
-    echo "$DBHASH" | qrencode -t UTF8
+    echo -n "$DBHASH" | qrencode -t UTF8
     echo ''
     echo "$DBHASH"
     echo ''