From f0d6a935d162c0dbf51a814df0ae67bbc1878590 Mon Sep 17 00:00:00 2001
From: dtvv <coritocorito@hotmail.com>
Date: Thu, 20 Sep 2018 18:32:05 -0500
Subject: [PATCH] =?UTF-8?q?In=20case=20the=20account=20already=20exists=20?=
 =?UTF-8?q?in=20the=20final=20step=20to=20cr=C3=A9ate=20an=20account=20set?=
 =?UTF-8?q?=20a=20toast=20message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crystalwallet/activities/CreateSeedActivity.kt    | 11 +++++++++--
 app/src/main/res/values/strings.xml                   |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt b/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
index 993ad24..1f3f535 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
@@ -9,6 +9,7 @@ import android.widget.Toast
 import butterknife.ButterKnife
 import butterknife.OnClick
 import butterknife.OnTextChanged
+import com.vincent.filepicker.ToastUtil
 import cy.agorise.crystalwallet.R
 import cy.agorise.crystalwallet.dialogs.material.*
 import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests
@@ -181,7 +182,8 @@ class CreateSeedActivity : CustomActivity() {
             override fun onPositive() {
 
                 // Make request to create a bitshare account
-                val request = ValidateCreateBitsharesAccountRequest(tietAccountName?.getText().toString(), applicationContext)
+                var accountName:String = tietAccountName?.getText().toString().trim()
+                val request = ValidateCreateBitsharesAccountRequest(accountName, applicationContext)
 
                 //DTVV: Friday 27 July 2018
                 //Makes dialog to tell the user that the account is been created
@@ -199,7 +201,12 @@ class CreateSeedActivity : CustomActivity() {
                         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                         intent.putExtra("SEED_ID", accountSeed.id)
                         startActivity(intent)
-                    } else {
+                    }
+                    else if (request.status == ValidateCreateBitsharesAccountRequest.StatusCode.ACCOUNT_EXIST) {
+                        ToastUtil.getInstance(globalActivity).showToast(globalActivity.getString(R.string.Account_already_exists))
+                        disableCreate()
+                    }
+                    else {
                         fieldsValidator.validate()
                     }
                 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1ae4695..cb6c970 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -514,6 +514,7 @@
     <string name="pattern">Pattern</string>
     <string name="new_user">New user?</string>
     <string name="existing_user">Existing user?</string>
+    <string name="Account_already_exists">Account already exists</string>
     <string name="connection_status">Connection status</string>
     <string name="people_icon">People icon</string>
     <string name="camera_feed_to_scan_qr">Camera feed to scan QR</string>