From dc8a9cf7516702f5f3dbb8cdb6a402ee8885c296 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 4 Jan 2022 18:05:07 +0200
Subject: [PATCH] In Settings, added link to Android settings

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../com/tutpro/baresip/ConfigActivity.kt      | 11 ++++++-
 app/src/main/res/layout/activity_config.xml   | 32 +++++++++++++------
 app/src/main/res/values-fi/strings.xml        |  2 ++
 app/src/main/res/values/strings.xml           |  2 ++
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ab0fe464..5ed1462e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -100,7 +100,7 @@
         <activity
             android:name=".AudioActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/audio"
+            android:label="@string/audio_settings"
             android:parentActivityName=".ConfigActivity" >
         </activity>
         <activity
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
index e05b9b85..87c60071 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
@@ -8,8 +8,10 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.os.PowerManager
+import android.provider.Settings
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -501,9 +503,16 @@ class ConfigActivity : AppCompatActivity() {
             Utils.alertView(this, getString(R.string.tls_ca_file),
                     getString(R.string.tls_ca_file_help))
         }
-        binding.AudioTitle .setOnClickListener {
+        binding.AudioSettingsTitle .setOnClickListener {
             startActivity(Intent(this, AudioActivity::class.java))
         }
+        binding.AndroidSettings.setOnClickListener {
+            val i = Intent()
+            i.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+            i.data = Uri.parse("package:${applicationContext.packageName}")
+            i.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
+            startActivity(i)
+        }
         binding.DarkThemeTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.dark_theme),
                     getString(R.string.dark_theme_help))
diff --git a/app/src/main/res/layout/activity_config.xml b/app/src/main/res/layout/activity_config.xml
index 437ca77d..73f6af01 100644
--- a/app/src/main/res/layout/activity_config.xml
+++ b/app/src/main/res/layout/activity_config.xml
@@ -80,6 +80,7 @@
             android:id="@+id/ListenAddress"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="-10dp"
             android:layout_marginBottom="12dp"
             android:textSize="18sp"
             android:hint="@string/_0_0_0_0_5060"
@@ -99,6 +100,7 @@
             android:id="@+id/DnsServers"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="-10dp"
             android:layout_marginBottom="12dp"
             android:textSize="18sp"
             android:inputType="textUri"
@@ -183,16 +185,6 @@
             </CheckBox>
         </RelativeLayout>
 
-        <TextView
-            android:id="@+id/AudioTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            android:text="@string/audio" >
-        </TextView>
-
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -219,6 +211,26 @@
             </CheckBox>
         </RelativeLayout>
 
+        <TextView
+            android:id="@+id/AudioSettingsTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:text="@string/audio_settings" >
+        </TextView>
+
+        <TextView
+            android:id="@+id/AndroidSettings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            android:text="@string/android_settings"
+            android:textStyle="bold"
+            android:textSize="18sp">
+        </TextView>
+
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 35850ca0..b3c6f770 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -323,6 +323,7 @@
         Download-kansiosta.
     </string>
     <string name="audio">Audio</string>
+    <string name="audio_settings">Audio-asetukset</string>
     <string name="audio_modules_title">Audio-modulit</string>
     <string name="audio_modules_help">Merkittyjen modulien tarjoamat audio-koodekit ovat tilien
         käytettävissä.
@@ -354,6 +355,7 @@
     <string name="video_size">Videon kehyskoko</string>
     <string name="video_size_help">Lähetettävän videon kehyskoko (leveys x korkeus).
         Tehdasasetus on 800x600.</string>
+    <string name="android_settings">Android-asetukset</string>
     <string name="debug">Lokiviestit</string>
     <string name="debug_help">Jos merkitty, baresip tuottaa debug- ja info-tason Logcat-viestejä.</string>
     <string name="sip_trace">SIP-sanomien jäljitys</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 743a670e..90a3da51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -290,6 +290,7 @@
         of needed Certificate Authorities has been or will be loaded. In Android versions 9 and
         below, a file called \'ca_certs.crt\' is loaded from Download folder.</string>
     <string name="audio">Audio</string>
+    <string name="audio_settings">Audio Settings</string>
     <string name="audio_modules_title">Audio Modules</string>
     <string name="audio_modules_help">Audio codecs provided by the checked modules are
         available for use by the accounts.</string>
@@ -315,6 +316,7 @@
     <string name="video_size">Video Frame Size</string>
     <string name="video_size_help">Size of transmitted video frames (width x height).
         Factory default is 800x600.</string>
+    <string name="android_settings">Android Settings</string>
     <string name="debug">Debug</string>
     <string name="debug_help">If checked, provides debug and info level log messages to Logcat.</string>
     <string name="sip_trace">SIP Trace</string>