Minor transfer code improvements

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

@@ -761,16 +761,11 @@ class BaresipService: Service() {
                     }
                     "transfer failed" -> {
                         Log.d(TAG, "AoR $aor call $callp transfer failed: ${ev[1]}")
-                        // stopMediaPlayer()
                         val call = Call.ofCallp(callp)
-                        if (call == null) {
+                        if (call == null)
                             Log.w(TAG, "Call $callp with failed transfer is not found")
-                        } else {
+                        else
                             call.referTo = ""
-                            //Timer().schedule(500) {
-                            //    call.resume()
-                            //}
-                        }
                         if (!Utils.isVisible()) return
                     }
                     "call closed" -> {

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

@@ -26,11 +26,6 @@ object Config {
                     "module_app mwi.so")
         }
 
-        if (!config.contains("module presence.so")) {
-            config = config.replace("module_app mwi.so",
-                   "module_app mwi.so\nmodule_app presence.so")
-        }
-
         if (!config.contains("opus_application")) {
             config = "${config}opus_application voip\n"
         }

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

@@ -371,7 +371,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         transferButton.setOnClickListener {
-            callTransfer(UserAgent.uas()[aorSpinner.selectedItemPosition])
+            makeTransfer(UserAgent.uas()[aorSpinner.selectedItemPosition])
         }
 
         infoButton.setOnClickListener {
@@ -1315,7 +1315,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun callTransfer(ua: UserAgent) {
+    private fun makeTransfer(ua: UserAgent) {
         val layout = LayoutInflater.from(this)
                 .inflate(R.layout.call_transfer_dialog, findViewById(android.R.id.content),
                         false)
@@ -1334,12 +1334,15 @@ class MainActivity : AppCompatActivity() {
                 dialog.dismiss()
                 val uriText = transferUri.text.toString().trim()
                 if (uriText.isNotEmpty()) {
-                    val uri = Utils.uriComplete(ContactsActivity.findContactURI(uriText),
+                    val uri = Utils.uriComplete(
-                            Utils.aorDomain(ua.account.aor))
+                            ContactsActivity.findContactURI(uriText)
-                    if (!Utils.checkSipUri(uri))
+                                    .filterNot { it.isWhitespace() },
+                            Utils.aorDomain(ua.account.aor)
+                    )
+                    if (!Utils.checkSipUri(uri)) {
                         Utils.alertView(this@MainActivity, getString(R.string.notice),
                                 String.format(getString(R.string.invalid_sip_uri), uri))
-                    else {
+                    } else {
                         if (Call.uaCalls(ua, "").size > 0) {
                             Call.uaCalls(ua, "")[0].transfer(uri)
                             showCall(ua)