Merge branch 'Tapchicoma-improve_jni_loading'

developernotes · developernotes · commit 286f9bb16f30 · 2017-02-15T11:05:26.000-06:00
diff --git a/src/net/sqlcipher/database/SQLiteDatabase.java b/src/net/sqlcipher/database/SQLiteDatabase.java
@@ -181,19 +181,54 @@ private static void loadICUData(Context context, File workingDir) {
       }
     }
 
-  /**
-   * Loads the native SQLCipher library into the application process.
-   */
+    /**
+     * Implement this interface to provide custom strategy for loading jni libraries.
+     */
+    public interface LibraryLoader {
+        /**
+         * Load jni libraries by given names.
+         * Straightforward implementation will be calling {@link System#loadLibrary(String name)}
+         * for every provided library name.
+         *
+         * @param libNames library names that sqlcipher need to load
+         */
+        void loadLibraries(String... libNames);
+    }
+
+    /**
+     * Loads the native SQLCipher library into the application process.
+     */
     public static synchronized void loadLibs (Context context) {
         loadLibs(context, context.getFilesDir());
     }
 
-  /**
-   * Loads the native SQLCipher library into the application process.
-   */
+    /**
+     * Loads the native SQLCipher library into the application process.
+     */
     public static synchronized void loadLibs (Context context, File workingDir) {
-      System.loadLibrary("sqlcipher");
-      
+        loadLibs(context, workingDir, new LibraryLoader() {
+            @Override
+            public void loadLibraries(String... libNames) {
+                for (String libName : libNames) {
+                    System.loadLibrary(libName);
+                }
+            }
+        });
+    }
+
+    /**
+     * Loads the native SQLCipher library into the application process.
+     */
+    public static synchronized void loadLibs(Context context, LibraryLoader libraryLoader) {
+        loadLibs(context, context.getFilesDir(), libraryLoader);
+    }
+
+    /**
+     * Loads the native SQLCipher library into the application process.
+     */
+    public static synchronized void loadLibs (Context context, File workingDir, LibraryLoader libraryLoader) {
+        libraryLoader.loadLibraries("sqlcipher");
+
         // System.loadLibrary("stlport_shared");
         // System.loadLibrary("sqlcipher_android");
         // System.loadLibrary("database_sqlcipher");
