From 5f4b67a61ecc02c13e6d2cb11e66f24bd4ecaf0e Mon Sep 17 00:00:00 2001
From: Dmitri Bogomolov <4glitch@gmail.com>
Date: Mon, 26 Feb 2018 12:36:00 +0200
Subject: [PATCH] fromAddress - str, subject - unicode

(for simple encoding like for extended)
---
 src/bitmessageqt/uisignaler.py | 10 ++++++----
 src/helper_msgcoding.py        |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/bitmessageqt/uisignaler.py b/src/bitmessageqt/uisignaler.py
index 2753121f..7efda169 100644
--- a/src/bitmessageqt/uisignaler.py
+++ b/src/bitmessageqt/uisignaler.py
@@ -14,8 +14,9 @@ class UISignaler(QtCore.QThread):
     updateStatusBar = QtCore.Signal(object)
     updateSentItemStatusByToAddress = QtCore.Signal(object, str)
     updateSentItemStatusByAckdata = QtCore.Signal(object, str)
-    displayNewInboxMessage = QtCore.Signal(object, str, str, object, str)
-    displayNewSentMessage = QtCore.Signal(object, str, str, str, object, str)
+    displayNewInboxMessage = QtCore.Signal(object, str, object, object, str)
+    displayNewSentMessage = QtCore.Signal(
+        object, str, str, object, object, str)
     updateNetworkStatusTab = QtCore.Signal(bool, bool, Peer)
     updateNumberOfMessagesProcessed = QtCore.Signal()
     updateNumberOfPubkeysProcessed = QtCore.Signal()
@@ -54,14 +55,15 @@ class UISignaler(QtCore.QThread):
                 self.updateSentItemStatusByAckdata.emit(ackData, message)
             elif command == 'displayNewInboxMessage':
                 inventoryHash, toAddress, fromAddress, subject, body = data
+
                 self.displayNewInboxMessage.emit(
                     inventoryHash, toAddress, fromAddress,
-                    unicode(subject, 'utf-8'), body)
+                    subject, body)
             elif command == 'displayNewSentMessage':
                 toAddress, fromLabel, fromAddress, subject, message, ackdata = data
                 self.displayNewSentMessage.emit(
                     toAddress, fromLabel, fromAddress,
-                    unicode(subject, 'utf-8'), message, ackdata)
+                    subject.decode('utf-8'), message, ackdata)
             elif command == 'updateNetworkStatusTab':
                 outbound, add, destination = data
                 self.updateNetworkStatusTab.emit(outbound, add, destination)
diff --git a/src/helper_msgcoding.py b/src/helper_msgcoding.py
index 28f92288..76447884 100644
--- a/src/helper_msgcoding.py
+++ b/src/helper_msgcoding.py
@@ -155,5 +155,6 @@ class MsgDecode(object):
         # Throw away any extra lines (headers) after the subject.
         if subject:
             subject = subject.splitlines()[0]
-        self.subject = subject
-        self.body = body
+        # Field types should be the same for all message types
+        self.subject = subject.decode('utf-8', 'replace')
+        self.body = body.decode('utf-8', 'replace')