fixed app not closing bug, when started from website

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt

@@ -69,6 +69,7 @@ class AuthFragment : Fragment() {
                 goToTheStart()
             }
         }.start()
+        //binding!!.nextButton.visibility = View.INVISIBLE
         binding!!.nextButton.setOnClickListener { goToNextFragment() }
         binding!!.cancelButton.setOnClickListener { goToTheStart() }
         val adapter = NfcAdapter.getDefaultAdapter(activity)
@@ -140,8 +141,7 @@ class AuthFragment : Fragment() {
         } else {
             if (!args.mobile) {
                 //Currently for some reason the activity is not killed entirely. Must be looked into further.
-                requireActivity().finish()
-                exitProcess(0)
+                requireActivity().finishAndRemoveTask()
             } else {
                 val resultIntent = Intent()
                 requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent)

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/CanFragment.kt

@@ -127,10 +127,14 @@ class CanFragment : Fragment() {
         // TODO: Needs special handling when the app is launched with intent. Temporary solution at the moment.
         if (args.saving) {
             findNavController().navigate(R.id.action_canFragment_to_settingsFragment)
-        } else if (args.auth) {
-            val resultIntent = Intent()
-            requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent)
-            requireActivity().finish()
+        } else if (args.auth || args.mobile) {
+            if (args.mobile) {
+                val resultIntent = Intent()
+                requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent)
+                requireActivity().finish()
+            } else {
+                requireActivity().finishAndRemoveTask()
+            }
         } else {
             findNavController().navigate(R.id.action_canFragment_to_homeFragment)
         }

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/HomeFragment.kt

