diff --git a/MobileAuthApp/app/src/main/AndroidManifest.xml b/MobileAuthApp/app/src/main/AndroidManifest.xml index be2c120..f592e7e 100644 --- a/MobileAuthApp/app/src/main/AndroidManifest.xml +++ b/MobileAuthApp/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + + timer.cancel() + requireActivity().runOnUiThread { + binding!!.timeCounter.text = getString(R.string.card_detected) + } + val card = IsoDep.get(tag) + card.timeout = 32768 + card.use { + 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) + } + } + it.close() + adapter.disableReaderMode(activity) + } + }, NfcAdapter.FLAG_READER_NFC_A, null) } private fun goToNextFragment() { - //Dummy data for now - viewModel.setUserFirstName("John") - viewModel.setUserLastName("Doe") - viewModel.setUserIdentificationNumber("012345678910") timer.cancel() findNavController().navigate(R.id.action_authFragment_to_userFragment) } diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/MainActivity.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/MainActivity.kt index bb85fbc..bc93c57 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/MainActivity.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/MainActivity.kt @@ -1,7 +1,9 @@ package com.tarkvaraprojekt.mobileauthapp +import android.nfc.NfcAdapter import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.util.Log import androidx.navigation.NavController import androidx.navigation.fragment.NavHostFragment import com.tarkvaraprojekt.mobileauthapp.databinding.ActivityMainBinding diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt index ec3e69b..5e798b7 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt @@ -44,8 +44,11 @@ class PinFragment : Fragment() { ) findNavController().navigate(R.id.action_pinFragment_to_canFragment) } else { - Toast.makeText(requireContext(), getString(R.string.length_pin), Toast.LENGTH_SHORT) - .show() + // Currently it is not important to enter PIN1 so we will allow the user to leave this field empty + //Toast.makeText(requireContext(), getString(R.string.length_pin), Toast.LENGTH_SHORT) + // .show() + viewModel.setUserPin("1234") + findNavController().navigate(R.id.action_pinFragment_to_canFragment) } } diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/UserFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/UserFragment.kt index 5e7735a..632e1fa 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/UserFragment.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/UserFragment.kt @@ -13,8 +13,8 @@ import com.tarkvaraprojekt.mobileauthapp.model.SmartCardViewModel /** * Fragment that is used to display the persons name and national identification number. - * Currently needed in order to test that the app is working because the results at the moment - * are not sent to some other website or app. + * Currently needed in order to test that the app is working and information is read + * from the ID card via NFC. */ class UserFragment : Fragment() { diff --git a/MobileAuthApp/app/src/main/res/values/strings.xml b/MobileAuthApp/app/src/main/res/values/strings.xml index b82e7fe..d4ef1e6 100644 --- a/MobileAuthApp/app/src/main/res/values/strings.xml +++ b/MobileAuthApp/app/src/main/res/values/strings.xml @@ -17,6 +17,8 @@ CAN Sisesta ID kaardi CAN (Card Access Number) CANi pikkus on vale + Kaart on tuvastatud. Hoia kaarti vastu telefoni. + Andmed loetud. ID kaardiga ühenduse loomiseks pane kaart vastu telefoni