- Use Utils function to add activities to activity stack.

app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt

@@ -16,7 +16,7 @@ class AboutActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_about)
 
-        BaresipService.activities.add(0, "about")
+        Utils.addActivity("about")
 
         val aboutText = findViewById<TextView>(R.id.aboutText)
         val text = String.format(getString(R.string.about_text), BuildConfig.VERSION_NAME)

app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt

@@ -42,7 +42,7 @@ class AccountActivity : AppCompatActivity() {
         setContentView(R.layout.activity_account)
 
         val accp = intent.getStringExtra("accp")
-        BaresipService.activities.add(0, "account,$accp")
+        Utils.addActivity("account,$accp")
 
         acc = Account.find(accp)!!
         aor = acc.aor

app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt

@@ -21,7 +21,7 @@ class AccountsActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_accounts)
 
-        BaresipService.activities.add(0, "accounts")
+        Utils.addActivity("accounts")
 
         val listView = findViewById(R.id.accounts) as ListView
         generateAccounts()

app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt

@@ -25,12 +25,13 @@ class CallsActivity : AppCompatActivity() {
     internal var aor = ""
 
     public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
 
+        super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_calls)
 
         aor = intent.getStringExtra("aor")!!
-        BaresipService.activities.add(0, "calls,$aor")
+        Utils.addActivity("calls,$aor")
+
         val ua = Account.findUa(aor)!!
         account = ua.account
 

app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt

@@ -30,8 +30,6 @@ class ChatActivity : AppCompatActivity() {
 
         super.onCreate(savedInstanceState)
 
-        Log.d("Baresip", "Chat created")
-
         setContentView(R.layout.activity_chat)
 
         aor = intent.getStringExtra("aor")!!
@@ -50,7 +48,7 @@ class ChatActivity : AppCompatActivity() {
         }
 
         if (!BaresipService.activities.first().startsWith("chat,$aor,$peerUri"))
-            BaresipService.activities.add(0, "chat,$aor,$peerUri,$focus")
+            Utils.addActivity("chat,$aor,$peerUri,$focus")
 
         imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         this@ChatActivity.window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN)

app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt

@@ -24,14 +24,13 @@ class ChatsActivity: AppCompatActivity() {
     public override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)
-
         setContentView(R.layout.activity_chats)
 
         listView = findViewById(R.id.chats) as ListView
         plusButton = findViewById(R.id.plusButton) as ImageButton
 
         aor = intent.extras!!.getString("aor")!!
-        BaresipService.activities.add(0, "chats,$aor")
+        Utils.addActivity("chats,$aor")
 
         val headerView = findViewById(R.id.account) as TextView
         val headerText = "${getString(R.string.account)} ${aor.split(":")[1]}"

app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt

@@ -54,7 +54,7 @@ class ConfigActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_config)
 
-        BaresipService.activities.add(0, "config")
+        Utils.addActivity("config")
 
         autoStart = findViewById(R.id.AutoStart) as CheckBox
         val asCv = Config.variable("auto_start")

app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt

@@ -19,7 +19,7 @@ class ContactsActivity : AppCompatActivity() {
         setContentView(R.layout.activity_contacts)
 
         aor = intent.getStringExtra("aor")!!
-        BaresipService.activities.add(0, "contacts,$aor")
+        Utils.addActivity("contacts,$aor")
 
         val listView = findViewById(R.id.contacts) as ListView
         clAdapter = ContactListAdapter(this, Contact.contacts(), aor)

app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt

@@ -567,8 +567,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onPause() {
         Log.d("Baresip", "Main paused")
-        if ((BaresipService.activities.size == 0) || (BaresipService.activities[0] != "main"))
-            BaresipService.activities.add(0, "main")
+        Utils.addActivity("main")
         visible = false
         super.onPause()
     }

app/src/main/kotlin/com/tutpro/baresip/Utils.kt

@@ -559,4 +559,9 @@ object Utils {
         return Color.argb(255, rnd.nextInt(256), rnd.nextInt(256),
                 rnd.nextInt(256))
     }
+
+    fun addActivity(activity: String) {
+        if (BaresipService.activities.first() != activity)
+            BaresipService.activities.add(0, activity)
+    }
 }