Remove account's PreferIPv6MediaTitle setting

app/src/main/cpp/baresip.c

@@ -1083,23 +1083,6 @@ Java_com_tutpro_baresip_Api_account_1set_1dtmfmode(JNIEnv *env, jobject thiz,
     return account_set_dtmfmode(acc, mode);
 }
 
-JNIEXPORT jint JNICALL
-Java_com_tutpro_baresip_Api_account_1mediaaf(JNIEnv *env, jobject thiz, jstring jAcc) {
-    const char *native_acc = (*env)->GetStringUTFChars(env, jAcc, 0);
-    struct account *acc = (struct account *)strtoul(native_acc, NULL, 10);
-    (*env)->ReleaseStringUTFChars(env, jAcc, native_acc);
-    return account_mediaaf(acc);
-}
-
-JNIEXPORT jint JNICALL
-Java_com_tutpro_baresip_Api_account_1set_1mediaaf(JNIEnv *env, jobject thiz, jstring jAcc, jint jAf) {
-    const char *native_acc = (*env)->GetStringUTFChars(env, jAcc, 0);
-    struct account *acc = (struct account *)strtoul(native_acc, NULL, 10);
-    (*env)->ReleaseStringUTFChars(env, jAcc, native_acc);
-    LOGD("setting account mediaaf to '%s'\n", net_af2name(jAf));
-    return account_set_mediaaf(acc, jAf);
-}
-
 JNIEXPORT jstring JNICALL
 Java_com_tutpro_baresip_Api_account_1extra(JNIEnv *env, jobject thiz, jstring javaAcc) {
     const char *native_acc = (*env)->GetStringUTFChars(env, javaAcc, 0);

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

@@ -20,7 +20,6 @@ class Account(val accp: String) {
     var videoCodec = ArrayList<String>()
     var regint = Api.account_regint(accp)
     var mediaEnc = Api.account_mediaenc(accp)
-    var preferIPv6Media = false
     var dtmfMode = Api.account_dtmfmode(accp)
     var answerMode = Api.account_answermode(accp)
     var vmUri = Api.account_vm_uri(accp)
@@ -56,9 +55,6 @@ class Account(val accp: String) {
         }
 
         val extra = Api.account_extra(accp)
-        preferIPv6Media = Utils.paramValue(extra,"prefer_ipv6_media") == "yes"
-        if (!preferIPv6Media)
-            preferIPv6Media = Api.account_mediaaf(accp) == Api.AF_INET6
         callHistory = Utils.paramValue(extra,"call_history") == ""
 
     }
@@ -108,8 +104,6 @@ class Account(val accp: String) {
 
         if (mediaEnc != "") res += ";mediaenc=${mediaEnc}"
 
-        if (preferIPv6Media) res += ";mediaaf=ipv6"
-
         res = if (vmUri == "")
             "$res;mwi=no"
         else

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

@@ -40,7 +40,6 @@ class AccountActivity : AppCompatActivity() {
     private lateinit var mediaNatSpinner: Spinner
     private lateinit var mediaEnc: String
     private lateinit var mediaEncSpinner: Spinner
-    private lateinit var ipV6MediaCheck: CheckBox
     private var dtmfMode = Api.DTMFMODE_RTP_EVENT
     private lateinit var dtmfModeSpinner: Spinner
     private var answerMode = Api.ANSWERMODE_MANUAL
@@ -78,7 +77,6 @@ class AccountActivity : AppCompatActivity() {
         stunUser = binding.StunUser
         stunPass = binding.StunPass
         mediaEncSpinner = binding.mediaEncSpinner
-        ipV6MediaCheck = binding.PreferIPv6Media
         dtmfModeSpinner = binding.dtmfModeSpinner
         answerModeSpinner = binding.answerModeSpinner
         vmUri = binding.voicemailUri
@@ -162,8 +160,6 @@ class AccountActivity : AppCompatActivity() {
                                 "stun-turn-server" ->
                                     if (text.isNotEmpty())
                                         acc.stunServer = text
-                                "prefer-ipv6-media" ->
-                                    acc.preferIPv6Media = text == "yes"
                                 "dtmf-mode" ->
                                     if (text in arrayOf("rtp-event", "sip-info")) {
                                         acc.dtmfMode = if (text == "rtp-event")
@@ -275,8 +271,6 @@ class AccountActivity : AppCompatActivity() {
             }
         }
 
-        ipV6MediaCheck.isChecked = acc.preferIPv6Media
-
         dtmfMode = acc.dtmfMode
         val dtmfModeKeys = arrayListOf(Api.DTMFMODE_RTP_EVENT, Api.DTMFMODE_SIP_INFO)
         val dtmfModeVals = arrayListOf(getString(R.string.dtmf_inband), getString(R.string.dtmf_info))
@@ -544,16 +538,6 @@ class AccountActivity : AppCompatActivity() {
                     }
                 }
 
-                if (ipV6MediaCheck.isChecked != acc.preferIPv6Media) {
-                    acc.preferIPv6Media = ipV6MediaCheck.isChecked
-                    Log.d(TAG, "New preferIPv6Media is ${acc.preferIPv6Media}")
-                    if (acc.preferIPv6Media)
-                        Api.account_set_mediaaf(acc.accp, Api.AF_INET6)
-                    else
-                        Api.account_set_mediaaf(acc.accp, Api.AF_UNSPEC)
-                    save = true
-                }
-
                 if (dtmfMode != acc.dtmfMode) {
                     if (Api.account_set_dtmfmode(acc.accp, dtmfMode) == 0) {
                         acc.dtmfMode = Api.account_dtmfmode(acc.accp)
@@ -706,12 +690,6 @@ class AccountActivity : AppCompatActivity() {
                 getString(R.string.media_encryption_help)
             )
         }
-        binding.PreferIPv6Media.setOnClickListener {
-            Utils.alertView(
-                this, getString(R.string.prefer_ipv6_media),
-                getString(R.string.prefer_ipv6_media_help)
-            )
-        }
         binding.DtmfModeTitle.setOnClickListener {
             Utils.alertView(
                 this, getString(R.string.dtmf_mode),

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

@@ -44,8 +44,6 @@ object Api {
     external fun account_set_answermode(acc: String, mode: Int): Int
     external fun account_dtmfmode(acc: String): Int
     external fun account_set_dtmfmode(acc: String, mode: Int): Int
-    external fun account_mediaaf(acc: String): Int
-    external fun account_set_mediaaf(acc: String, af: Int): Int
     external fun account_extra(acc: String): String
     external fun account_debug(acc: String)
 

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

@@ -494,8 +494,6 @@ class BaresipService: Service() {
         val ua = UserAgent(uap)
         Log.d(TAG, "uaAdd ${ua.account.aor} at BaresipService")
         uas.add(ua)
-        if (ua.account.preferIPv6Media)
-            Api.account_set_mediaaf(ua.account.accp, Api.AF_INET6)
         if (Api.ua_isregistered(uap)) {
             Log.d(TAG, "Ua ${ua.account.aor} is registered")
             status.add(R.drawable.dot_green)

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

@@ -69,7 +69,7 @@ object Config {
             if (config.contains(Regex("dyn_dns[ ]+yes"))) {
                 removeVariable("dns_server")
                 for (dnsServer in BaresipService.dnsServers)
-                    config = if (Utils.checkIpV4(dnsServer.hostAddress))
+                    config = if (Utils.checkIpV4(dnsServer.hostAddress!!))
                         "${config}dns_server ${dnsServer.hostAddress}:53\n"
                     else
                         "${config}dns_server [${dnsServer.hostAddress}]:53\n"
@@ -138,7 +138,7 @@ object Config {
     fun updateDnsServers(dnsServers: List<InetAddress>): Int {
         var servers = ""
         for (dnsServer in dnsServers) {
-            var address = dnsServer.hostAddress.removePrefix("/")
+            var address = dnsServer.hostAddress!!.removePrefix("/")
             address = if (Utils.checkIpV4(address))
                 "${address}:53"
             else

app/src/main/res/layout/activity_account.xml

@@ -242,30 +242,6 @@
             </androidx.appcompat.widget.AppCompatEditText>
         </com.google.android.material.textfield.TextInputLayout>
 
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-            <TextView
-                android:id="@+id/PreferIPv6MediaTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_toStartOf="@id/PreferIPv6Media"
-                android:paddingTop="10dp"
-                android:textSize="18sp"
-                android:text="@string/prefer_ipv6_media" >
-            </TextView>
-            <CheckBox
-                android:id="@+id/PreferIPv6Media"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_gravity="end"
-                android:checked="false" >
-            </CheckBox>
-        </RelativeLayout>
-
         <TextView
             android:id="@+id/DtmfModeTitle"
             android:layout_width="wrap_content"