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

fix restartLinphoneCore()

Browse source
This commit is contained in:
Simon Morlat 2015-10-30 15:00:41 +01:00
parent dc9eb9cf1d
commit ecc4cf85cf
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -550,7 +550,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} }
} }
public synchronized final void destroyLinphoneCore(Context c) { public synchronized final void destroyLinphoneCore() {
sExited = true; sExited = true;
BluetoothManager.getInstance().destroy(); BluetoothManager.getInstance().destroy();
try { try {
@ -566,10 +566,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} }
} }
public void restartLinphoneCore(Context context){ public void restartLinphoneCore(){
destroyLinphoneCore(context); destroyLinphoneCore();
startLibLinphone(context); startLibLinphone(mServiceContext);
sExited = true;
} }
private synchronized void startLibLinphone(Context c) { private synchronized void startLibLinphone(Context c) {

6
src/org/linphone/setup/RemoteProvisioningActivity.java
View file

@ -183,11 +183,7 @@ public class RemoteProvisioningActivity extends Activity {
mHandler.postDelayed(new Runnable() { mHandler.postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {
LinphoneManager.destroy(); LinphoneManager.getInstance().restartLinphoneCore();
stopService(new Intent(ACTION_MAIN).setClass(RemoteProvisioningActivity.this, LinphoneService.class));
Intent intent = new Intent();
intent.setClass(RemoteProvisioningActivity.this, LinphoneLauncherActivity.class);
startActivity(intent);
} }
}, 1000); }, 1000);
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 9f2f6163d0cdf8125af94c3719a8f49647d533b1 Subproject commit f06140d0758a409a70070aa2bd6f31086613cf1d