From 540b7b48a169a024f752e112bcfa5822570a03e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Tue, 8 Sep 2020 09:26:21 -0400 Subject: [PATCH] device runtime: cleanup Change-Id: Ieec68304fb7989dad1a40e408486c7aa97753b2d --- .../cx/ring/services/DeviceRuntimeServiceImpl.java | 13 +------------ .../java/cx/ring/services/DeviceRuntimeService.java | 2 -- 2 files changed, 1 insertion(+), 14 deletions(-) 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 0a6713231..e74b50b07 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 2cf5e2013..941402a0c 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(); -- GitLab