@functionland/react-native-fula 1.14.1 → 1.14.4

package/LICENSE

@@ -1,21 +1,20 @@
-MIT License
-
-Copyright (c) 2021 Mahdi Ghorbani
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 Ehsan Shariati <ehsan6sha@gmail.com> (https://github.com/ehsan6sha)
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/android/build.gradle

@@ -1,70 +1,110 @@
 buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-            jcenter()
-        }
-
-        dependencies {
-            classpath 'com.android.tools.build:gradle:4.2.2'
-        }
-    }
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+  }
+}
+
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
+apply plugin: "com.android.library"
+
+
+def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
+}
+
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Fula_" + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["Fula_" + name]).toInteger()
 }
 
-apply plugin: 'com.android.library'
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
+
+  return major >= 8
 }
 
 android {
-  compileSdk 33
-  defaultConfig {
-        minSdkVersion safeExtGet('Fula_minSdkVersion', 26)
-        targetSdkVersion safeExtGet('Fula_targetSdkVersion', 31)
-        versionCode 1
-        versionName "1.0"
+  if (supportsNamespace()) {
+    namespace "land.fx.fula"
 
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
     }
+  }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+  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")
-    }
-
+  mavenLocal()
+  google()
+  jcenter()
+  mavenCentral()
+  
+  // Add this repo to get go-fula package
+  maven { url 'https://jitpack.io' }
+}
 
 
-    // Add this repo to get go-fula package
-    maven { url 'https://jitpack.io' }
+dependencies {
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
+  implementation 'com.github.functionland:fula-build-aar:1.13.1' // From jitpack.io
+  implementation 'com.github.functionland:wnfs-android:v1.8.0' // From jitpack.io
+  implementation 'commons-io:commons-io:20030203.000550'
+  implementation 'commons-codec:commons-codec:1.15'
+  // implementation files('mobile.aar')
 }
 
-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.8.0' // From jitpack.io
-    implementation 'commons-io:commons-io:20030203.000550'
-    implementation 'commons-codec:commons-codec:1.15'
-    // implementation files('mobile.aar')
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "Fula"
+    codegenJavaPackageName = "land.fx.fula"
+  }
 }

package/android/gradle.properties

@@ -1 +1,5 @@
-android.useAndroidX=true
+Fula_kotlinVersion=1.7.0
+Fula_minSdkVersion=21
+Fula_targetSdkVersion=31
+Fula_compileSdkVersion=31
+Fula_ndkversion=21.4.7075529

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="land.fx.fula">
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="land.fx.fula">
+</manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

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

@@ -1,7 +1,7 @@
-package land.fx.fula;
-
-public final class ConfigRef {
-    public byte[] identity;
-    public java.lang.String storePath;
-}
-
+package land.fx.fula;
+
+public final class ConfigRef {
+    public byte[] identity;
+    public java.lang.String storePath;
+}
+

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

@@ -250,7 +250,7 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @ReactMethod
-  public void init(String identityString, String storePath, String bloxAddr, String exchange, boolean autoFlush, String rootConfig, boolean useRelay, boolean refresh, Promise promise) {
+  public void initFula(String identityString, String storePath, String bloxAddr, String exchange, boolean autoFlush, String rootConfig, boolean useRelay, boolean refresh, Promise promise) {
     Log.d("ReactNative", "init started");
     ThreadUtils.runOnExecutor(() -> {
       try {

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);
+  }
+}