Commit b8190512 authored by Adrien Béraud's avatar Adrien Béraud Committed by Sébastien Blin
Browse files

jni: rename Ringservice to JamiService

Change-Id: Ib20206f49983199778df2c924479098dbf1f16f9
parent e40c6c61
...@@ -201,7 +201,7 @@ ${CXX} --shared \ ...@@ -201,7 +201,7 @@ ${CXX} --shared \
-Wno-unused-function \ -Wno-unused-function \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wl,-Bsymbolic \ -Wl,-Bsymbolic \
${JNIDIR}/ring_wrapper.cpp \ ${JNIDIR}/jami_wrapper.cpp \
${DAEMON_BUILD_DIR}/src/.libs/libring.a \ ${DAEMON_BUILD_DIR}/src/.libs/libring.a \
-isystem ${DAEMON_DIR}/contrib/${TARGET}/include \ -isystem ${DAEMON_DIR}/contrib/${TARGET}/include \
-I${DAEMON_DIR}/src \ -I${DAEMON_DIR}/src \
......
...@@ -106,8 +106,6 @@ public class JamiAccountSummaryFragment extends BaseSupportFragment<JamiAccountS ...@@ -106,8 +106,6 @@ public class JamiAccountSummaryFragment extends BaseSupportFragment<JamiAccountS
private static final String FRAGMENT_DIALOG_BACKUP = TAG + ".dialog.backup"; private static final String FRAGMENT_DIALOG_BACKUP = TAG + ".dialog.backup";
private static final int WRITE_REQUEST_CODE = 43; private static final int WRITE_REQUEST_CODE = 43;
private static final int SCROLL_DIRECTION_UP = -1; private static final int SCROLL_DIRECTION_UP = -1;
public static final String ACCOUNT_ID_KEY = AccountEditionFragment.class.getCanonicalName() + "accountid";
private static final int SETTINGS_ACCOUNT = 0; private static final int SETTINGS_ACCOUNT = 0;
private static final int SETTINGS_MEDIA = 1; private static final int SETTINGS_MEDIA = 1;
private static final int SETTINGS_SYSTEM = 2; private static final int SETTINGS_SYSTEM = 2;
...@@ -710,7 +708,7 @@ public class JamiAccountSummaryFragment extends BaseSupportFragment<JamiAccountS ...@@ -710,7 +708,7 @@ public class JamiAccountSummaryFragment extends BaseSupportFragment<JamiAccountS
private Fragment fragmentWithBundle(Fragment result, String accountId) { private Fragment fragmentWithBundle(Fragment result, String accountId) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(ACCOUNT_ID_KEY, accountId); args.putString(AccountEditionFragment.ACCOUNT_ID_KEY, accountId);
result.setArguments(args); result.setArguments(args);
return result; return result;
} }
...@@ -744,7 +742,7 @@ public class JamiAccountSummaryFragment extends BaseSupportFragment<JamiAccountS ...@@ -744,7 +742,7 @@ public class JamiAccountSummaryFragment extends BaseSupportFragment<JamiAccountS
public void goToBlackList(String accountId) { public void goToBlackList(String accountId) {
BlockListFragment blockListFragment = new BlockListFragment(); BlockListFragment blockListFragment = new BlockListFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(ACCOUNT_ID_KEY, accountId); args.putString(AccountEditionFragment.ACCOUNT_ID_KEY, accountId);
blockListFragment.setArguments(args); blockListFragment.setArguments(args);
changeFragment(blockListFragment, BlockListFragment.TAG); changeFragment(blockListFragment, BlockListFragment.TAG);
} }
......
...@@ -65,7 +65,6 @@ import javax.inject.Named; ...@@ -65,7 +65,6 @@ import javax.inject.Named;
import cx.ring.BuildConfig; import cx.ring.BuildConfig;
import cx.ring.R; import cx.ring.R;
import cx.ring.views.AvatarFactory; import cx.ring.views.AvatarFactory;
import net.jami.daemon.Ringservice;
import cx.ring.dependencyinjection.DaggerJamiInjectionComponent; import cx.ring.dependencyinjection.DaggerJamiInjectionComponent;
import cx.ring.dependencyinjection.JamiInjectionComponent; import cx.ring.dependencyinjection.JamiInjectionComponent;
import cx.ring.dependencyinjection.JamiInjectionModule; import cx.ring.dependencyinjection.JamiInjectionModule;
...@@ -179,10 +178,10 @@ public abstract class JamiApplication extends Application { ...@@ -179,10 +178,10 @@ public abstract class JamiApplication extends Application {
if (mPreferencesService.getSettings().isAllowPushNotifications()) { if (mPreferencesService.getSettings().isAllowPushNotifications()) {
String token = getPushToken(); String token = getPushToken();
if (token != null) { if (token != null) {
Ringservice.setPushNotificationToken(token); JamiService.setPushNotificationToken(token);
} }
} else { } else {
Ringservice.setPushNotificationToken(""); JamiService.setPushNotificationToken("");
} }
Intent intent = new Intent(DRING_CONNECTION_CHANGED); Intent intent = new Intent(DRING_CONNECTION_CHANGED);
......
...@@ -175,7 +175,7 @@ public class CallActivity extends AppCompatActivity { ...@@ -175,7 +175,7 @@ public class CallActivity extends AppCompatActivity {
} }
private void hideSystemUI() { private void hideSystemUI() {
KeyboardVisibilityManager.hideKeyboard(this, 0); KeyboardVisibilityManager.hideKeyboard(this);
if (mMainView != null) { if (mMainView != null) {
mMainView.setSystemUiVisibility( mMainView.setSystemUiVisibility(
View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LOW_PROFILE View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LOW_PROFILE
......
...@@ -75,6 +75,9 @@ import cx.ring.interfaces.Colorable; ...@@ -75,6 +75,9 @@ import cx.ring.interfaces.Colorable;
import net.jami.model.Account; import net.jami.model.Account;
import net.jami.model.AccountConfig; import net.jami.model.AccountConfig;
import cx.ring.service.DRingService; import cx.ring.service.DRingService;
import net.jami.model.Contact;
import net.jami.model.Conversation;
import net.jami.services.AccountService; import net.jami.services.AccountService;
import net.jami.services.NotificationService; import net.jami.services.NotificationService;
import cx.ring.settings.SettingsFragment; import cx.ring.settings.SettingsFragment;
...@@ -778,7 +781,7 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV ...@@ -778,7 +781,7 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV
List<Future<Bitmap>> futureIcons = new ArrayList<>(Math.min(conversations.size(),maxCount)); List<Future<Bitmap>> futureIcons = new ArrayList<>(Math.min(conversations.size(),maxCount));
for (Conversation conversation : conversations) { for (Conversation conversation : conversations) {
CallContact contact = conversation.getContact(); Contact contact = conversation.getContact();
futureIcons.add(AvatarFactory.getBitmapAvatar(this, contact, targetSize) futureIcons.add(AvatarFactory.getBitmapAvatar(this, contact, targetSize)
.subscribeOn(Schedulers.computation()) .subscribeOn(Schedulers.computation())
.toFuture()); .toFuture());
...@@ -789,7 +792,7 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV ...@@ -789,7 +792,7 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV
i = 0; i = 0;
for (Conversation conversation : conversations) { for (Conversation conversation : conversations) {
CallContact contact = conversation.getContact(); Contact contact = conversation.getContact();
IconCompat icon = null; IconCompat icon = null;
try { try {
icon = IconCompat.createWithBitmap(futureIcons.get(i).get()); icon = IconCompat.createWithBitmap(futureIcons.get(i).get());
......
...@@ -60,7 +60,6 @@ import cx.ring.service.DRingService; ...@@ -60,7 +60,6 @@ import cx.ring.service.DRingService;
import cx.ring.service.JamiJobService; import cx.ring.service.JamiJobService;
import net.jami.services.AccountService; import net.jami.services.AccountService;
import net.jami.services.CallService; import net.jami.services.CallService;
import net.jami.services.ConferenceService;
import cx.ring.services.ContactServiceImpl; import cx.ring.services.ContactServiceImpl;
import net.jami.services.DaemonService; import net.jami.services.DaemonService;
import cx.ring.services.DataTransferService; import cx.ring.services.DataTransferService;
...@@ -151,8 +150,6 @@ public interface JamiInjectionComponent { ...@@ -151,8 +150,6 @@ public interface JamiInjectionComponent {
void inject(CallService service); void inject(CallService service);
void inject(ConferenceService service);
void inject(AccountService service); void inject(AccountService service);
void inject(HardwareService service); void inject(HardwareService service);
......
...@@ -86,6 +86,17 @@ import androidx.percentlayout.widget.PercentFrameLayout; ...@@ -86,6 +86,17 @@ import androidx.percentlayout.widget.PercentFrameLayout;
import com.rodolfonavalon.shaperipplelibrary.model.Circle; import com.rodolfonavalon.shaperipplelibrary.model.Circle;
import net.jami.call.CallPresenter;
import net.jami.call.CallView;
import net.jami.daemon.JamiService;
import net.jami.model.Call;
import net.jami.model.Conference;
import net.jami.model.Contact;
import net.jami.services.DeviceRuntimeService;
import net.jami.services.HardwareService;
import net.jami.services.NotificationService;
import net.jami.utils.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
...@@ -99,32 +110,22 @@ import javax.inject.Inject; ...@@ -99,32 +110,22 @@ import javax.inject.Inject;
import cx.ring.R; import cx.ring.R;
import cx.ring.adapters.ConfParticipantAdapter; import cx.ring.adapters.ConfParticipantAdapter;
import cx.ring.application.JamiApplication; import cx.ring.application.JamiApplication;
import net.jami.call.CallPresenter;
import net.jami.call.CallView;
import cx.ring.client.CallActivity; import cx.ring.client.CallActivity;
import cx.ring.client.ContactDetailsActivity; import cx.ring.client.ContactDetailsActivity;
import cx.ring.client.ConversationActivity; import cx.ring.client.ConversationActivity;
import cx.ring.client.ConversationSelectionActivity; import cx.ring.client.ConversationSelectionActivity;
import cx.ring.client.HomeActivity; import cx.ring.client.HomeActivity;
import net.jami.daemon.Ringservice;
import cx.ring.databinding.FragCallBinding; import cx.ring.databinding.FragCallBinding;
import cx.ring.databinding.ItemParticipantLabelBinding; import cx.ring.databinding.ItemParticipantLabelBinding;
import net.jami.model.Contact;
import net.jami.model.Conference;
import net.jami.model.Call;
import cx.ring.mvp.BaseSupportFragment; import cx.ring.mvp.BaseSupportFragment;
import cx.ring.plugins.RecyclerPicker.RecyclerPicker; import cx.ring.plugins.RecyclerPicker.RecyclerPicker;
import cx.ring.plugins.RecyclerPicker.RecyclerPickerLayoutManager; import cx.ring.plugins.RecyclerPicker.RecyclerPickerLayoutManager;
import cx.ring.service.DRingService; import cx.ring.service.DRingService;
import net.jami.services.DeviceRuntimeService;
import net.jami.services.HardwareService;
import net.jami.services.NotificationService;
import cx.ring.utils.ActionHelper; import cx.ring.utils.ActionHelper;
import cx.ring.utils.ContentUriHandler; import cx.ring.utils.ContentUriHandler;
import cx.ring.utils.ConversationPath; import cx.ring.utils.ConversationPath;
import cx.ring.utils.DeviceUtils; import cx.ring.utils.DeviceUtils;
import cx.ring.utils.MediaButtonsHelper; import cx.ring.utils.MediaButtonsHelper;
import net.jami.utils.StringUtils;
import cx.ring.views.AvatarDrawable; import cx.ring.views.AvatarDrawable;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
...@@ -284,7 +285,7 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements ...@@ -284,7 +285,7 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
getString(R.string.action_call_hangup), getString(R.string.action_call_hangup),
PendingIntent.getService(context, new Random().nextInt(), PendingIntent.getService(context, new Random().nextInt(),
new Intent(DRingService.ACTION_CALL_END) new Intent(DRingService.ACTION_CALL_END)
.setClass(context, DRingService.class) .setClass(context, JamiService.class)
.putExtra(NotificationService.KEY_CALL_ID, callId), PendingIntent.FLAG_ONE_SHOT))); .putExtra(NotificationService.KEY_CALL_ID, callId), PendingIntent.FLAG_ONE_SHOT)));
paramBuilder.setActions(actions); paramBuilder.setActions(actions);
try { try {
...@@ -912,7 +913,9 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements ...@@ -912,7 +913,9 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
@Override @Override
public void displayDialPadKeyboard() { public void displayDialPadKeyboard() {
KeyboardVisibilityManager.showKeyboard(getActivity(), binding.dialpadEditText, InputMethodManager.SHOW_FORCED); binding.dialpadEditText.requestFocus();
InputMethodManager imm = (InputMethodManager) binding.dialpadEditText.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
} }
@Override @Override
...@@ -1398,11 +1401,11 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements ...@@ -1398,11 +1401,11 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
@Override @Override
public void toggleCallMediaHandler(String id, String callId, boolean toggle) { public void toggleCallMediaHandler(String id, String callId, boolean toggle) {
Ringservice.toggleCallMediaHandler(id, callId, toggle); JamiService.toggleCallMediaHandler(id, callId, toggle);
} }
public Map<String, String> getCallMediaHandlerDetails(String id) { public Map<String, String> getCallMediaHandlerDetails(String id) {
return Ringservice.getCallMediaHandlerDetails(id).toNative(); return JamiService.getCallMediaHandlerDetails(id).toNative();
} }
@Override @Override
...@@ -1421,7 +1424,7 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements ...@@ -1421,7 +1424,7 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
} }
public boolean displayPluginsButton() { public boolean displayPluginsButton() {
return Ringservice.getPluginsEnabled() && Ringservice.getCallMediaHandlers().size() > 0; return JamiService.getPluginsEnabled() && JamiService.getCallMediaHandlers().size() > 0;
} }
@Override @Override
...@@ -1475,7 +1478,7 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements ...@@ -1475,7 +1478,7 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
// Create callMediaHandlers and videoPluginsItems in a lazy manner // Create callMediaHandlers and videoPluginsItems in a lazy manner
if (pluginsModeFirst) { if (pluginsModeFirst) {
// Init // Init
callMediaHandlers = Ringservice.getCallMediaHandlers(); callMediaHandlers = JamiService.getCallMediaHandlers();
List<Drawable> videoPluginsItems = new ArrayList<>(callMediaHandlers.size() + 1); List<Drawable> videoPluginsItems = new ArrayList<>(callMediaHandlers.size() + 1);
videoPluginsItems.add(context.getDrawable(R.drawable.baseline_cancel_24)); videoPluginsItems.add(context.getDrawable(R.drawable.baseline_cancel_24));
......
...@@ -87,6 +87,8 @@ import net.jami.conversation.ConversationPresenter; ...@@ -87,6 +87,8 @@ import net.jami.conversation.ConversationPresenter;
import net.jami.conversation.ConversationView; import net.jami.conversation.ConversationView;
import cx.ring.databinding.FragConversationBinding; import cx.ring.databinding.FragConversationBinding;
import cx.ring.interfaces.Colorable; import cx.ring.interfaces.Colorable;
import net.jami.daemon.JamiService;
import net.jami.model.Account; import net.jami.model.Account;
import net.jami.model.Contact; import net.jami.model.Contact;
import net.jami.model.Conversation; import net.jami.model.Conversation;
...@@ -419,26 +421,21 @@ public class ConversationFragment extends BaseSupportFragment<ConversationPresen ...@@ -419,26 +421,21 @@ public class ConversationFragment extends BaseSupportFragment<ConversationPresen
PopupMenu popup = new PopupMenu(context, v); PopupMenu popup = new PopupMenu(context, v);
popup.inflate(R.menu.conversation_share_actions); popup.inflate(R.menu.conversation_share_actions);
popup.setOnMenuItemClickListener(item -> { popup.setOnMenuItemClickListener(item -> {
switch(item.getItemId()) { int itemId = item.getItemId();
case R.id.conv_send_audio: if (itemId == R.id.conv_send_audio) {
sendAudioMessage(); sendAudioMessage();
break; } else if (itemId == R.id.conv_send_video) {
case R.id.conv_send_video: sendVideoMessage();
sendVideoMessage(); } else if (itemId == R.id.conv_send_file) {
break; presenter.selectFile();
case R.id.conv_send_file: } else if (itemId == R.id.conv_share_location) {
presenter.selectFile(); shareLocation();
break; } else if (itemId == R.id.chat_plugins) {
case R.id.conv_share_location: presenter.showPluginListHandlers();
shareLocation();
break;
case R.id.chat_plugins:
presenter.showPluginListHandlers();
break;
} }
return false; return false;
}); });
popup.getMenu().findItem(R.id.chat_plugins).setVisible(Ringservice.getPluginsEnabled() && Ringservice.getChatHandlers().size() > 0); popup.getMenu().findItem(R.id.chat_plugins).setVisible(JamiService.getPluginsEnabled() && !JamiService.getChatHandlers().isEmpty());
MenuPopupHelper menuHelper = new MenuPopupHelper(context, (MenuBuilder) popup.getMenu(), v); MenuPopupHelper menuHelper = new MenuPopupHelper(context, (MenuBuilder) popup.getMenu(), v);
menuHelper.setForceShowIcon(true); menuHelper.setForceShowIcon(true);
menuHelper.show(); menuHelper.show();
...@@ -450,7 +447,7 @@ public class ConversationFragment extends BaseSupportFragment<ConversationPresen ...@@ -450,7 +447,7 @@ public class ConversationFragment extends BaseSupportFragment<ConversationPresen
FragmentManager fragmentManager = getChildFragmentManager(); FragmentManager fragmentManager = getChildFragmentManager();
PluginHandlersListFragment fragment = PluginHandlersListFragment.newInstance(accountId, contactId); PluginHandlersListFragment fragment = PluginHandlersListFragment.newInstance(accountId, contactId);
fragmentManager.beginTransaction() fragmentManager.beginTransaction()
.add(R.id.pluginListHandlers, fragment, fragment.TAG) .add(R.id.pluginListHandlers, fragment, PluginHandlersListFragment.TAG)
.commit(); .commit();
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) binding.mapCard.getLayoutParams(); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) binding.mapCard.getLayoutParams();
......
...@@ -214,7 +214,7 @@ public class LinkDeviceFragment extends BaseBottomSheetFragment<LinkDevicePresen ...@@ -214,7 +214,7 @@ public class LinkDeviceFragment extends BaseBottomSheetFragment<LinkDevicePresen
mBinding.accountLinkInfo.setText(styledResultText); mBinding.accountLinkInfo.setText(styledResultText);
mBinding.accountLinkInfo.requestFocus(); mBinding.accountLinkInfo.requestFocus();
KeyboardVisibilityManager.hideKeyboard(getActivity(), 0); KeyboardVisibilityManager.hideKeyboard(getActivity());
} }
private void onClickStart() { private void onClickStart() {
......
...@@ -9,7 +9,8 @@ import androidx.annotation.NonNull; ...@@ -9,7 +9,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import cx.ring.daemon.Ringservice; import net.jami.daemon.JamiService;
import cx.ring.databinding.FragPluginHandlersListBinding; import cx.ring.databinding.FragPluginHandlersListBinding;
import cx.ring.plugins.PluginUtils; import cx.ring.plugins.PluginUtils;
import cx.ring.settings.pluginssettings.PluginDetails; import cx.ring.settings.pluginssettings.PluginDetails;
...@@ -74,11 +75,11 @@ public class PluginHandlersListFragment extends Fragment implements PluginsListA ...@@ -74,11 +75,11 @@ public class PluginHandlersListFragment extends Fragment implements PluginsListA
@Override @Override
public void onPluginItemClicked(PluginDetails pluginDetails) { public void onPluginItemClicked(PluginDetails pluginDetails) {
Ringservice.toggleChatHandler(pluginDetails.getmHandlerId(), mPath.getAccountId(), mPath.getConversationId(), pluginDetails.isEnabled()); JamiService.toggleChatHandler(pluginDetails.getmHandlerId(), mPath.getAccountId(), mPath.getConversationId(), pluginDetails.isEnabled());
} }
@Override @Override
public void onPluginEnabled(PluginDetails pluginDetails) { public void onPluginEnabled(PluginDetails pluginDetails) {
Ringservice.toggleChatHandler(pluginDetails.getmHandlerId(), mPath.getAccountId(), mPath.getConversationId(), pluginDetails.isEnabled()); JamiService.toggleChatHandler(pluginDetails.getmHandlerId(), mPath.getAccountId(), mPath.getConversationId(), pluginDetails.isEnabled());
} }
} }
...@@ -8,8 +8,10 @@ import java.io.File; ...@@ -8,8 +8,10 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.jami.daemon.Ringservice;
import cx.ring.settings.pluginssettings.PluginDetails; import cx.ring.settings.pluginssettings.PluginDetails;
import net.jami.daemon.JamiService;
import net.jami.daemon.StringMap;
import net.jami.utils.Log; import net.jami.utils.Log;
public class PluginUtils { public class PluginUtils {
...@@ -26,8 +28,8 @@ public class PluginUtils { ...@@ -26,8 +28,8 @@ public class PluginUtils {
tree(mContext.getFilesDir() + File.separator+ "plugins",0); tree(mContext.getFilesDir() + File.separator+ "plugins",0);
tree(mContext.getCacheDir().getAbsolutePath(),0); tree(mContext.getCacheDir().getAbsolutePath(),0);
List<String> pluginsPaths = Ringservice.getInstalledPlugins(); List<String> pluginsPaths = JamiService.getInstalledPlugins();
List<String> loadedPluginsPaths = Ringservice.getLoadedPlugins(); List<String> loadedPluginsPaths = JamiService.getLoadedPlugins();
List<PluginDetails> pluginsList = new ArrayList<>(pluginsPaths.size()); List<PluginDetails> pluginsList = new ArrayList<>(pluginsPaths.size());
for (String pluginPath : pluginsPaths) { for (String pluginPath : pluginsPaths) {
...@@ -59,12 +61,12 @@ public class PluginUtils { ...@@ -59,12 +61,12 @@ public class PluginUtils {
tree(mContext.getFilesDir() + File.separator+ "plugins",0); tree(mContext.getFilesDir() + File.separator+ "plugins",0);
tree(mContext.getCacheDir().getAbsolutePath(),0); tree(mContext.getCacheDir().getAbsolutePath(),0);
List<String> chatHandlersId = Ringservice.getChatHandlers(); List<String> chatHandlersId = JamiService.getChatHandlers();
List<String> chatHandlerStatus = Ringservice.getChatHandlerStatus(accountId, peerId); List<String> chatHandlerStatus = JamiService.getChatHandlerStatus(accountId, peerId);
List<PluginDetails> handlersList = new ArrayList<>(chatHandlersId.size()); List<PluginDetails> handlersList = new ArrayList<>(chatHandlersId.size());
for (String handlerId : chatHandlersId) { for (String handlerId : chatHandlersId) {
StringMap handlerDetails = Ringservice.getChatHandlerDetails(handlerId); StringMap handlerDetails = JamiService.getChatHandlerDetails(handlerId);
String pluginPath = handlerDetails.get("pluginId"); String pluginPath = handlerDetails.get("pluginId");
pluginPath = pluginPath.substring(0, pluginPath.lastIndexOf("/data")); pluginPath = pluginPath.substring(0, pluginPath.lastIndexOf("/data"));
boolean enabled = false; boolean enabled = false;
...@@ -85,7 +87,7 @@ public class PluginUtils { ...@@ -85,7 +87,7 @@ public class PluginUtils {
* @return true if loaded * @return true if loaded
*/ */
public static boolean loadPlugin(String path) { public static boolean loadPlugin(String path) {
return Ringservice.loadPlugin(path); return JamiService.loadPlugin(path);
} }
/** /**
...@@ -95,7 +97,7 @@ public class PluginUtils { ...@@ -95,7 +97,7 @@ public class PluginUtils {
* @return true if unloaded * @return true if unloaded
*/ */
public static boolean unloadPlugin(String path) { public static boolean unloadPlugin(String path) {
return Ringservice.unloadPlugin(path); return JamiService.unloadPlugin(path);
} }
/** /**
...@@ -103,7 +105,7 @@ public class PluginUtils { ...@@ -103,7 +105,7 @@ public class PluginUtils {
* @return list of path * @return list of path
*/ */
public static List<String> getLoadedPlugins() { public static List<String> getLoadedPlugins() {
return Ringservice.getLoadedPlugins(); return JamiService.getLoadedPlugins();
} }
/** /**
......
...@@ -68,8 +68,7 @@ import java.util.Map; ...@@ -68,8 +68,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import net.jami.daemon.IntVect; import net.jami.daemon.IntVect;
import net.jami.daemon.Ringservice; import net.jami.daemon.JamiService;
import net.jami.daemon.RingserviceJNI;
import net.jami.daemon.StringMap; import net.jami.daemon.StringMap;
import net.jami.daemon.UintVect; import net.jami.daemon.UintVect;
import net.jami.utils.Tuple; import net.jami.utils.Tuple;
...@@ -114,7 +113,7 @@ public class CameraService { ...@@ -114,7 +113,7 @@ public class CameraService {
if (addedDevices.add(camera.first)) { if (addedDevices.add(camera.first)) {
if (!devices.cameras.contains(camera.first)) if (!devices.cameras.contains(camera.first))
devices.cameras.add(camera.first); devices.cameras.add(camera.first);
RingserviceJNI.addVideoDevice(camera.first); JamiService.addVideoDevice(camera.first);
} }
} }
}); });
...@@ -127,7 +126,7 @@ public class CameraService { ...@@ -127,7 +126,7 @@ public class CameraService {