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

* #39542: remove registerAllAccounts call

parent c232fdb7
Branches
Tags
No related merge requests found
...@@ -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().initLoader(LoaderConstants.ACCOUNTS_LOADER, null, this); getLoaderManager().restartLoader(LoaderConstants.ACCOUNTS_LOADER, null, this);
} }
......
...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment