- added "Reset to Factory Default" config option

This commit is contained in:
Juha Heinanen
2019-04-24 13:22:19 +03:00
parent 4c0dd0e628
commit ed5102a7f0
3 changed files with 42 additions and 1 deletions

View File

@ -20,6 +20,7 @@ class ConfigActivity : AppCompatActivity() {
internal lateinit var opusBitRate: EditText internal lateinit var opusBitRate: EditText
internal lateinit var iceLite: CheckBox internal lateinit var iceLite: CheckBox
internal lateinit var debug: CheckBox internal lateinit var debug: CheckBox
internal lateinit var reset: CheckBox
private var oldAutoStart = "" private var oldAutoStart = ""
private var oldPreferIPv6 = "" private var oldPreferIPv6 = ""
@ -79,6 +80,9 @@ class ConfigActivity : AppCompatActivity() {
oldLogLevel = dbCv[0] oldLogLevel = dbCv[0]
debug.isChecked = oldLogLevel == "0" debug.isChecked = oldLogLevel == "0"
reset = findViewById(R.id.Reset) as CheckBox
reset.isChecked = false
} }
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
@ -156,6 +160,13 @@ class ConfigActivity : AppCompatActivity() {
save = true save = true
} }
if (reset.isChecked) {
Utils.copyAssetToFile(applicationContext, "config",
applicationContext.filesDir.absolutePath + "/config")
save = false
restart = true
}
if (save) { if (save) {
var newConfig = "" var newConfig = ""
for (line in config.split("\n")) { for (line in config.split("\n")) {
@ -204,6 +215,9 @@ class ConfigActivity : AppCompatActivity() {
findViewById(R.id.DebugTitle) as TextView-> { findViewById(R.id.DebugTitle) as TextView-> {
Utils.alertView(this, "Debug", getString(R.string.debug)) Utils.alertView(this, "Debug", getString(R.string.debug))
} }
findViewById(R.id.ResetTitle) as TextView-> {
Utils.alertView(this, "Reset", getString(R.string.reset))
}
} }
} }

View File

@ -168,6 +168,32 @@
</CheckBox> </CheckBox>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<TextView
android:id="@+id/ResetTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:textSize="18sp"
android:textColor="@android:color/black"
android:onClick="onClick"
android:text="Reset to Factory Default" >
</TextView>
<CheckBox
android:id="@+id/Reset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_gravity="end"
android:checked="false" >
</CheckBox>
</RelativeLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

View File

@ -63,4 +63,5 @@
Valid value are 6000-510000. Factory default is 28000.</string> Valid value are 6000-510000. Factory default is 28000.</string>
<string name="iceLite">If checked, ICE Lite Mode is used.</string> <string name="iceLite">If checked, ICE Lite Mode is used.</string>
<string name="debug">If checked, debug and info level log messages are available in logcat.</string> <string name="debug">If checked, debug and info level log messages are available in logcat.</string>
</resources> <string name="reset">If checked, configuration is reset to factory default.</string>
</resources>