From 754e73e2413cadbdd78a54d832982f5bd28d1bb7 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 29 Aug 2019 10:21:23 +1000
Subject: [PATCH] Fix crash

---
 res/values/strings.xml                        |  9 +++---
 .../securesms/loki/NewConversationActivity.kt | 30 ++++++++-----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 399a85a277..751fef857d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1561,20 +1561,20 @@
     <string name="activity_key_pair_mnemonic_edit_text_label">Your Seed</string>
     <string name="activity_key_pair_toggle_mode_button_title_1">Restore Using Seed</string>
     <string name="activity_key_pair_toggle_mode_button_title_2">Register a New Account</string>
-    <string name="activity_key_pair_mnemonic_copied_message">Copied to Clipboard</string>
+    <string name="activity_key_pair_mnemonic_copied_message">Copied to clipboard</string>
     <string name="activity_key_pair_register_or_restore_button_title_1">Register</string>
     <string name="activity_key_pair_register_or_restore_button_title_2">Restore</string>
     <!-- Conversation list activity -->
     <string name="activity_conversation_list_empty_state_message">Looks like you don\'t have any conversations yet. Get started by messaging a friend.</string>
     <!-- Settings activity -->
-    <string name="activity_settings_public_key_copied_message">Copied to Clipboard</string>
+    <string name="activity_settings_public_key_copied_message">Copied to clipboard</string>
     <string name="activity_settings_share_public_key_button_title">Share Public Key</string>
     <string name="activity_settings_show_qr_code_button_title">Show QR Code</string>
     <string name="activity_settings_show_seed_button_title">Show Seed</string>
     <string name="activity_settings_seed_dialog_title">Your Seed</string>
     <string name="activity_settings_seed_dialog_copy_button_title">Copy</string>
     <string name="activity_settings_seed_dialog_ok_button_title">OK</string>
-    <string name="activity_settings_seed_copied_message">Copied to Clipboard</string>
+    <string name="activity_settings_seed_copied_message">Copied to clipboard</string>
     <!-- Profile activity -->
     <string name="activity_profile_title">Set Your Display Name</string>
     <string name="activity_profile_display_name_edit_text_hint">Your Display Name</string>
@@ -1590,7 +1590,8 @@
     <string name="fragment_new_conversation_public_key_explanation">Enter the public key of the person you\'d like to securely message. They can share their public key with you by going into Loki Messenger\'s in-app settings and clicking \"Share Public Key\".</string>
     <string name="fragment_new_conversation_qr_code_button_title">Scan a QR Code Instead</string>
     <string name="fragment_new_conversation_next_button_title">Next</string>
-    <string name="fragment_new_conversation_invalid_public_key_message">Invalid Public Key</string>
+    <string name="fragment_new_conversation_invalid_public_key_message">Invalid public key</string>
+    <string name="fragment_new_conversation_note_to_self_not_supported_message">Please enter the public key of the person you\'d like to message</string>
     <!-- Friend request view -->
     <string name="view_friend_request_accept_button_title">Accept</string>
     <string name="view_friend_request_reject_button_title">Reject</string>
diff --git a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
index 353f2a97c6..b4e218495d 100644
--- a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
@@ -8,17 +8,14 @@ import android.widget.Toast
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.ConversationActivity
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.ThreadDatabase
-import org.thoughtcrime.securesms.logging.Log
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.qr.ScanListener
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.DynamicTheme
 import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.whispersystems.signalservice.loki.api.LokiGroupChatAPI
 import org.whispersystems.signalservice.loki.utilities.PublicKeyValidation
 
 class NewConversationActivity : PassphraseRequiredActionBarActivity(), ScanListener {
@@ -67,19 +64,18 @@ class NewConversationActivity : PassphraseRequiredActionBarActivity(), ScanListe
     }
 
     fun startNewConversationIfPossible(hexEncodedPublicKey: String) {
-        if (PublicKeyValidation.isValid(hexEncodedPublicKey)) {
-            val contact = Recipient.from(this, Address.fromSerialized(hexEncodedPublicKey), true)
-            val intent = Intent(this, ConversationActivity::class.java)
-            intent.putExtra(ConversationActivity.ADDRESS_EXTRA, contact.address)
-            intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA))
-            intent.setDataAndType(getIntent().data, getIntent().type)
-            val existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(contact)
-            intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread)
-            intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
-            startActivity(intent)
-            finish()
-        } else {
-            Toast.makeText(this, R.string.fragment_new_conversation_invalid_public_key_message, Toast.LENGTH_SHORT).show()
-        }
+        if (!PublicKeyValidation.isValid(hexEncodedPublicKey)) { return Toast.makeText(this, R.string.fragment_new_conversation_invalid_public_key_message, Toast.LENGTH_SHORT).show() }
+        val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
+        if (hexEncodedPublicKey == userHexEncodedPublicKey) { return Toast.makeText(this, R.string.fragment_new_conversation_note_to_self_not_supported_message, Toast.LENGTH_SHORT).show() }
+        val contact = Recipient.from(this, Address.fromSerialized(hexEncodedPublicKey), true)
+        val intent = Intent(this, ConversationActivity::class.java)
+        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, contact.address)
+        intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA))
+        intent.setDataAndType(getIntent().data, getIntent().type)
+        val existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(contact)
+        intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread)
+        intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
+        startActivity(intent)
+        finish()
     }
 }
\ No newline at end of file