From 65bb54011017af0e004876e22902d601adf55c9a Mon Sep 17 00:00:00 2001
From: ChronosX88 <chronosx88@gmail.com>
Date: Thu, 23 May 2019 21:00:18 +0400
Subject: [PATCH] Added checking interlocutor's JID before saving chat

---
 .../chronosx88/influence/presenters/MainPresenter.kt       | 7 ++++++-
 app/src/main/res/values-ru-rRU/strings.xml                 | 1 +
 app/src/main/res/values/strings.xml                        | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/chronosx88/influence/presenters/MainPresenter.kt b/app/src/main/java/io/github/chronosx88/influence/presenters/MainPresenter.kt
index fcf0daa..6276c6e 100644
--- a/app/src/main/java/io/github/chronosx88/influence/presenters/MainPresenter.kt
+++ b/app/src/main/java/io/github/chronosx88/influence/presenters/MainPresenter.kt
@@ -17,6 +17,7 @@
 package io.github.chronosx88.influence.presenters
 
 import android.content.Intent
+import io.github.chronosx88.influence.R
 import io.github.chronosx88.influence.contracts.CoreContracts
 import io.github.chronosx88.influence.helpers.AppHelper
 import io.github.chronosx88.influence.helpers.LocalDBWrapper
@@ -36,7 +37,11 @@ class MainPresenter(private val view: CoreContracts.IMainViewContract) : CoreCon
     }
 
     override fun startChatWithPeer(username: String) {
-        LocalDBWrapper.createChatEntry(username, username)
+        if(!username.contains("@")) {
+            view.showSnackbar(AppHelper.getContext().getString(R.string.invalid_jid_error))
+            return
+        }
+        LocalDBWrapper.createChatEntry(username, username.split("@")[0])
         EventBus.getDefault().post(NewChatEvent(username))
     }
 
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 59bcee0..dbef96d 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -23,4 +23,5 @@
     <string name="hint_enter_a_message">Введите сообщение...</string>
     <string name="logout">Выйти из аккаунта</string>
     <string name="sign_in_button">Войти</string>
+    <string name="invalid_jid_error">Неверный JabberID!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1cc2914..4469e8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,4 +22,5 @@
     <string name="hint_enter_a_message">Enter message...</string>
     <string name="logout">Log out from account</string>
     <string name="sign_in_button">Sign In</string>
+    <string name="invalid_jid_error">Invalid JabberID!</string>
 </resources>