@functionland/react-native-fula 1.12.0 → 1.13.1

package/android/.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">

package/android/build.gradle

@@ -1,70 +1,70 @@
-buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-            jcenter()
-        }
-
-        dependencies {
-            classpath 'com.android.tools.build:gradle:4.2.2'
-        }
-    }
-}
-
-apply plugin: 'com.android.library'
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
-android {
-  compileSdk 33
-  defaultConfig {
-        minSdkVersion safeExtGet('Fula_minSdkVersion', 26)
-        targetSdkVersion safeExtGet('Fula_targetSdkVersion', 31)
-        versionCode 1
-        versionName "1.0"
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-  ndkVersion '25.1.8937393'
-}
-
-repositories {
-    mavenLocal()
-    google()
-    jcenter()
-    mavenCentral()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-
-
-
-    // Add this repo to get go-fula package
-    maven { url 'https://jitpack.io' }
-}
-
-dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.github.functionland:fula-build-aar:1.12.0' // From jitpack.io
-    implementation 'com.github.functionland:wnfs-build-aar:v1.4.1' // From jitpack.io
-    implementation 'commons-io:commons-io:20030203.000550'
-    implementation 'commons-codec:commons-codec:1.15'
-    // implementation files('mobile.aar')
-}
+buildscript {
+    if (project == rootProject) {
+        repositories {
+            google()
+            mavenCentral()
+            jcenter()
+        }
+
+        dependencies {
+            classpath 'com.android.tools.build:gradle:4.2.2'
+        }
+    }
+}
+
+apply plugin: 'com.android.library'
+
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+android {
+  compileSdk 33
+  defaultConfig {
+        minSdkVersion safeExtGet('Fula_minSdkVersion', 26)
+        targetSdkVersion safeExtGet('Fula_targetSdkVersion', 31)
+        versionCode 1
+        versionName "1.0"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+  ndkVersion '25.1.8937393'
+}
+
+repositories {
+    mavenLocal()
+    google()
+    jcenter()
+    mavenCentral()
+    maven {
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        url("$rootDir/../node_modules/react-native/android")
+    }
+
+
+
+    // Add this repo to get go-fula package
+    maven { url 'https://jitpack.io' }
+}
+
+dependencies {
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation 'com.github.functionland:fula-build-aar:1.13.1' // From jitpack.io
+    implementation 'com.github.functionland:wnfs-android:v1.7.3' // From jitpack.io
+    implementation 'commons-io:commons-io:20030203.000550'
+    implementation 'commons-codec:commons-codec:1.15'
+    // implementation files('mobile.aar')
+}

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

@@ -23,11 +23,13 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.crypto.spec.GCMParameterSpec;
 
 public class Cryptography {
-  public static String encryptMsg(String message, SecretKey secret)
+  public static String encryptMsg(String message, SecretKey secret, byte[] iv)
     throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException {
     Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-    byte[] iv = new byte[12]; // Ensure this is randomly generated for each encryption.
-    new SecureRandom().nextBytes(iv);
+    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));