From 76fecd766feb4657b7b94db1a6f3490f96b54181 Mon Sep 17 00:00:00 2001 From: Henrik Lepson Date: Fri, 8 Oct 2021 21:24:21 +0300 Subject: [PATCH] MOB-14 two small fixes --- .../tarkvaraprojekt/mobileauthapp/AuthFragment.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt index 5276b19..e918c64 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt @@ -6,6 +6,7 @@ import android.nfc.NfcAdapter import android.nfc.tech.IsoDep import android.os.Bundle import android.os.CountDownTimer +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -78,13 +79,11 @@ class AuthFragment : Fragment() { try { val comms = Comms(it, viewModel.userCan) val response = comms.readPersonalData(byteArrayOf(1, 2, 6)) - if (response != null) { - viewModel.setUserFirstName(response[1]) - viewModel.setUserLastName(response[0]) - viewModel.setUserIdentificationNumber(response[2]) - requireActivity().runOnUiThread{ - binding!!.timeCounter.text = getString(R.string.data_read) - } + viewModel.setUserFirstName(response[1]) + viewModel.setUserLastName(response[0]) + viewModel.setUserIdentificationNumber(response[2]) + requireActivity().runOnUiThread{ + binding!!.timeCounter.text = getString(R.string.data_read) } } catch (e: Exception) { requireActivity().runOnUiThread { @@ -94,7 +93,6 @@ class AuthFragment : Fragment() { Thread.sleep(1000) goToTheStart() } finally { - it.close() adapter.disableReaderMode(activity) } }