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
b266969f
Commit
b266969f
authored
Jan 28, 2014
by
Alexandre Lision
Browse files
Options
Downloads
Patches
Plain Diff
* #39542: remove registerAllAccounts call
parent
c232fdb7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/org/sflphone/fragments/MenuFragment.java
+1
-10
1 addition, 10 deletions
src/org/sflphone/fragments/MenuFragment.java
src/org/sflphone/service/SipService.java
+9
-9
9 additions, 9 deletions
src/org/sflphone/service/SipService.java
with
10 additions
and
19 deletions
src/org/sflphone/fragments/MenuFragment.java
+
1
−
10
View file @
b266969f
...
@@ -114,16 +114,7 @@ public class MenuFragment extends Fragment implements LoaderManager.LoaderCallba
...
@@ -114,16 +114,7 @@ public class MenuFragment extends Fragment implements LoaderManager.LoaderCallba
if
(!(
activity
instanceof
Callbacks
))
{
if
(!(
activity
instanceof
Callbacks
))
{
throw
new
IllegalStateException
(
"Activity must implement fragment's callbacks."
);
throw
new
IllegalStateException
(
"Activity must implement fragment's callbacks."
);
}
}
mCallbacks
=
(
Callbacks
)
activity
;
mCallbacks
=
(
Callbacks
)
activity
;
try
{
mCallbacks
.
getService
().
registerAllAccounts
();
}
catch
(
RemoteException
e
)
{
e
.
printStackTrace
();
}
catch
(
Exception
e1
)
{
}
}
}
@Override
@Override
...
@@ -145,7 +136,7 @@ public class MenuFragment extends Fragment implements LoaderManager.LoaderCallba
...
@@ -145,7 +136,7 @@ public class MenuFragment extends Fragment implements LoaderManager.LoaderCallba
intentFilter2
.
addAction
(
ConfigurationManagerCallback
.
ACCOUNT_STATE_CHANGED
);
intentFilter2
.
addAction
(
ConfigurationManagerCallback
.
ACCOUNT_STATE_CHANGED
);
intentFilter2
.
addAction
(
ConfigurationManagerCallback
.
ACCOUNTS_CHANGED
);
intentFilter2
.
addAction
(
ConfigurationManagerCallback
.
ACCOUNTS_CHANGED
);
getActivity
().
registerReceiver
(
accountReceiver
,
intentFilter2
);
getActivity
().
registerReceiver
(
accountReceiver
,
intentFilter2
);
getLoaderManager
().
ini
tLoader
(
LoaderConstants
.
ACCOUNTS_LOADER
,
null
,
this
);
getLoaderManager
().
restar
tLoader
(
LoaderConstants
.
ACCOUNTS_LOADER
,
null
,
this
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/org/sflphone/service/SipService.java
+
9
−
9
View file @
b266969f
...
@@ -57,18 +57,10 @@ public class SipService extends Service {
...
@@ -57,18 +57,10 @@ public class SipService extends Service {
private
SipServiceExecutor
mExecutor
;
private
SipServiceExecutor
mExecutor
;
private
static
HandlerThread
executorThread
;
private
static
HandlerThread
executorThread
;
public
CallManager
getCallManagerJNI
()
{
return
callManagerJNI
;
}
private
CallManager
callManagerJNI
;
private
CallManager
callManagerJNI
;
private
ManagerImpl
managerImpl
;
private
ManagerImpl
managerImpl
;
private
CallManagerCallBack
callManagerCallBack
;
private
CallManagerCallBack
callManagerCallBack
;
public
ConfigurationManager
getConfigurationManagerJNI
()
{
return
configurationManagerJNI
;
}
private
ConfigurationManager
configurationManagerJNI
;
private
ConfigurationManager
configurationManagerJNI
;
private
ConfigurationManagerCallback
configurationManagerCallback
;
private
ConfigurationManagerCallback
configurationManagerCallback
;
private
boolean
isPjSipStackStarted
=
false
;
private
boolean
isPjSipStackStarted
=
false
;
...
@@ -83,6 +75,14 @@ public class SipService extends Service {
...
@@ -83,6 +75,14 @@ public class SipService extends Service {
return
mConferences
;
return
mConferences
;
}
}
public
CallManager
getCallManagerJNI
()
{
return
callManagerJNI
;
}
public
ConfigurationManager
getConfigurationManagerJNI
()
{
return
configurationManagerJNI
;
}
public
void
addCallToConference
(
String
confId
,
String
callId
)
{
public
void
addCallToConference
(
String
confId
,
String
callId
)
{
if
(
mConferences
.
get
(
callId
)
!=
null
){
if
(
mConferences
.
get
(
callId
)
!=
null
){
// We add a simple call to a conference
// We add a simple call to a conference
...
...
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