@@ -60,8 +60,6 @@ class HomeFragment : Fragment() {
                     intentParams.setAuthUrl(requireActivity().intent.getStringExtra("authUrl")!!)
                     intentParams.setOrigin(requireActivity().intent.getStringExtra("originUrl")!!)
                 } else { //Website
-                    // Currently the test website won't send the authUrl parameter
-                    //Log.i("intentDebugging", requireActivity().intent.data.toString())
                     var challenge = requireActivity().intent.data!!.getQueryParameter("challenge")!!
                     // TODO: Since due to encoding plus gets converted to space, temporary solution is to replace it back.
                     challenge = challenge.replace(" ", "+")

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt

@@ -128,10 +128,14 @@ class PinFragment : Fragment() {
     private fun goToTheStart() {
         if (args.saving) {
             findNavController().navigate(R.id.action_canFragment_to_settingsFragment)
-        } else if (args.auth) {
-            val resultIntent = Intent()
-            requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent)
-            requireActivity().finish()
+        } else if (args.auth || args.mobile) {
+            if (args.mobile) {
+                val resultIntent = Intent()
+                requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent)
+                requireActivity().finish()
+            } else {
+                requireActivity().finishAndRemoveTask()
+            }
         } else {
             findNavController().navigate(R.id.action_canFragment_to_homeFragment)
         }

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/ResultFragment.kt

@@ -14,15 +14,6 @@ import com.google.gson.JsonObject
 import com.koushikdutta.ion.Ion
 import com.tarkvaraprojekt.mobileauthapp.databinding.FragmentResultBinding
 import com.tarkvaraprojekt.mobileauthapp.model.ParametersViewModel
-import com.tarkvaraprojekt.mobileauthapp.model.SmartCardViewModel
-import com.tarkvaraprojekt.mobileauthapp.network.BASE_URL
-import com.tarkvaraprojekt.mobileauthapp.network.TokenApi
-import com.tarkvaraprojekt.mobileauthapp.network.TokenApiService
-import com.tarkvaraprojekt.mobileauthapp.network.TokenItem
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlin.system.exitProcess
 
 /**
  * ResultFragment is used to create a JWT and to send response to the website/application
@@ -48,12 +39,8 @@ class ResultFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding!!.resultBackButton.setOnClickListener {
-//            if (args.mobile) {
-//                createResponse()
-//            }
-            postToken()
-        }
+        binding!!.resultBackButton.visibility = View.GONE
+        postToken()
     }
 
     /**
@@ -64,40 +51,40 @@ class ResultFragment : Fragment() {
         json.addProperty("token", paramsModel.token)
         json.addProperty("challenge", paramsModel.challenge)
 
-        Ion.getDefault(activity).getConscryptMiddleware().enable(false)
-
+        Ion.getDefault(activity).conscryptMiddleware.enable(false)
         Ion.with(activity)
             .load(paramsModel.origin + paramsModel.authUrl)
                 .setJsonObjectBody(json)
                 .asJsonObject()
                 .setCallback { e, result ->
                     // do stuff with the result or error
-                    Log.i("Log thingy", result.toString())
+                    if (result == null) {
+                        // TODO: Set auth message failed and close the app
+                        Log.i("Log thingy fail", "result was null")
+                        if (args.mobile) {
+                            createResponse(false)
+                        } else {
+                            requireActivity().finishAndRemoveTask()
+                        }
+                    } else {
+                        Log.i("Log thingy success", result.toString())
+                        if (args.mobile) {
+                            createResponse(true, result.toString(), paramsModel.token)
+                        } else {
+                            requireActivity().finishAndRemoveTask()
+                        }
+                    }
                 }
-//        CoroutineScope(Dispatchers.Default).launch {
-//            val response = TokenApi.retrofitService.postToken(jsonBody)
-//            Log.v("Response", response.message())
-//            if (response.isSuccessful) {
-//                //Success scenario here
-//            } else {
-//                //Failure scenario here
-//                if (args.mobile) {
-//                    createResponse(false)
-//                } else {
-//                    //Currently for some reason the activity is not killed entirely. Must be looked into further.
-//                    requireActivity().finish()
-//                    exitProcess(0)
-//                }
-//            }
-//        }
     }
 
     /**
      * Only used when the MobileAuthApp was launched by an app. Not for website use.
      */
-    private fun createResponse(success: Boolean = true) {
+    private fun createResponse(success: Boolean = true, result: String = "noResult", token: String = "noToken") {
         val responseCode = if (success) AppCompatActivity.RESULT_OK else AppCompatActivity.RESULT_CANCELED
         val resultIntent = Intent()
+        resultIntent.putExtra("result", result)
+        resultIntent.putExtra("token", token)
         requireActivity().setResult(responseCode, resultIntent)
         requireActivity().finish()
     }

MobileAuthApp/app/src/main/res/values-en/strings.xml

@@ -56,8 +56,8 @@
     <string name="clear_button">FORGET</string>
 
     <!-- string resources for ResultFragment layout-->
-    <string name="result_text">See Fragment vastutab vastuse tagastamise eest.</string>
-    <string name="result_info">Hiljem sulgeb rakendus automaatselt.</string>
+    <string name="result_text">Controlling the created token</string>
+    <string name="result_info">Wait for the app to close</string>
 
     <!-- menu -->
     <string name="menu_settings_title">Settings</string>

MobileAuthApp/app/src/main/res/values-et/strings.xml

@@ -55,8 +55,8 @@
     <string name="gender_label">SUGU</string>
 
     <!-- string resources for ResultFragment layout-->
-    <string name="result_text">See Fragment vastutab vastuse tagastamise eest.</string>
-    <string name="result_info">Hiljem sulgeb rakendus automaatselt.</string>
+    <string name="result_text">Tulemust kontrollitakse</string>
+    <string name="result_info">Rakendus sulgeb ennast ise</string>
 
     <!-- menu -->
     <string name="menu_settings_title">Seaded</string>

MobileAuthApp/app/src/main/res/values/strings.xml

@@ -55,8 +55,8 @@
     <string name="clear_button">FORGET</string>
 
     <!-- string resources for ResultFragment layout-->
-    <string name="result_text">See Fragment vastutab vastuse tagastamise eest.</string>
-    <string name="result_info">Hiljem sulgeb rakendus automaatselt.</string>
+    <string name="result_text">Controlling the created token</string>
+    <string name="result_info">Wait for the app to close</string>
 
     <!-- menu -->
     <string name="menu_settings_title">Settings</string>