jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Moved config restart dialog to main activity.

Browse Source
This commit is contained in:
Juha Heinanen
2019-10-10 09:51:03 +03:00
parent dea3a93713
commit a3124c1eb6
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
View File

@ -225,6 +225,7 @@ class ConfigActivity : AppCompatActivity() {
if (content == null) {
Utils.alertView(this, getString(R.string.error),
getString(R.string.read_cert_error))
certificateFile.isChecked = false
return false
}
Utils.putFileContents(BaresipService.filesPath + "/cert.pem", content)
@ -246,6 +247,7 @@ class ConfigActivity : AppCompatActivity() {
if (content == null) {
Utils.alertView(this, getString(R.string.error),
getString(R.string.read_ca_certs_error))
caFile.isChecked = false
return false
}
Utils.putFileContents(BaresipService.filesPath + "/ca_certs.crt",
@ -266,6 +268,7 @@ class ConfigActivity : AppCompatActivity() {
if (Api.module_load("webrtc_aec.so") != 0) {
Utils.alertView(this, getString(R.string.error),
getString(R.string.failed_to_load_aec_module))
aec.isChecked = false
return false
}
} else {
@ -335,18 +338,7 @@ class ConfigActivity : AppCompatActivity() {
if (save) Config.save()
if (restart) {
val restartDialog = android.support.v7.app.AlertDialog.Builder(this)
restartDialog.setMessage(getString(R.string.config_restart))
restartDialog.setPositiveButton(getText(R.string.restart)) { dialog, _ ->
dialog.dismiss()
intent.putExtra("restart", true)
}
restartDialog.setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss()
}
restartDialog.create().show()
}
if (restart) intent.putExtra("restart", true)
setResult(RESULT_OK, intent)
finish()
@ -355,7 +347,6 @@ class ConfigActivity : AppCompatActivity() {
android.R.id.home -> {
Log.d("Baresip", "Back array was pressed at Config")
setResult(Activity.RESULT_CANCELED, intent)
finish()

14
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -1041,8 +1041,18 @@ class MainActivity : AppCompatActivity() {
}
CONFIG_CODE -> {
if ((data != null) && data.hasExtra("restart"))
quitRestart(true)
if ((data != null) && data.hasExtra("restart")) {
val restartDialog = AlertDialog.Builder(this)
restartDialog.setMessage(getString(R.string.config_restart))
restartDialog.setPositiveButton(getText(R.string.restart)) { dialog, _ ->
dialog.dismiss()
quitRestart(true)
}
restartDialog.setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss()
}
restartDialog.create().show()
}
}
CALLS_CODE -> {