Fixed Android build.

iden3 · Dec 20, 2024 · 37a288d · 37a288d
1 parent 45215d9
commit 37a288d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -105,7 +105,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation "io.iden3.circomwitnesscalc:0.0.1-alpha.1"
+  implementation "io.iden3:circomwitnesscalc:0.0.1-alpha.1"
 }
 
 if (isNewArchitectureEnabled()) {

diff --git a/android/src/main/java/com/circomwitnesscalc/CircomWitnesscalcModule.kt b/android/src/main/java/com/circomwitnesscalc/CircomWitnesscalcModule.kt
@@ -1,10 +1,12 @@
 package com.circomwitnesscalc
 
+import android.util.Base64
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.Promise
-import io.iden3.circomwitnesscalc.CircomWitnesscalc
+import io.iden3.circomwitnesscalc.WitnesscalcError
+import io.iden3.circomwitnesscalc.calculateWitness
 
 class CircomWitnesscalcModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext) {
@@ -19,22 +21,20 @@ class CircomWitnesscalcModule(reactContext: ReactApplicationContext) :
   fun calculateWitness(inputs: String, graph: String, promise: Promise) {
     try {
       // Decode base64
-      byte[] zkeyBytes = Base64.decode(graph, Base64.DEFAULT);
+      val graphBytes = Base64.decode(graph, Base64.DEFAULT);
 
-      ByteArray witness = CircomWitnesscalc.calculateWitness(
+      val witness = calculateWitness(
         inputs,
-        graph
-      );
+        graphBytes
+      )
 
       // Encode base64
-      String witnessBase64 = Base64.encodeToString(witness, Base64.DEFAULT);
+      val witnessBase64 = Base64.encodeToString(witness, Base64.DEFAULT);
 
       promise.resolve(witnessBase64);
-    } catch (RapidsnarkError e) {
-      promise.reject(String.valueOf(e.getCode()), e.getMessage());
+    } catch (e: WitnesscalcError) {
+      promise.reject(e.code.toString(), e.message);
     }
-
-    promise.resolve(a * b)
   }
 
   companion object {

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
+        minSdkVersion = 24
         compileSdkVersion = 34
         targetSdkVersion = 34
         ndkVersion = "26.1.10909125"