From 4ffe71e1dfc97100a509736e9dc01fe4f180cb26 Mon Sep 17 00:00:00 2001
From: jikstra <jikstra@disroot.org>
Date: Wed, 4 Sep 2019 16:37:45 +0200
Subject: [PATCH] Fix encoding for email & name, fix qrencode command in repl

---
 examples/repl/main.rs | 2 +-
 src/dc_securejoin.rs  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/examples/repl/main.rs b/examples/repl/main.rs
index 4371f90a8..27a990789 100644
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -525,7 +525,7 @@ unsafe fn handle_cmd(line: &str, ctx: Arc<RwLock<Context>>) -> Result<ExitResult
                     }
                     println!("{}", qr);
                     let output = Command::new("qrencode")
-                            .args(&["-t", "ansiutf8", format!("\"{}\"", qr.as_str()).as_str(), "-o", "-"])
+                            .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
                             .output()
                             .expect("failed to execute process");
                     io::stdout().write_all(&output.stdout).unwrap();
diff --git a/src/dc_securejoin.rs b/src/dc_securejoin.rs
index ba7044863..c1b90ffd0 100644
--- a/src/dc_securejoin.rs
+++ b/src/dc_securejoin.rs
@@ -1,5 +1,5 @@
 use mmime::mailimf_types::*;
-use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
+use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
 use std::ptr;
 
 use crate::aheader::EncryptPreference;
@@ -22,6 +22,9 @@ use crate::stock::StockMessage;
 use crate::types::*;
 use crate::x::*;
 
+pub const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC
+    .remove(b'.');
+
 pub unsafe fn dc_get_securejoin_qr(
     context: &Context,
     group_chat_id: uint32_t,
@@ -76,8 +79,8 @@ pub unsafe fn dc_get_securejoin_qr(
         return cleanup(fingerprint, qr);
     }
 
-    let self_addr_urlencoded = utf8_percent_encode(&self_addr, NON_ALPHANUMERIC).to_string();
-    let self_name_urlencoded = utf8_percent_encode(&self_name, NON_ALPHANUMERIC).to_string();
+    let self_addr_urlencoded = utf8_percent_encode(&self_addr, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
+    let self_name_urlencoded = utf8_percent_encode(&self_name, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
 
     qr = if 0 != group_chat_id {
         if let Ok(chat) = Chat::load_from_db(context, group_chat_id) {