From ed5102a7f08b72fc8c6f68a60273eabe488ddaa1 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 24 Apr 2019 13:22:19 +0300 Subject: [PATCH] - added "Reset to Factory Default" config option --- .../com/tutpro/baresip/ConfigActivity.kt | 14 ++++++++++ app/src/main/res/layout/activity_config.xml | 26 +++++++++++++++++++ app/src/main/res/values/strings.xml | 3 ++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt index 4006b15b..0128b9cd 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt @@ -20,6 +20,7 @@ class ConfigActivity : AppCompatActivity() { internal lateinit var opusBitRate: EditText internal lateinit var iceLite: CheckBox internal lateinit var debug: CheckBox + internal lateinit var reset: CheckBox private var oldAutoStart = "" private var oldPreferIPv6 = "" @@ -79,6 +80,9 @@ class ConfigActivity : AppCompatActivity() { oldLogLevel = dbCv[0] debug.isChecked = oldLogLevel == "0" + reset = findViewById(R.id.Reset) as CheckBox + reset.isChecked = false + } override fun onCreateOptionsMenu(menu: Menu): Boolean { @@ -156,6 +160,13 @@ class ConfigActivity : AppCompatActivity() { save = true } + if (reset.isChecked) { + Utils.copyAssetToFile(applicationContext, "config", + applicationContext.filesDir.absolutePath + "/config") + save = false + restart = true + } + if (save) { var newConfig = "" for (line in config.split("\n")) { @@ -204,6 +215,9 @@ class ConfigActivity : AppCompatActivity() { findViewById(R.id.DebugTitle) as TextView-> { Utils.alertView(this, "Debug", getString(R.string.debug)) } + findViewById(R.id.ResetTitle) as TextView-> { + Utils.alertView(this, "Reset", getString(R.string.reset)) + } } } diff --git a/app/src/main/res/layout/activity_config.xml b/app/src/main/res/layout/activity_config.xml index 580d20c1..64fbcc87 100644 --- a/app/src/main/res/layout/activity_config.xml +++ b/app/src/main/res/layout/activity_config.xml @@ -168,6 +168,32 @@ + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64acd5f4..e8c17478 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -63,4 +63,5 @@ Valid value are 6000-510000. Factory default is 28000. If checked, ICE Lite Mode is used. If checked, debug and info level log messages are available in logcat. - \ No newline at end of file + If checked, configuration is reset to factory default. +