@functionland/react-native-fula 1.39.2 → 1.41.1

package/android/src/main/java/land/fx/fula/Cryptography.java

@@ -1,62 +1,62 @@
-package land.fx.fula;
-
-import android.util.Base64;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.SecureRandom;
-import java.nio.ByteBuffer;
-import java.security.spec.InvalidParameterSpecException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-import javax.crypto.spec.GCMParameterSpec;
-
-public class Cryptography {
-  public static String encryptMsg(String message, SecretKey secret, byte[] iv)
-    throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException {
-    Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-    if (iv == null || iv.length == 0) {
-      iv = new byte[12]; // Ensure this is randomly generated for each encryption.
-      new SecureRandom().nextBytes(iv);
-    }
-    GCMParameterSpec spec = new GCMParameterSpec(128, iv);
-    cipher.init(Cipher.ENCRYPT_MODE, secret, spec);
-    byte[] cipherText = cipher.doFinal(message.getBytes(StandardCharsets.UTF_8));
-    ByteBuffer byteBuffer = ByteBuffer.allocate(iv.length + cipherText.length);
-    byteBuffer.put(iv);
-    byteBuffer.put(cipherText);
-    return Base64.encodeToString(byteBuffer.array(), Base64.NO_WRAP);
-  }
-
-  public static String decryptMsg(String cipherText, SecretKey secret)
-    throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
-    ByteBuffer byteBuffer = ByteBuffer.wrap(Base64.decode(cipherText, Base64.NO_WRAP));
-    byte[] iv = new byte[12];
-    byteBuffer.get(iv);
-    byte[] cipherBytes = new byte[byteBuffer.remaining()];
-    byteBuffer.get(cipherBytes);
-    Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-    GCMParameterSpec spec = new GCMParameterSpec(128, iv);
-    cipher.init(Cipher.DECRYPT_MODE, secret, spec);
-    String decryptString = new String(cipher.doFinal(cipherBytes), StandardCharsets.UTF_8);
-    return decryptString;
-  }
-
-  public static SecretKey generateKey(byte[] key)
-    throws NoSuchAlgorithmException, InvalidKeySpecException {
-    PBEKeySpec pbeKeySpec = new PBEKeySpec(StaticHelper.bytesToBase64(key).toCharArray(), key, 1000, 128);
-    SecretKey pbeKey = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(pbeKeySpec);
-    return new SecretKeySpec(pbeKey.getEncoded(), "AES");
-  }
-}
+package land.fx.fula;
+
+import android.util.Base64;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.SecureRandom;
+import java.nio.ByteBuffer;
+import java.security.spec.InvalidParameterSpecException;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.spec.GCMParameterSpec;
+
+public class Cryptography {
+  public static String encryptMsg(String message, SecretKey secret, byte[] iv)
+    throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException {
+    Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+    if (iv == null || iv.length == 0) {
+      iv = new byte[12]; // Ensure this is randomly generated for each encryption.
+      new SecureRandom().nextBytes(iv);
+    }
+    GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+    cipher.init(Cipher.ENCRYPT_MODE, secret, spec);
+    byte[] cipherText = cipher.doFinal(message.getBytes(StandardCharsets.UTF_8));
+    ByteBuffer byteBuffer = ByteBuffer.allocate(iv.length + cipherText.length);
+    byteBuffer.put(iv);
+    byteBuffer.put(cipherText);
+    return Base64.encodeToString(byteBuffer.array(), Base64.NO_WRAP);
+  }
+
+  public static String decryptMsg(String cipherText, SecretKey secret)
+    throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
+    ByteBuffer byteBuffer = ByteBuffer.wrap(Base64.decode(cipherText, Base64.NO_WRAP));
+    byte[] iv = new byte[12];
+    byteBuffer.get(iv);
+    byte[] cipherBytes = new byte[byteBuffer.remaining()];
+    byteBuffer.get(cipherBytes);
+    Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+    GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+    cipher.init(Cipher.DECRYPT_MODE, secret, spec);
+    String decryptString = new String(cipher.doFinal(cipherBytes), StandardCharsets.UTF_8);
+    return decryptString;
+  }
+
+  public static SecretKey generateKey(byte[] key)
+    throws NoSuchAlgorithmException, InvalidKeySpecException {
+    PBEKeySpec pbeKeySpec = new PBEKeySpec(StaticHelper.bytesToBase64(key).toCharArray(), key, 1000, 128);
+    SecretKey pbeKey = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(pbeKeySpec);
+    return new SecretKeySpec(pbeKey.getEncoded(), "AES");
+  }
+}

package/android/src/main/java/land/fx/fula/FulaModule.java

