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

- Let user fix the Settings that prevented baresip from starting.

Browse Source
This commit is contained in:
Juha Heinanen
2020-02-18 04:13:52 +02:00
parent 4e22726e60
commit 7eca0a4b1b
4 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
-6
View File
@@ -847,12 +847,6 @@ class BaresipService: Service() {
fun stopped(error: String) {
Log.d(LOG_TAG, "Received 'stopped' from baresip with param '$error'")
isServiceRunning = false
if (error == "ua_init") {
Config.removeVariable("sip_listen")
Config.removeVariable("net_interface")
Config.removeVariable("sip_certificate")
Config.removeVariable("sip_cafile")
}
val intent = Intent("service event")
intent.putExtra("event", "stopped")
intent.putExtra("params", arrayListOf(error))
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+14 -15
View File
@@ -587,22 +587,16 @@ class MainActivity : AppCompatActivity() {
alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(R.string.ok)
) { dialog, _ ->
dialog.dismiss()
quitTimer.cancel()
finishAndRemoveTask()
System.exit(0)
//quitTimer.cancel()
//finishAndRemoveTask()
//System.exit(0)
}
alertDialog.show()
return
} else {
quitTimer.cancel()
finishAndRemoveTask()
if (restart) {
Log.d("Baresip", "Trigger restart")
val restartActivity = Intent(applicationContext, MainActivity::class.java)
val restartIntent = PendingIntent.getActivity(applicationContext,
RESTART_REQUEST_CODE, restartActivity, PendingIntent.FLAG_CANCEL_CURRENT)
val am = applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager
am.set(AlarmManager.RTC,System.currentTimeMillis() + 1000, restartIntent)
}
if (restart) reStart()
System.exit(0)
return
}
@@ -839,10 +833,14 @@ class MainActivity : AppCompatActivity() {
}
}
/*override fun onStop() {
super.onStop()
Log.d("Baresip", "Main stopped")
}*/
private fun reStart() {
Log.d("Baresip", "Trigger restart")
val restartActivity = Intent(applicationContext, MainActivity::class.java)
val restartIntent = PendingIntent.getActivity(applicationContext,
RESTART_REQUEST_CODE, restartActivity, PendingIntent.FLAG_CANCEL_CURRENT)
val am = applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager
am.set(AlarmManager.RTC,System.currentTimeMillis() + 1000, restartIntent)
}
override fun onBackPressed() {
moveTaskToBack(true)
@@ -937,6 +935,7 @@ class MainActivity : AppCompatActivity() {
quitTimer.start()
} else {
finishAndRemoveTask()
if (reStart) reStart()
System.exit(0)
}
}