From 6d0d8a3be7bebe3e6b2cb781c906dde491ad302f Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 1 Jun 2019 19:02:07 +0300
Subject: [PATCH] - If account is accessed from AoR spinner, return directly to
 main activity.

---
 .../kotlin/com/tutpro/baresip/AccountActivity.kt     |  6 ++++++
 .../kotlin/com/tutpro/baresip/AccountsActivity.kt    | 12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index 5756f78f..927e9a6d 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -1,5 +1,7 @@
 package com.tutpro.baresip
 
+import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.Menu
@@ -373,12 +375,16 @@ class AccountActivity : AppCompatActivity() {
 
             if (regCheck.isChecked) Api.ua_register(UserAgent.uas()[uaIndex].uap)
 
+            val i = Intent()
+            setResult(Activity.RESULT_OK, i)
             finish()
             return true
 
         } else if (item.itemId == android.R.id.home) {
 
             Log.d("Baresip", "Back array was pressed at Account")
+            val i = Intent()
+            setResult(Activity.RESULT_OK, i)
             finish()
             return true
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
index d61fa20f..435b557b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
@@ -20,6 +20,7 @@ class AccountsActivity : AppCompatActivity() {
     internal lateinit var alAdapter: AccountListAdapter
     internal var aor = ""
     internal var password = ""
+    internal var fromAorSpinner = false
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -69,11 +70,20 @@ class AccountsActivity : AppCompatActivity() {
 
         val accp = intent.getStringExtra("accp")
         if (accp != "") {
+            fromAorSpinner = true
             val i = Intent(this, AccountActivity::class.java)
             val b = Bundle()
             b.putString("accp", accp)
             i.putExtras(b)
-            startActivity(i)
+            startActivityForResult(i, 1)
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (fromAorSpinner) {
+            val i = Intent()
+            setResult(Activity.RESULT_OK, i)
+            finish()
         }
     }