Update to use Chirp iOS 3.6.0

Author: joextodd

.gitignore

@@ -46,4 +46,4 @@ xcuserdata/
 *.aar
 *.framework
 
-example/ios/Flutter/flutter_export_environment.sh'
+flutter_export_environment.sh

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Chirp SDK Flutter
 
-## 0.4.0 - beta
+## 1.0.0 - beta
+
+- Update error handling to use `try/catch`
+- Fix bug so callbacks are on the main thread
+- Upgrade to Android v3.10.1
+- Upgrade to iOS v3.6.0
+
+## 0.4.0 - 23/07/19
 
 - Upgrade to Android v3.9.5
 - Upgrade to iOS v3.5.2

README.md

@@ -1,4 +1,4 @@
-# ChirpSDK (Beta)
+# ChirpSDK
 
 Send data with sound.
 
@@ -9,9 +9,14 @@ Sign up at the Chirp [Developer Hub](https://developers.chirp.io/sign-up)
 Copy and paste your Chirp app key, secret and chosen configuration into the
 [example application](https://github.com/chirp/chirp-flutter/tree/master/example)
 
-    await ChirpSDK.init(_appKey, _appSecret);
-    await ChirpSDK.setConfig(_appConfig);
-    await ChirpSDK.start();
+    try {
+        await ChirpSDK.init(_appKey, _appSecret);
+        await ChirpSDK.setConfig(_appConfig);
+        await ChirpSDK.start();
+    } catch(err) {
+        errorMessage = "ChirpError: ${err.message}"
+    }
+
 
 Please see the [example](https://github.com/chirp/chirp-flutter/tree/master/example)
 for a more detailed run through of how to use the Chirp SDK.
@@ -35,12 +40,17 @@ Chirp SDKs accept data as an array of bytes, creating a versatile interface for
 However in most cases, Chirp is used to send a short identifier. Here is an example of how to send
 a short string with the Chirp SDK.
 
-    String identifier = "hello";
-    var payload = new Uint8List.fromList(identifier.codeUnits);
-    await ChirpSDK.send(payload);
+    try {
+        String identifier = "hello";
+        var payload = new Uint8List.fromList(identifier.codeUnits);
+        await ChirpSDK.send(payload);
+    } catch(err) {
+        errorMessage = "ChirpError: ${err.message}"
+    }
+
 
 It is worth noting here that the send method will not block until the entire payload has been sent,
-but just as long as it takes to pass the message to the SDK. Please use the onSent callback for this
+but just as long as it takes to pass the message to the SDK. Please use the `onSent` callback for this
 purpose.
 
 ## Receiving

android/src/main/kotlin/io/chirp/chirpsdk/ChirpsdkPlugin.kt

@@ -24,7 +24,6 @@ class ChirpsdkPlugin(private val activity: Activity) : MethodCallHandler {
   val sentStreamHandler = SentStreamHandler()
   val receivingStreamHandler = ReceivingStreamHandler()
   val receivedStreamHandler = ReceivedStreamHandler()
-  val errorStreamHandler = ErrorStreamHandler()
 
   lateinit var chirpSDK: ChirpSDK
 
@@ -45,8 +44,6 @@ class ChirpsdkPlugin(private val activity: Activity) : MethodCallHandler {
       receivingChannel.setStreamHandler(instance.receivingStreamHandler)
       val receivedChannel = EventChannel(registrar.messenger(), "chirp.io/events/received")
       receivedChannel.setStreamHandler(instance.receivedStreamHandler)
-      val errorsChannel = EventChannel(registrar.messenger(), "chirp.io/events/errors")
-      errorsChannel.setStreamHandler(instance.errorStreamHandler)
     }
   }
 
@@ -64,7 +61,11 @@ class ChirpsdkPlugin(private val activity: Activity) : MethodCallHandler {
     val appKey = arguments["key"] as String
     val appSecret = arguments["secret"] as String
     chirpSDK = ChirpSDK(activity, appKey, appSecret)
-    result.success(ChirpErrorCode.CHIRP_SDK_OK.code)
+    if (chirpSDK) {
+      result.success(ChirpErrorCode.CHIRP_SDK_OK.code)
+    } else {
+      result.error(-1, "Failed to initialise ChirpSDK", null)
+    }
   }
 
   private fun version(call: MethodCall, result: Result) {
@@ -133,8 +134,8 @@ class ChirpsdkPlugin(private val activity: Activity) : MethodCallHandler {
       result.error(error.code.toString(), error.message, null)
       return
     }
-    result.success(error.code)
     setCallbacks()
+    result.success(error.code)
   }
 
   private fun start(call: MethodCall, result: Result) {
@@ -312,20 +313,3 @@ class ReceivedStreamHandler : StreamHandler {
     eventSink = null
   }
 }
-
-class ErrorStreamHandler : StreamHandler {
-  private var eventSink: EventSink? = null
-
-  override fun onListen(arguments: Any?, sink: EventSink) {
-    eventSink = sink
-  }
-
-  fun send(code: Int, message: String) {
-    eventSink?.success(mapOf("code" to code,
-                             "message" to message))
-  }
-
-  override fun onCancel(arguments: Any?) {
-    eventSink = null
-  }
-}