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

Fix Null pointer exception when putting the call on hold.

Browse source
This commit is contained in:
Simon Morlat 2018-06-19 22:35:24 +02:00
parent b7df48ba7a
commit 530c02996b
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/android/org/linphone/call/CallActivity.java
View file

@ -140,6 +140,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private HashMap<String, String> mEncoderTexts; private HashMap<String, String> mEncoderTexts;
private HashMap<String, String> mDecoderTexts; private HashMap<String, String> mDecoderTexts;
private CallListenerStub mCallListener; private CallListenerStub mCallListener;
private Call mCallDisplayedInStats;
private boolean oldIsSpeakerEnabled = false; private boolean oldIsSpeakerEnabled = false;
@ -1675,9 +1676,16 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
} }
public void initCallStatsRefresher(final Call call, final View view) { public void initCallStatsRefresher(final Call call, final View view) {
if (mCallDisplayedInStats == call) return;
if (mTimer != null && mTask != null) { if (mTimer != null && mTask != null) {
return; mTimer.cancel();
mTimer = null;
mTask = null;
} }
mCallDisplayedInStats = call;
if (call == null) return;
final TextView titleAudio = (TextView) view.findViewById(R.id.call_stats_audio); final TextView titleAudio = (TextView) view.findViewById(R.id.call_stats_audio);
final TextView titleVideo = (TextView) view.findViewById(R.id.call_stats_video); final TextView titleVideo = (TextView) view.findViewById(R.id.call_stats_video);
@ -1742,7 +1750,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
public void run() { public void run() {
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() == null) return; if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() == null) return;
synchronized(LinphoneManager.getLc()) { synchronized(LinphoneManager.getLc()) {
if (LinphoneActivity.isInstanciated()) { if (LinphoneActivity.isInstanciated() && call.getState() != Call.State.Released) {
CallParams params = call.getCurrentParams(); CallParams params = call.getCurrentParams();
if (params != null) { if (params != null) {
CallStats audioStats = call.getStats(StreamType.Audio); CallStats audioStats = call.getStats(StreamType.Audio);