From dfd6420ddc7706359ef0c7f4fb766c86cc766e56 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Wed, 12 Nov 2014 01:35:45 +0900
Subject: [PATCH 1/2] fix ToxID from QString convertation

---
 src/corestructs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corestructs.cpp b/src/corestructs.cpp
index 9a6c17416..c9712d1fe 100644
--- a/src/corestructs.cpp
+++ b/src/corestructs.cpp
@@ -33,7 +33,7 @@ ToxID ToxID::fromString(QString id)
     ToxID toxID;
     toxID.publicKey = id.left(TOX_ID_PUBLIC_KEY_LENGTH);
     toxID.noSpam    = id.mid(TOX_ID_PUBLIC_KEY_LENGTH, TOX_ID_NO_SPAM_LENGTH);
-    toxID.checkSum  = id.right(TOX_ID_CHECKSUM_LENGTH);
+    toxID.checkSum  = id.mid(TOX_ID_PUBLIC_KEY_LENGTH + TOX_ID_NO_SPAM_LENGTH, TOX_ID_CHECKSUM_LENGTH);
     return toxID;
 }
 

From 07ea2e08281cc8b461ae9077fffabe7a80548e88 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Wed, 12 Nov 2014 01:52:19 +0900
Subject: [PATCH 2/2] cleanup setting.ini file after a fiend removing

---
 src/friendlist.cpp    | 4 ++++
 src/misc/settings.cpp | 6 ++++++
 src/misc/settings.h   | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/src/friendlist.cpp b/src/friendlist.cpp
index 84a8590a3..b9e124e06 100644
--- a/src/friendlist.cpp
+++ b/src/friendlist.cpp
@@ -16,6 +16,7 @@
 
 #include "friend.h"
 #include "friendlist.h"
+#include "src/misc/settings.h"
 #include <QMenu>
 #include <QDebug>
 #include <QHash>
@@ -49,7 +50,10 @@ void FriendList::removeFriend(int friendId)
 {
     auto f_it = friendList.find(friendId);
     if (f_it != friendList.end())
+    {
+        Settings::getInstance().removeFriendSettings(f_it.value()->getToxID());
         friendList.erase(f_it);
+    }
 }
 
 void FriendList::clear()
diff --git a/src/misc/settings.cpp b/src/misc/settings.cpp
index 14e3f3663..1215ecfd2 100644
--- a/src/misc/settings.cpp
+++ b/src/misc/settings.cpp
@@ -857,6 +857,12 @@ void Settings::setFriendAlias(const ToxID &id, const QString &alias)
     }
 }
 
+void Settings::removeFriendSettings(const ToxID &id)
+{
+    QString key = id.publicKey;
+    friendLst.remove(key);
+}
+
 bool Settings::getFauxOfflineMessaging() const
 {
     return fauxOfflineMessaging;
diff --git a/src/misc/settings.h b/src/misc/settings.h
index 36143de26..cebb20986 100644
--- a/src/misc/settings.h
+++ b/src/misc/settings.h
@@ -199,6 +199,8 @@ public:
     QString getFriendAlias(const ToxID &id) const;
     void setFriendAlias(const ToxID &id, const QString &alias);
 
+    void removeFriendSettings(const ToxID &id);
+
     bool getFauxOfflineMessaging() const;
     void setFauxOfflineMessaging(bool value);