Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
67817199
Commit
67817199
authored
Jul 18, 2013
by
Alexandre Lision
Browse files
Options
Downloads
Patches
Plain Diff
* #27362 Updated sflphone module
parent
4aaa10a7
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
jni/sflphone
+1
-1
1 addition, 1 deletion
jni/sflphone
src/com/savoirfairelinux/sflphone/service/SipService.java
+47
-42
47 additions, 42 deletions
src/com/savoirfairelinux/sflphone/service/SipService.java
with
48 additions
and
43 deletions
sflphone
@
883059f4
Subproject commit
58d5ff4122ebc21d17eadc593164e7f2049890e2
Subproject commit
883059f4c9c603388e1110a164fb17a235ae44d3
This diff is collapsed.
Click to expand it.
src/com/savoirfairelinux/sflphone/service/SipService.java
+
47
−
42
View file @
67817199
...
@@ -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
;
}
}
};
};
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment