Making sure we don't delete a NTS on restore (#982)

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -1332,10 +1332,10 @@ open class Storage @Inject constructor(
         }
 
         // if we have contacts locally but that are missing from the config, remove their corresponding thread
+        val currentUserKey = getUserPublicKey()
         val  removedContacts = getAllContacts().filter { localContact ->
-            moreContacts.firstOrNull {
+            localContact.accountID != currentUserKey && // we don't want to remove ourselves (ie, our Note to Self)
-                it.id == localContact.accountID
+            moreContacts.none { it.id == localContact.accountID } // we don't want to remove contacts that are present in the config
-            } == null
         }
         removedContacts.forEach {
             getThreadId(fromSerialized(it.accountID))?.let(::deleteConversation)