aboutsummaryrefslogtreecommitdiff
path: root/java/android
diff options
context:
space:
mode:
authorpedroGitt <pedro.contreiras@amdocs.com>2016-10-26 18:12:38 +0200
committerpedroGitt <pedro.contreiras@amdocs.com>2016-10-26 18:12:38 +0200
commitd6824a4f499e83a31181b22b8be1e31ce1670277 (patch)
treef9425efebc6e98475d511b2dc889e21be522a524 /java/android
parentb0fc867bfe22a1253c0d28919b817d247122a06c (diff)
Revert loadLibrary as static.
Diffstat (limited to 'java/android')
-rw-r--r--java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
index 403b4b3..21734dc 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
@@ -16,13 +16,16 @@
package org.matrix.olm;
-
import android.util.Log;
+/**
+ * Olm SDK entry point class.<br> An OlmManager instance must be created at first to enable native library load.
+ * <br><br>Detailed implementation guide is available at <a href="http://matrix.org/docs/guides/e2e_implementation.html">Implementing End-to-End Encryption in Matrix clients</a>.
+ */
public class OlmManager {
private static final String LOG_TAG = "OlmManager";
- public OlmManager() {
+ static {
try {
java.lang.System.loadLibrary("olm");
} catch(UnsatisfiedLinkError e) {