From 60d175313bdadedeb331923dde3b5c10bbf582ae Mon Sep 17 00:00:00 2001 Message-Id: <60d175313bdadedeb331923dde3b5c10bbf582ae.1534410135.git.daniel.boehrs@open-xchange.com> In-Reply-To: <371694c11a8b1192ef5230b98af3a5719add98ef.1534410134.git.daniel.boehrs@open-xchange.com> References: <371694c11a8b1192ef5230b98af3a5719add98ef.1534410134.git.daniel.boehrs@open-xchange.com> From: "B. Petersen" Date: Fri, 27 Jul 2018 17:13:16 +0200 Subject: [PATCH 6/6] initialize the java-bindings, all functions should be callable now :) --- src/org/thoughtcrime/securesms/ApplicationContext.java | 6 ++++++ src/org/thoughtcrime/securesms/util/FileUtils.java | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index f49cba5..fa22338 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -27,6 +27,7 @@ import android.support.annotation.NonNull; import android.support.multidex.MultiDexApplication; import android.util.Log; +import com.b44t.messenger.MrMailbox; import com.google.android.gms.security.ProviderInstaller; import org.thoughtcrime.securesms.crypto.PRNGFixes; @@ -88,6 +89,11 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc @Override public void onCreate() { super.onCreate(); + + System.loadLibrary("native-utils"); + MrMailbox.MrCallback(0, 0, 0); // do not remove this call; this makes sure, the function is not removed from build or warnings are printed! + MrMailbox.init(); + initializeRandomNumberFix(); initializeLogging(); initializeDependencyInjection(); diff --git a/src/org/thoughtcrime/securesms/util/FileUtils.java b/src/org/thoughtcrime/securesms/util/FileUtils.java index e437edd..8927af6 100644 --- a/src/org/thoughtcrime/securesms/util/FileUtils.java +++ b/src/org/thoughtcrime/securesms/util/FileUtils.java @@ -9,10 +9,6 @@ import java.security.NoSuchAlgorithmException; public class FileUtils { - static { - System.loadLibrary("native-utils"); - } - public static native int getFileDescriptorOwner(FileDescriptor fileDescriptor); public static byte[] getFileDigest(FileInputStream fin) throws IOException { -- 2.8.2