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

fix crash due to thread calling things it should not call.

Browse source
This commit is contained in:
Simon Morlat 2015-01-16 12:08:37 +01:00
parent 286081da79
commit 67d054f321
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/LinphoneManager.java
View file

@ -459,7 +459,7 @@ public class LinphoneManager implements LinphoneListener {
TimerTask lTask = new TimerTask() { TimerTask lTask = new TimerTask() {
@Override @Override
public void run() { public void run() {
UIThreadDispatcher.Dispatch(new Runnable() { UIThreadDispatcher.dispatch(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mLc != null) { if (mLc != null) {

2
src/org/linphone/UIThreadDispatcher.java
View file

@ -24,7 +24,7 @@ import android.os.Looper;
public class UIThreadDispatcher { public class UIThreadDispatcher {
private static Handler mHandler = new Handler(Looper.getMainLooper()); private static Handler mHandler = new Handler(Looper.getMainLooper());
public static void Dispatch(Runnable r) { public static void dispatch(Runnable r) {
mHandler.post(r); mHandler.post(r);
} }
} }

13
src/org/linphone/gcm/GCMService.java
View file

@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.LinphonePreferences; import org.linphone.LinphonePreferences;
import org.linphone.R; import org.linphone.R;
import org.linphone.UIThreadDispatcher;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
import android.content.Context; import android.content.Context;
@ -47,8 +48,16 @@ public class GCMService extends GCMBaseIntentService {
protected void onMessage(Context context, Intent intent) { protected void onMessage(Context context, Intent intent) {
Log.d("Push notification received"); Log.d("Push notification received");
if (LinphoneManager.isInstanciated() && LinphoneManager.getLc().getCallsNb() == 0) { if (LinphoneManager.isInstanciated() && LinphoneManager.getLc().getCallsNb() == 0) {
LinphoneManager.getLc().setNetworkReachable(false); UIThreadDispatcher.dispatch(new Runnable(){
LinphoneManager.getLc().setNetworkReachable(true); @Override
public void run() {
if (LinphoneManager.isInstanciated() && LinphoneManager.getLc().getCallsNb() == 0){
LinphoneManager.getLc().setNetworkReachable(false);
LinphoneManager.getLc().setNetworkReachable(true);
}
}
});
} }
} }