Merge pull request #19 from farhoud/main

update go-fula
functionland · Jul 7, 2022 · cdde56b · cdde56b
2 parents 4dcee08 + 3cc98a3
commit cdde56b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -59,6 +59,6 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.github.functionland:go-fula:0.4.2' // From jitpack.io
+    implementation 'com.github.functionland:go-fula:release-v0.4.5-SNAPSHOT' // From jitpack.io
     // implementation files('fula.aar')
 }
diff --git a/android/src/main/java/land/fx/FileRef.java b/android/src/main/java/land/fx/FileRef.java
@@ -6,18 +6,4 @@ public class FileRef {
     public byte[] iv;
     public byte[] key;
     public String id;
-
-    // public FileRef(msg byte[]){
-    //     int lenIv = unsigned(msg[msg.length-3]);
-    //     int lenKey = unsigned(msg[msg.length-2]);
-    //     int lenId = unsigned(msg[msg.length-1]);
-
-    //     iv = Arrays.copyOfRange(msg, 0, lenIv);
-    //     key = Arrays.copyOfRange(msg, lenIv, lenIv+lenKey);
-    //     id = new String(Arrays.copyOfRange(msg, lenIv+lenKey, lenId));
-    // }
-
-    // public static int unsigned(byte x) {
-    //     return int(x & "0xFF");
-    // }
 }
diff --git a/android/src/main/java/land/fx/FulaModule.java b/android/src/main/java/land/fx/FulaModule.java
@@ -50,9 +50,9 @@ public FulaModule(ReactApplicationContext reactContext) throws Exception{
             success = storeDir.mkdirs();
         }
         if(success){
-            Log.d(NAME,"Store folder created");
+            Log.d(NAME,"store folder created");
         }else{
-            Log.d(NAME,"Can not create folder");
+            Log.d(NAME,"can not create folder");
         }
         this.fula = Mobile.newFula();
     }
@@ -126,11 +126,11 @@ public void receiveFile(String fileId, String fileName, boolean includeBS64,Prom
             String filePath = storeDirPath + fileName;
             fula.receiveFile(fileId, filePath);
             Uri uri = Uri.fromFile(new File(filePath));
-            Log.d(NAME,"File Downloaded");
+            Log.d(NAME,"file downloaded");
             WritableMap map;
             if(includeBS64){
               String bs64 = getBase64StringFromFile(filePath);
-              Log.d(NAME,"File Transform to bs64");
+              Log.d(NAME,"file transform to bs64");
               map = makeResponseMap(uri.toString(), bs64);
             }else{
               map = makeResponseMap(uri.toString(), "");
@@ -149,11 +149,11 @@ public void receiveDecryptFile(String fileRef, String fileName, boolean includeB
             String filePath = storeDirPath + fileName;
             fula.receiveDecryptFile(fileRef, filePath);
             Uri uri = Uri.fromFile(new File(filePath));
-            Log.d(NAME,"File Downloaded");
+            Log.d(NAME,"file downloaded");
             WritableMap map;
             if(includeBS64){
               String bs64 = getBase64StringFromFile(filePath);
-              Log.d(NAME,"File Transform to bs64");
+              Log.d(NAME,"file transform to bs64");
               map = makeResponseMap(uri.toString(), bs64);
             }else{
               map = makeResponseMap(uri.toString(), "");

diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -23,7 +23,7 @@ import { Header } from 'react-native/Libraries/NewAppScreen';
 const App = () => {
   const isDarkMode = useColorScheme() === 'dark';
   const [boxAddr, setBoxAddr] = useState(
-    '/ip4/192.168.1.10/tcp/4002/p2p/12D3KooWGrkcHUBzAAuYhMRxBreCgofKKDhLgR84FbawknJZHwK1'
+    '/ip4/54.91.64.211/tcp/4002/p2p/12D3KooWEYPfYC8B89xQMLA1fz4VB5J6EUS6J1SPiFko6QUihoyQ'
   );
   const [connectionStatus, setConnectionStatus] = useState(false);
   const [connecting, setConnecting] = useState(false);