- handle UA_EVENT_AUDIO_ERROR event

- avoid possible crash at quit
- upstream baresip updates
This commit is contained in:
Juha Heinanen
2018-10-10 20:01:32 +03:00
parent 9442ae0b6e
commit 3b00232f74
3 changed files with 10 additions and 3 deletions

View File

@ -8,8 +8,8 @@ android {
applicationId = 'com.tutpro.baresip'
minSdkVersion 21
targetSdkVersion 27
versionCode = 22
versionName = '3.0.1'
versionCode = 24
versionName = '3.0.3'
externalNativeBuild {
cmake {
cFlags '-DHAVE_INTTYPES_H'

View File

@ -145,6 +145,9 @@ static void ua_event_handler(struct ua *ua, enum ua_event ev,
case UA_EVENT_MWI_NOTIFY:
re_snprintf(event_buf, sizeof event_buf, "mwi notify,%s", prm);
break;
case UA_EVENT_AUDIO_ERROR:
mem_deref(call);
return;
case UA_EVENT_EXIT:
re_snprintf(event_buf, sizeof event_buf, "%s", "exit");
break;

View File

@ -457,7 +457,11 @@ class BaresipService: Service() {
MainActivity.images.clear()
MainActivity.history.clear()
MainActivity.messages.clear()
unregisterReceiver(nr)
try {
unregisterReceiver(nr)
} catch (e: Exception) {
Log.d(LOG_TAG, "Receiver nr has not been registered")
}
nm.cancelAll()
if (wl.isHeld) wl.release()
if (fl.isHeld) fl.release()