@@ -1315,11 +1315,12 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @ReactMethod
-  public void cancelPoolJoin(long poolID, Promise promise) {
+  public void cancelPoolJoin(String poolID, Promise promise) {
     ThreadUtils.runOnExecutor(() -> {
-      Log.d("ReactNative", "cancelPoolJoin: poolID = " + poolID);
+      long poolIdLong = Long.parseLong(poolID);
+      Log.d("ReactNative", "cancelPoolJoin: poolID = " + poolIdLong);
       try {
-        byte[] result = this.fula.poolCancelJoin(poolID);
+        byte[] result = this.fula.poolCancelJoin(poolIdLong);
         String resultString = toString(result);
         promise.resolve(resultString);
       } catch (Exception e) {
@@ -1345,11 +1346,12 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @ReactMethod
-  public void leavePool(long poolID, Promise promise) {
+  public void leavePool(String poolID, Promise promise) {
     ThreadUtils.runOnExecutor(() -> {
-      Log.d("ReactNative", "leavePool: poolID = " + poolID);
+      long poolIdLong = Long.parseLong(poolID);
+      Log.d("ReactNative", "leavePool: poolID = " + poolIdLong);
       try {
-        byte[] result = this.fula.poolLeave(poolID);
+        byte[] result = this.fula.poolLeave(poolIdLong);
         String resultString = toString(result);
         promise.resolve(resultString);
       } catch (Exception e) {

package/android/src/main/java/land/fx/fula/FulaPackage.java

@@ -1,32 +1,32 @@
-package land.fx.fula;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class FulaPackage implements ReactPackage {
-  @NonNull
-  @Override
-  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-      List<NativeModule> modules = new ArrayList<>();
-      try {
-        modules.add(new FulaModule(reactContext));
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-      return modules;
-  }
-
-  @NonNull
-  @Override
-  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-      return Collections.emptyList();
-  }
-}
+package land.fx.fula;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class FulaPackage implements ReactPackage {
+  @NonNull
+  @Override
+  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+      List<NativeModule> modules = new ArrayList<>();
+      try {
+        modules.add(new FulaModule(reactContext));
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+      return modules;
+  }
+
+  @NonNull
+  @Override
+  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+      return Collections.emptyList();
+  }
+}

package/android/src/main/java/land/fx/fula/SharedPreferenceHelper.java

@@ -1,65 +1,65 @@
-package land.fx.fula;
-
-import static android.content.Context.MODE_PRIVATE;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.util.Log;
-
-public class SharedPreferenceHelper {
-  private static SharedPreferenceHelper me;
-  private static String sharedPrefName;
-  private static Context context;
-
-  private SharedPreferenceHelper() {
-  }
-
-  public static SharedPreferenceHelper getInstance(Context cntx) {
-    if (me == null) {
-      me = new SharedPreferenceHelper();
-    }
-    context = cntx;
-    sharedPrefName = "APP_KEY_PAIR_VALUE";
-    return me;
-  }
-
-  public String getValue(String key) {
-    SharedPreferences prefs = context.getSharedPreferences(sharedPrefName, MODE_PRIVATE);
-    return prefs.getString(key, null);
-  }
-
-  public boolean getBooleanValue(String key) {
-    SharedPreferences prefs = context.getSharedPreferences(sharedPrefName, MODE_PRIVATE);
-    return prefs.getBoolean(key, false);
-  }
-
-  public SharedPreferenceHelper add(String key, String value) {
-    try {
-      context.getSharedPreferences(sharedPrefName, MODE_PRIVATE).edit().putString(key, value).apply();
-      return me;
-    } catch (Exception ex) {
-      Log.e("React-Native-Fula", "SharedPrefHandler: AddSharedPref: Exception: " + ex.getMessage(), ex);
-      throw ex;
-    }
-  }
-
-  public SharedPreferenceHelper add(String key, boolean value) {
-    try {
-      context.getSharedPreferences(sharedPrefName, MODE_PRIVATE).edit().putBoolean(key, value).apply();
-      return me;
-    } catch (Exception e) {
-      Log.e("React-Native-Fula", "SharedPrefHandler: AddSharedPref: Exception: " + e.getMessage(), e);
-      throw e;
-    }
-  }
-
-  public SharedPreferenceHelper remove(String key) {
-    try {
-      context.getSharedPreferences(sharedPrefName, MODE_PRIVATE).edit().remove(key).apply();
-      return me;
-    } catch (Exception ex) {
-      Log.e("React-Native-Fula", "SharedPrefHandler: AddSharedPref: Exception: " + ex.getMessage(), ex);
-      throw ex;
-    }
-  }
-}
+package land.fx.fula;
+
+import static android.content.Context.MODE_PRIVATE;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+public class SharedPreferenceHelper {
+  private static SharedPreferenceHelper me;
+  private static String sharedPrefName;
+  private static Context context;
+
+  private SharedPreferenceHelper() {
+  }
+
+  public static SharedPreferenceHelper getInstance(Context cntx) {
+    if (me == null) {
+      me = new SharedPreferenceHelper();
+    }
+    context = cntx;
+    sharedPrefName = "APP_KEY_PAIR_VALUE";
+    return me;
+  }
+
+  public String getValue(String key) {
+    SharedPreferences prefs = context.getSharedPreferences(sharedPrefName, MODE_PRIVATE);
+    return prefs.getString(key, null);
+  }
+
+  public boolean getBooleanValue(String key) {
+    SharedPreferences prefs = context.getSharedPreferences(sharedPrefName, MODE_PRIVATE);
+    return prefs.getBoolean(key, false);
+  }
+
+  public SharedPreferenceHelper add(String key, String value) {
+    try {
+      context.getSharedPreferences(sharedPrefName, MODE_PRIVATE).edit().putString(key, value).apply();
+      return me;
+    } catch (Exception ex) {
+      Log.e("React-Native-Fula", "SharedPrefHandler: AddSharedPref: Exception: " + ex.getMessage(), ex);
+      throw ex;
+    }
+  }
+
+  public SharedPreferenceHelper add(String key, boolean value) {
+    try {
+      context.getSharedPreferences(sharedPrefName, MODE_PRIVATE).edit().putBoolean(key, value).apply();
+      return me;
+    } catch (Exception e) {
+      Log.e("React-Native-Fula", "SharedPrefHandler: AddSharedPref: Exception: " + e.getMessage(), e);
+      throw e;
+    }
+  }
+
+  public SharedPreferenceHelper remove(String key) {
+    try {
+      context.getSharedPreferences(sharedPrefName, MODE_PRIVATE).edit().remove(key).apply();
+      return me;
+    } catch (Exception ex) {
+      Log.e("React-Native-Fula", "SharedPrefHandler: AddSharedPref: Exception: " + ex.getMessage(), ex);
+      throw ex;
+    }
+  }
+}

package/android/src/main/java/land/fx/fula/StaticHelper.java

@@ -1,13 +1,13 @@
-package land.fx.fula;
-
-import java.util.Base64;
-
-public class StaticHelper {
-  public static String bytesToBase64(byte[] bytes) {
-    return Base64.getEncoder().encodeToString(bytes);
-  }
-
-  public static byte[] base64ToBytes(String base64) {
-    return Base64.getDecoder().decode(base64);
-  }
-}
+package land.fx.fula;
+
+import java.util.Base64;
+
+public class StaticHelper {
+  public static String bytesToBase64(byte[] bytes) {
+    return Base64.getEncoder().encodeToString(bytes);
+  }
+
+  public static byte[] base64ToBytes(String base64) {
+    return Base64.getDecoder().decode(base64);
+  }
+}

package/android/src/main/java/land/fx/fula/ThreadUtils.java

@@ -1,42 +1,42 @@
-package land.fx.fula;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-final class ThreadUtils {
-    /**
-     * Thread which will be used to call all APIs. They
-     * they don't run on the calling thread anyway, we are deferring the calls
-     * to this thread to avoid (potentially) blocking the calling thread.
-     */
-    private static final ExecutorService executor
-        = Executors.newSingleThreadExecutor();
-
-    /**
-     * Runs the given {@link Runnable} on the executor.
-     * @param runnable
-     */
-    public static void runOnExecutor(Runnable runnable) {
-        executor.execute(runnable);
-    }
-
-    /**
-     * Submits the given {@link Callable} to be run on the executor.
-     * @param callable
-     * @return Future.
-     */
-    public static <T> Future<T> submitToExecutor(Callable<T> callable) {
-        return executor.submit(callable);
-    }
-
-    /**
-     * Submits the given {@link Runnable} to be run on the executor.
-     * @param runnable
-     * @return Future.
-     */
-    public static Future<?> submitToExecutor(Runnable runnable) {
-        return executor.submit(runnable);
-    }
-}
+package land.fx.fula;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+final class ThreadUtils {
+    /**
+     * Thread which will be used to call all APIs. They
+     * they don't run on the calling thread anyway, we are deferring the calls
+     * to this thread to avoid (potentially) blocking the calling thread.
+     */
+    private static final ExecutorService executor
+        = Executors.newSingleThreadExecutor();
+
+    /**
+     * Runs the given {@link Runnable} on the executor.
+     * @param runnable
+     */
+    public static void runOnExecutor(Runnable runnable) {
+        executor.execute(runnable);
+    }
+
+    /**
+     * Submits the given {@link Callable} to be run on the executor.
+     * @param callable
+     * @return Future.
+     */
+    public static <T> Future<T> submitToExecutor(Callable<T> callable) {
+        return executor.submit(callable);
+    }
+
+    /**
+     * Submits the given {@link Runnable} to be run on the executor.
+     * @param runnable
+     * @return Future.
+     */
+    public static Future<?> submitToExecutor(Runnable runnable) {
+        return executor.submit(runnable);
+    }
+}

package/ios/Cryptography.swift

@@ -1,49 +1,49 @@
-import Foundation
-import CommonCrypto
-import CryptoSwift
-import os.log
-
-
-
-public class Cryptography: NSObject {
-    public static func encryptMsg(_ message: Array<UInt8>, _ secretKey: Array<UInt8>)
-    throws -> String {
-        OSLog.viewCycle.info("ReactNative encryptMsg started for \(message)")
-        let aes = try! AES(key: secretKey, blockMode: ECB(), padding: .pkcs5)
-        OSLog.viewCycle.info("ReactNative encryptMsg aes")
-        let encrypted = try! aes.encrypt(message)
-        OSLog.viewCycle.info("ReactNative encryptMsg encrypted")
-        do{
-            let data = Data(encrypted).base64EncodedString()
-            OSLog.viewCycle.info("ReactNative encryptMsg: \(data)")
-            return data
-        } catch let error {
-            OSLog.viewCycle.info("ReactNative encryptMsg error: \(error.localizedDescription)")
-            throw error
-        }
-    }
-    
-    public static func decryptMsg(_ cipherText: String, _ secretKey: Array<UInt8>)
-    throws -> Array<UInt8> {
-        let aes = try! AES(key: secretKey, blockMode: ECB(), padding: .pkcs5)
-        let data =  cipherText.fromBase64()!
-        return try! aes.decrypt(data.bytes)
-
-    }
-    
-    public static func generateKey(_ salt: Data)
-    throws -> Array<UInt8> {
-        let password: [UInt8] = Array("".utf8)
-        let salt: [UInt8] = salt.bytes
-
-        //TODO: Generate a key from a salt and an empty password
-        let key = try PKCS5.PBKDF2(
-            password: password,
-            salt: salt,
-            iterations: 4096,
-            keyLength: 16, /* AES-128 */
-            variant: .sha2(SHA2.Variant.sha256)
-        ).calculate()
-        return key
-    }
-}
+import Foundation
+import CommonCrypto
+import CryptoSwift
+import os.log
+
+
+
+public class Cryptography: NSObject {
+    public static func encryptMsg(_ message: Array<UInt8>, _ secretKey: Array<UInt8>)
+    throws -> String {
+        OSLog.viewCycle.info("ReactNative encryptMsg started for \(message)")
+        let aes = try! AES(key: secretKey, blockMode: ECB(), padding: .pkcs5)
+        OSLog.viewCycle.info("ReactNative encryptMsg aes")
+        let encrypted = try! aes.encrypt(message)
+        OSLog.viewCycle.info("ReactNative encryptMsg encrypted")
+        do{
+            let data = Data(encrypted).base64EncodedString()
+            OSLog.viewCycle.info("ReactNative encryptMsg: \(data)")
+            return data
+        } catch let error {
+            OSLog.viewCycle.info("ReactNative encryptMsg error: \(error.localizedDescription)")
+            throw error
+        }
+    }
+    
+    public static func decryptMsg(_ cipherText: String, _ secretKey: Array<UInt8>)
+    throws -> Array<UInt8> {
+        let aes = try! AES(key: secretKey, blockMode: ECB(), padding: .pkcs5)
+        let data =  cipherText.fromBase64()!
+        return try! aes.decrypt(data.bytes)
+
+    }
+    
+    public static func generateKey(_ salt: Data)
+    throws -> Array<UInt8> {
+        let password: [UInt8] = Array("".utf8)
+        let salt: [UInt8] = salt.bytes
+
+        //TODO: Generate a key from a salt and an empty password
+        let key = try PKCS5.PBKDF2(
+            password: password,
+            salt: salt,
+            iterations: 4096,
+            keyLength: 16, /* AES-128 */
+            variant: .sha2(SHA2.Variant.sha256)
+        ).calculate()
+        return key
+    }
+}

package/ios/Fula-Bridging-Header.h

@@ -1,3 +1,3 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-#import <React/RCTConvert.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+#import <React/RCTConvert.h>