From 62d7542216ee9243ddc0e4ab707b8163a5a6a3a1 Mon Sep 17 00:00:00 2001
From: Daniel Shokouhi <dshokouhi@gmail.com>
Date: Thu, 14 Oct 2021 18:30:06 -0700
Subject: [PATCH] Remove extra HA version check for NFC settings (#1785)

---
 .../android/settings/SettingsFragment.kt         |  5 +----
 .../android/settings/SettingsPresenter.kt        |  1 -
 .../android/settings/SettingsPresenterImpl.kt    | 16 ----------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt
index cb6720b568a..47322165ab3 100644
--- a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt
@@ -125,10 +125,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SettingsView {
 
         findPreference<Preference>("nfc_tags")?.let {
             val pm: PackageManager = requireContext().packageManager
-            if (pm.hasSystemFeature(PackageManager.FEATURE_NFC))
-                it.isVisible = presenter.nfcEnabled()
-            else
-                it.isVisible = false
+            it.isVisible = pm.hasSystemFeature(PackageManager.FEATURE_NFC)
             it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
                 startActivity(NfcSetupActivity.newInstance(requireActivity()))
                 true
diff --git a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenter.kt b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenter.kt
index 86fc8ea3e39..6260c0da930 100644
--- a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenter.kt
@@ -7,7 +7,6 @@ interface SettingsPresenter {
     fun getPreferenceDataStore(): PreferenceDataStore
     fun onCreate()
     fun onFinish()
-    fun nfcEnabled(): Boolean
     fun isLockEnabled(): Boolean
     fun sessionTimeOut(): Int
     suspend fun getNotificationRateLimits(): RateLimitResponse?
diff --git a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt
index ab75ea51c4d..5ec46081c84 100644
--- a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt
@@ -188,22 +188,6 @@ class SettingsPresenterImpl @Inject constructor(
         }
     }
 
-    // Make sure Core is above 0.114.0 because that's the first time NFC is available.
-    override fun nfcEnabled(): Boolean {
-        return runBlocking {
-            var splitVersion = listOf<String>()
-
-            try {
-                splitVersion = integrationUseCase.getHomeAssistantVersion().split(".")
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to get core version.", e)
-            }
-
-            return@runBlocking splitVersion.size > 2 &&
-                (Integer.parseInt(splitVersion[0]) > 0 || Integer.parseInt(splitVersion[1]) >= 114)
-        }
-    }
-
     override suspend fun getNotificationRateLimits(): RateLimitResponse? = withContext(Dispatchers.IO) {
         try {
             integrationUseCase.getNotificationRateLimits()