From 892d144a1573f1ccf8b6767a3d91374288dff796 Mon Sep 17 00:00:00 2001
From: Justin Bassett <bassett.justint@gmail.com>
Date: Fri, 2 Oct 2020 08:40:17 -0400
Subject: [PATCH] Ensure that we don't write to tags unless explicitly asked to
 do so. (#998)

---
 .../io/homeassistant/companion/android/nfc/NfcSetupActivity.kt | 3 ++-
 app/src/main/res/layout/activity_nfc_setup.xml                 | 1 +
 app/src/main/res/values/strings.xml                            | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt b/app/src/main/java/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt
index 91d790c12..65185b5ae 100644
--- a/app/src/main/java/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/nfc/NfcSetupActivity.kt
@@ -90,7 +90,8 @@ class NfcSetupActivity : AppCompatActivity() {
                 val url = ndefMessage?.records?.get(0)?.toUri().toString()
                 val nfcTagId = UrlHandler.splitNfcTagId(url)
                 if (nfcTagId == null) {
-                    viewModel.postNewUUID()
+                    Log.w(TAG, "Unable to read tag!")
+                    Toast.makeText(this, R.string.nfc_invalid_tag, Toast.LENGTH_LONG).show()
                 } else {
                     viewModel.nfcReadEvent.postValue(nfcTagId)
                 }
diff --git a/app/src/main/res/layout/activity_nfc_setup.xml b/app/src/main/res/layout/activity_nfc_setup.xml
index bf9d0e38d..54853d2ab 100644
--- a/app/src/main/res/layout/activity_nfc_setup.xml
+++ b/app/src/main/res/layout/activity_nfc_setup.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/nfc_view"
     tools:context="io.homeassistant.companion.android.nfc.NfcSetupActivity">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa8c049b9..94eb6ffb4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -317,4 +317,5 @@ like to connect to:</string>
   <string name="widget_text_hint_service_service">Service</string>
   <string name="widget_text_size_default">30</string>
   <string name="widget_text_size_label">Widget text size:</string>
+    <string name="nfc_invalid_tag">This tag does not contain Home Assistant data</string>
 </resources>