Fixes

.gitattributes

@@ -1 +1,3 @@
-*.pbxproj -text
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

.prettierrc.js

@@ -4,4 +4,5 @@ module.exports = {
   singleQuote: true,
   trailingComma: 'all',
   tabWidth: 4,
+  arrowParens: 'avoid',
 };

_editorconfig

@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf

android/app/build.gradle

@@ -122,6 +122,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 android {
+    ndkVersion rootProject.ext.ndkVersion
+
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
@@ -134,8 +136,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         missingDimensionStrategy 'react-native-camera', 'general'
-        versionCode 6
-        versionName "1.8"
+        versionCode 59
+        versionName "1.11"
     }
     splits {
         abi {
@@ -155,7 +157,7 @@ android {
         release {
             storeFile file('release.keystore')
             storePassword ''
-            keyAlias 'Galleon-Mobile-Release-Key'
+            keyAlias ''
             keyPassword ''
         }
     }
@@ -182,11 +184,12 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
+            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
-                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+                        defaultConfig.versionCode * 1000 + versionCodes.get(abi)
             }
 
         }

android/app/src/debug/AndroidManifest.xml

@@ -4,5 +4,10 @@
 
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
 
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
 </manifest>

android/app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:textColor">#000000</item>
 

android/build.gradle

@@ -2,17 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.2"
-        minSdkVersion = 24
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        buildToolsVersion = "30.0.2"
+        ndkVersion = "22.1.7171670"
+        minSdkVersion = 29
+        compileSdkVersion = 31
+        targetSdkVersion = 30
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:4.0.1')
+        classpath('com.android.tools.build:gradle:4.2.2')
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/gradle.properties

@@ -25,3 +25,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 org.gradle.configureondemand=false
+org.gradle.jvmargs=-Xmx4608m
+
+org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.12.jdk/Contents/Home

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Jul 03 11:04:57 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

android/gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

ios/BeaconBridge.m

@@ -6,6 +6,7 @@
    RCT_EXTERN_METHOD(startBeacon)
    RCT_EXTERN_METHOD(addPeer:(NSString *)peerId name:(NSString *)name publicKey:(NSString *)publicKey relayServer:(NSString *)relayServer version:(NSString *)version)
    RCT_EXTERN_METHOD(sendResponse:(NSString *)payload)
+   RCT_EXTERN_METHOD(sendError:(NSString *)errorType)
    RCT_EXTERN_METHOD(removePermissions)
    RCT_EXTERN_METHOD(removePeers)
    RCT_EXTERN_METHOD(removeAppMetadata)

ios/BeaconBridge.swift

@@ -130,6 +130,24 @@
       }
     }
 
+  @objc
+  func sendError(_ errorType: String) {
+    guard let request = awaitingRequest else {
+      return
+    }
+
+    let response = Beacon.Response.Error(from: request, errorType: Beacon.ErrorType(rawValue: errorType)!)
+    beaconClient?.respond(with: .error(response)) { result in
+      switch result {
+        case .success(_):
+          print("Sent the response")
+        case let .failure(error):
+          print("Failed to send the response, got error: \(error)")
+          self.sendEvent(withName: "onError", body: ["Failed to send the response, got error: \(error)"])
+      }
+    }
+  }
+
     @objc
     func sendResponse(_ payload: String) {
         guard let request = awaitingRequest else {
@@ -154,22 +172,28 @@
             }
           break
         case let .operation(operation):
-  //        let response = Beacon.Response.Operation(from: operation, transactionHash: payload)
-  //        print(response)
-          // TODO
+          let response = Beacon.Response.Operation(from: operation, transactionHash: payload)
+          beaconClient?.respond(with: .operation(response)) { result in
+            switch result {
+            case .success(_):
+              print("Sent the response")
+            case let .failure(error):
+              print("Failed to send the response, got error: \(error)")
+              self.sendEvent(withName: "onError", body: ["Failed to send the response, got error: \(error)"])
+            }
+        }
           break
         case let .signPayload(signPayload):
-  //        let response = Beacon.Response.SignPayload(from: signPayload, signature: payload)
-  //        print(response)
+          // let response = Beacon.Response.SignPayload(from: signPayload, signature: payload)
+          // print(response)
           // TODO
           break
         case let .broadcast(broadcast):
-  //        let response = Beacon.Response.Broadcast(from: broadcast, transactionHash: payload)
-  //        print(response)
+          // let response = Beacon.Response.Broadcast(from: broadcast, transactionHash: payload)
+          // print(response)
           // TODO
           break
         default:
-            // TODO
             return
         }
     }

ios/Podfile

@@ -13,3 +13,11 @@ target 'honeybadger' do
     # Pods for testing
   end
 end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+    config.build_settings["ONLY_ACTIVE_ARCH"] = "NO"
+    end
+  end
+end