feat: run crypto_pwhash on separate thread

DiogoAbu · Oct 26, 2020 · 99e7c42 · 99e7c42
1 parent 7803f72
commit 99e7c42
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -19,6 +19,10 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "0.1"
+        compileOptions {
+          sourceCompatibility JavaVersion.VERSION_1_8
+          targetCompatibility JavaVersion.VERSION_1_8
+        }
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_TOOLCHAIN=clang"

diff --git a/android/src/main/java/org/libsodium/rn/RCTSodiumModule.java b/android/src/main/java/org/libsodium/rn/RCTSodiumModule.java
@@ -6,6 +6,9 @@
 
 import java.util.Map;
 import java.util.HashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import android.util.Base64;
 import android.util.Log;
 
@@ -21,6 +24,12 @@
 
 public class RCTSodiumModule extends ReactContextBaseJavaModule {
 
+  private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+
+  private void runOnExecutor(Runnable runnable) {
+    executor.execute(runnable);
+  }
+
   static final String ESODIUM = "ESODIUM";
   static final String ERR_BAD_KEY = "BAD_KEY";
   static final String ERR_BAD_MAC = "BAD_MAC";
@@ -402,20 +411,22 @@ else if (skb.length != Sodium.crypto_box_secretkeybytes())
 
   @ReactMethod
   public void crypto_pwhash(final Integer keylen, final String password, final String salt, final Integer opslimit, final Integer memlimit, final Integer algo , final Promise p) {
-    try {
-      byte[] saltb = Base64.decode(salt, Base64.NO_WRAP);
-      byte[] passwordb = Base64.decode(password, Base64.NO_WRAP);
-      byte[] out = new byte[keylen];
+    runOnExecutor(() -> {
+      try {
+        byte[] saltb = Base64.decode(salt, Base64.NO_WRAP);
+        byte[] passwordb = Base64.decode(password, Base64.NO_WRAP);
+        byte[] out = new byte[keylen];
 
-      int result = Sodium.crypto_pwhash(out, out.length, passwordb, passwordb.length, saltb, opslimit, memlimit, algo);
-      if (result != 0)
-        p.reject(ESODIUM,ERR_FAILURE);
-      else
-        p.resolve(Base64.encodeToString(out, Base64.NO_WRAP));
-    }
-    catch (Throwable t) {
-      p.reject(ESODIUM,ERR_FAILURE,t);
-    }
+        int result = Sodium.crypto_pwhash(out, out.length, passwordb, passwordb.length, saltb, opslimit, memlimit, algo);
+        if (result != 0)
+          p.reject(ESODIUM,ERR_FAILURE);
+        else
+          p.resolve(Base64.encodeToString(out, Base64.NO_WRAP));
+      }
+      catch (Throwable t) {
+        p.reject(ESODIUM,ERR_FAILURE,t);
+      }
+    });
   }
 
   @ReactMethod