From 8f75ab6528c498119d0b6cff5c37ad8b9dce6c1c Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 20 Feb 2018 22:14:39 +0200
Subject: [PATCH] use auth_pass in accounts fixed setting of AoR when adding an
 account

---
 app/src/main/assets/accounts                           | 8 ++++----
 app/src/main/java/com/tutpro/baresip/MainActivity.java | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/assets/accounts b/app/src/main/assets/accounts
index 49528ec9..2dbe10b2 100644
--- a/app/src/main/assets/accounts
+++ b/app/src/main/assets/accounts
@@ -27,8 +27,8 @@
 #
 # Examples:
 #
-#  <sip:user:secret@domain.com;transport=tcp>
-#  <sip:user:secret@1.2.3.4;transport=tcp>
-#  <sip:user:secret@[2001:df8:0:16:216:6fff:fe91:614c]:5070;transport=tcp>
+#  <sip:user@domain.com;auth_pass=secret;transport=tcp>
+#  <sip:user@1.2.3.4;auth_pass=secret;transport=tcp>
+#  <sip:user@[2001:df8:0:16:216:6fff:fe91:614c]:5070;transport=tcp;auth_pass=secret>
 #
-<sip:foo:password@test.tutpro.com>;auth_user=foo;outbound="sip:192.168.43.98:5060;transport=tcp";ptime=20;audio_codecs=OPUS/48000/2,speex/16000,speex/8000;video_codecs="";regint=600;pubint=0;sipnat=outbound
+<sip:foo@test.tutpro.com>;auth_user=foo;auth_pass=xxx;outbound="sip:192.168.43.98:5060;transport=tcp";ptime=20;audio_codecs=OPUS/48000/2,speex/16000,speex/8000;video_codecs="";regint=600;pubint=0;sipnat=outbound
diff --git a/app/src/main/java/com/tutpro/baresip/MainActivity.java b/app/src/main/java/com/tutpro/baresip/MainActivity.java
index b3a1d5e6..9a6948bb 100644
--- a/app/src/main/java/com/tutpro/baresip/MainActivity.java
+++ b/app/src/main/java/com/tutpro/baresip/MainActivity.java
@@ -207,7 +207,7 @@ public class MainActivity extends AppCompatActivity {
         String aor = ua_aor(ua);
         Log.d("Baresip", "Adding account " + ua + " with AoR " + aor);
         Accounts.add(new Account(ua, aor));
-        AoRs.add(aor + " ()");
+        AoRs.add(aor);
         Images.add(R.drawable.yellow);
         runOnUiThread(new Runnable() {
                 @Override
@@ -416,6 +416,7 @@ public class MainActivity extends AppCompatActivity {
                                 peer_uri);
                         final Call new_call = new Call(ua, call, peer_uri, "Answer");
                         In.add(new_call);
+                        Log.d("Baresip", "Current UA is " + ua_current());
                         if (ua.equals(ua_current())) {
                             runOnUiThread(new Runnable() {
                                 @Override