diff --git a/ring-android/app/src/main/java/cx/ring/services/DeviceRuntimeServiceImpl.java b/ring-android/app/src/main/java/cx/ring/services/DeviceRuntimeServiceImpl.java index 0a67132317fd1539a0dc7fdfc26bbdcf32ee270d..e74b50b07b814ef744a1670d613b4170c1422f4c 100644 --- a/ring-android/app/src/main/java/cx/ring/services/DeviceRuntimeServiceImpl.java +++ b/ring-android/app/src/main/java/cx/ring/services/DeviceRuntimeServiceImpl.java @@ -55,7 +55,6 @@ public class DeviceRuntimeServiceImpl extends DeviceRuntimeService { @Inject @Named("DaemonExecutor") ScheduledExecutorService mExecutor; - private long mDaemonThreadId = -1; private void copyAssets() { File pluginsPath = new File(mContext.getFilesDir(), "plugins"); @@ -64,22 +63,17 @@ public class DeviceRuntimeServiceImpl extends DeviceRuntimeService { AndroidFileUtils.copyAssetFolder(mContext.getAssets(), "plugins", pluginsPath); } - @Override public void loadNativeLibrary() { - mExecutor.submit(() -> { + mExecutor.execute(() -> { try { - mDaemonThreadId = Thread.currentThread().getId(); System.loadLibrary("ring"); - return true; } catch (Exception e) { Log.e(TAG, "Could not load Jami library", e); - return false; } }); } - @Override public File provideFilesDir() { return mContext.getFilesDir(); @@ -135,11 +129,6 @@ public class DeviceRuntimeServiceImpl extends DeviceRuntimeService { return isNetworkConnectedForType(ConnectivityManager.TYPE_ETHERNET); } - @Override - public long provideDaemonThreadId() { - return mDaemonThreadId; - } - @Override public boolean hasVideoPermission() { return checkPermission(Manifest.permission.CAMERA); diff --git a/ring-android/libringclient/src/main/java/cx/ring/services/DeviceRuntimeService.java b/ring-android/libringclient/src/main/java/cx/ring/services/DeviceRuntimeService.java index 2cf5e2013b1f18858a392198502109a86e66b122..941402a0c4f8061cd25cd32dc6a62d47de95db9a 100644 --- a/ring-android/libringclient/src/main/java/cx/ring/services/DeviceRuntimeService.java +++ b/ring-android/libringclient/src/main/java/cx/ring/services/DeviceRuntimeService.java @@ -42,8 +42,6 @@ public abstract class DeviceRuntimeService implements DaemonService.SystemInfoCa public abstract boolean isConnectedBluetooth(); - public abstract long provideDaemonThreadId(); - public abstract boolean hasVideoPermission(); public abstract boolean hasAudioPermission();