Skip to content
Snippets Groups Projects
Commit 67817199 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

* #27362 Updated sflphone module

parent 4aaa10a7
No related branches found
No related tags found
No related merge requests found
sflphone @ 883059f4
Subproject commit 58d5ff4122ebc21d17eadc593164e7f2049890e2 Subproject commit 883059f4c9c603388e1110a164fb17a235ae44d3
...@@ -72,6 +72,7 @@ public class SipService extends Service { ...@@ -72,6 +72,7 @@ public class SipService extends Service {
private SipServiceExecutor mExecutor; private SipServiceExecutor mExecutor;
private static HandlerThread executorThread; private static HandlerThread executorThread;
private CallManager callManagerJNI; private CallManager callManagerJNI;
private ManagerImpl managerImpl;
private CallManagerCallBack callManagerCallBack; private CallManagerCallBack callManagerCallBack;
private ConfigurationManager configurationManagerJNI; private ConfigurationManager configurationManagerJNI;
private ConfigurationManagerCallback configurationManagerCallback; private ConfigurationManagerCallback configurationManagerCallback;
...@@ -233,7 +234,7 @@ public class SipService extends Service { ...@@ -233,7 +234,7 @@ public class SipService extends Service {
System.loadLibrary("speexresampler"); System.loadLibrary("speexresampler");
System.loadLibrary("sflphone"); System.loadLibrary("sflphone");
isPjSipStackStarted = true; isPjSipStackStarted = true;
Log.i(TAG, "PjSIPStack started");
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
Log.e(TAG, "Problem with the current Pj stack...", e); Log.e(TAG, "Problem with the current Pj stack...", e);
isPjSipStackStarted = false; isPjSipStackStarted = false;
...@@ -242,7 +243,12 @@ public class SipService extends Service { ...@@ -242,7 +243,12 @@ public class SipService extends Service {
Log.e(TAG, "Problem with the current Pj stack...", e); Log.e(TAG, "Problem with the current Pj stack...", e);
} }
Log.i(TAG, "PjSIPStack started");
managerImpl = SFLPhoneservice.instance();
/* set static AppPath before calling manager.init */
// managerImpl.setPath(sflphoneApp.getAppPath());
callManagerJNI = new CallManager(); callManagerJNI = new CallManager();
callManagerCallBack = new CallManagerCallBack(this); callManagerCallBack = new CallManagerCallBack(this);
...@@ -252,7 +258,11 @@ public class SipService extends Service { ...@@ -252,7 +258,11 @@ public class SipService extends Service {
configurationManagerCallback = new ConfigurationManagerCallback(this); configurationManagerCallback = new ConfigurationManagerCallback(this);
SFLPhoneservice.setConfigurationCallbackObject(configurationManagerCallback); SFLPhoneservice.setConfigurationCallbackObject(configurationManagerCallback);
return; Log.i(TAG, "before init");
managerImpl.init("");
Log.i(TAG, "->startPjSipStack");
} }
public HashMap<String, SipCall> getCurrent_calls() { public HashMap<String, SipCall> getCurrent_calls() {
...@@ -338,7 +348,8 @@ public class SipService extends Service { ...@@ -338,7 +348,8 @@ public class SipService extends Service {
* *
* Implement public interface for the service * Implement public interface for the service
* *
* **********************************/ * *********************************
*/
private final ISipService.Stub mBinder = new ISipService.Stub() { private final ISipService.Stub mBinder = new ISipService.Stub() {
...@@ -1082,11 +1093,5 @@ public class SipService extends Service { ...@@ -1082,11 +1093,5 @@ public class SipService extends Service {
return null; return null;
} }
}; };
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment