Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix crashes around ErrorInfo java object

Browse source
This commit is contained in:
Simon Morlat 2017-05-02 15:14:04 +02:00
parent 229376bcee
commit 13074d973f
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/android/org/linphone/CallOutgoingActivity.java
View file

@ -104,17 +104,22 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
return; return;
} else if (state == State.Error) { } else if (state == State.Error) {
// Convert LinphoneCore message for internalization // Convert LinphoneCore message for internalization
if (message != null && call.getErrorInfo().getReason() == Reason.Declined) { if (call.getErrorInfo().getReason() == Reason.Declined) {
displayCustomToast(getString(R.string.error_call_declined), Toast.LENGTH_SHORT); displayCustomToast(getString(R.string.error_call_declined), Toast.LENGTH_SHORT);
} else if (message != null && call.getErrorInfo().getReason() == Reason.NotFound) { } else if (call.getErrorInfo().getReason() == Reason.NotFound) {
displayCustomToast(getString(R.string.error_user_not_found), Toast.LENGTH_SHORT); displayCustomToast(getString(R.string.error_user_not_found), Toast.LENGTH_SHORT);
} else if (message != null && call.getErrorInfo().getReason() == Reason.Media) { } else if (call.getErrorInfo().getReason() == Reason.Media) {
displayCustomToast(getString(R.string.error_incompatible_media), Toast.LENGTH_SHORT); displayCustomToast(getString(R.string.error_incompatible_media), Toast.LENGTH_SHORT);
} else if (message != null && call.getErrorInfo().getReason() == Reason.Busy) { } else if (call.getErrorInfo().getReason() == Reason.Busy) {
displayCustomToast(getString(R.string.error_user_busy), Toast.LENGTH_SHORT); displayCustomToast(getString(R.string.error_user_busy), Toast.LENGTH_SHORT);
} else if (message != null) { } else if (message != null) {
displayCustomToast(getString(R.string.error_unknown) + " - " + message, Toast.LENGTH_SHORT); displayCustomToast(getString(R.string.error_unknown) + " - " + message, Toast.LENGTH_SHORT);
} }
}else if (state == State.CallEnd) {
// Convert LinphoneCore message for internalization
if (call.getErrorInfo().getReason() == Reason.Declined) {
displayCustomToast(getString(R.string.error_call_declined), Toast.LENGTH_SHORT);
}
} }
if (LinphoneManager.getLc().getCallsNb() == 0) { if (LinphoneManager.getLc().getCallsNb() == 0) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 68f5085d8426b4c572e9f538bedbbc87b49bc36a Subproject commit 5cde30dae7c034cb2f2fba0a367f16018e48de1e

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit d09e51ffeeab695f287ea838838b5da5df42cb40 Subproject commit 399a95036ef98862ced4af9df92c72ad1d8b6b8d

2
submodules/oRTP

@ -1 +1 @@
Subproject commit 9759554cd788dc8254086b6a63b4cc74609b8535 Subproject commit f805b5c465742d7895a9c9de03197e7216337bed