fix conflicts

Author: dinuchiriac

example/README.md

@@ -1,16 +1,9 @@
-# chirp_flutter_example
+# Chirp Flutter Example
 
-Demonstrates how to use the chirp_flutter plugin.
+Demonstrates how to use the Chirp Flutter plugin.
 
 ## Getting Started
 
-This project is a starting point for a Flutter application.
+This project is a starting point for a Flutter application using Chirp.
 
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
-
-For help getting started with Flutter, view our
-[online documentation](https://flutter.dev/docs), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+- [Example Code](https://github.com/chirp/chirp-flutter/tree/master/example)

example/lib/main.dart

@@ -38,11 +38,6 @@ class _ChirpAppState extends State<ChirpApp> with WidgetsBindingObserver {
     });
   }
 
-  void setErrorCode(int errorCode) async {
-    var errorMessage = await ChirpSDK.errorCodeToString(errorCode);
-    setErrorMessage(errorMessage);
-  }
-
   Future<void> _initChirp() async {
     try {
       // Init ChirpSDK
@@ -102,11 +97,7 @@ class _ChirpAppState extends State<ChirpApp> with WidgetsBindingObserver {
     try {
       Uint8List payload = await ChirpSDK.randomPayload();
       setPayload(payload);
-      var errorCode = await ChirpSDK.send(payload);
-      if (errorCode > 0) {
-        setErrorCode(errorCode);
-        return;
-      }
+      await ChirpSDK.send(payload);
     } catch (err) {
       setErrorMessage("Error sending random payload: ${err.message};");
     }

ios/Classes/ChirpFlutterPlugin.m

@@ -56,7 +56,7 @@ - (BOOL)isInitialised:(FlutterMethodCall*)call result:(FlutterResult)result {
 - (void)handleError:(FlutterMethodCall*)call result:(FlutterResult)result withError:(NSError *)error {
   if (error) {
     result([FlutterError errorWithCode:[NSString stringWithFormat:@"%ld", (long)error.code]
-                               message:error.description
+                               message:error.localizedDescription
                                details:nil]);
   } else {
     result(nil);
@@ -140,7 +140,7 @@ - (void)setConfig:(FlutterMethodCall*)call result:(FlutterResult)result {
   NSError *error = [self.chirp setConfig:config];
   if (error) {
     result([FlutterError errorWithCode:[NSString stringWithFormat:@"%ld", (long)error.code]
-                               message:error.description
+                               message:error.localizedDescription
                                details:nil]);
   } else {
     [self setCallbacks];
@@ -170,8 +170,7 @@ - (void)send:(FlutterMethodCall*)call result:(FlutterResult)result {
 - (void)randomPayload:(FlutterMethodCall*)call result:(FlutterResult)result {
   if (![self isInitialised:call result:result]) return;
   NSData *payload = [self.chirp randomPayloadWithRandomLength];
-  NSError *error = [self.chirp send:payload];
-  [self handleError:call result:result withError:error];
+  result([FlutterStandardTypedData typedDataWithBytes:payload]);
 }
 
 - (void)getState:(FlutterMethodCall*)call result:(FlutterResult)result {