Merge pull request #4 from TheBubblesCompany/harmonize-ios-android

Harmonize iOS and Android.

Author: karimK3

android/src/main/AndroidManifest.xml

@@ -1,6 +1,27 @@
+<manifest
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.reactlibrary">
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactlibrary">
+
+  <!-- /!\ = Dangerous permission, need Runtime Permission with Android 6.0+ -->
+
+
+  <!-- BLE | Start -->
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>  <!-- BL use need this with Android 6.0+ --> <!-- /!\ -->
+  <uses-permission android:name="android.permission.BLUETOOTH"/> <!-- BL use need this -->
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> <!-- BL scan need this -->
+  <!-- BLE | End -->
+
+
+  <!-- Internet | Start -->
+  <uses-permission android:name="android.permission.INTERNET"/> <!-- Need this to call WebServices -->
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <!-- Internet | End -->
+
+
+  <!-- Get IMEI | Start -->
+  <uses-permission android:name="android.permission.READ_PHONE_STATE"/> <!-- Need this to access the IMEI --> <!-- /!\ -->
+  <!-- Get IMEI | End -->
 
 </manifest>
 

android/src/main/java/com/reactlibrary/RNBubblesReactBridgeModule.java

@@ -8,7 +8,7 @@
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.support.v4.app.ActivityCompat;
-import com.facebook.react.bridge.Arguments;
+import android.util.Log;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -41,7 +41,7 @@
 
 public class RNBubblesReactBridgeModule extends ReactContextBaseJavaModule {
 
-  private static final String TAG = "BubblesReactBridge";
+  private static final String TAG = "RNBubblesReactBridge";
 
   private static String DEFAULT_SUCCESS_HANDLER_RETURN = null;
   private static String DEFAULT_FAILED_HANDLER_RETURN = null;
@@ -57,11 +57,13 @@ public class RNBubblesReactBridgeModule extends ReactContextBaseJavaModule {
     }
   }
 
-  private static final int CALLBACK_CODE_JSON_EXCEPTION = 0;
-  private static final int CALLBACK_CODE_UNKNOWN_SERVICE = 1;
-  private static final int CALLBACK_CODE_BRIDGE_VERSION = 2;
-  private static final int CALLBACK_CODE_BLUETOOTH_ERROR = 3;
-  private static final int CALLBACK_CODE_BLUETOOTH_ON = 4;
+  private static final String CALLBACK_CODE_JSON_EXCEPTION = "JSON_EXCEPTION";
+  private static final String CALLBACK_CODE_UNKNOWN_SERVICE = "UNKNOWN_SERVICE";
+  private static final String CALLBACK_CODE_BRIDGE_VERSION = "UNKNOWN_BRIDGE_VERSION";
+  private static final String CALLBACK_CODE_BLUETOOTH_ERROR = "BLUETOOTH_ERROR";
+  private static final String CALLBACK_CODE_BLUETOOTH_ON = "BLUETOOTH_ON";
+  private static final String CALLBACK_CODE_PERMISSION_REQUIRED = "PERMISSION_REQUIRED";
+  private static final String CALLBACK_CODE_INTERNAL_ERROR = "INTERNAL_ERROR";
 
   private final ReactApplicationContext reactContext;
 
@@ -79,7 +81,7 @@ public RNBubblesReactBridgeModule(ReactApplicationContext reactContext) {
 
   @Override
   public String getName() {
-    return "BubblesReactBridge";
+    return "RNBubblesReactBridge";
   }
 
   ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -94,6 +96,7 @@ public void reactIsUpToDate() {
   @ReactMethod
   public void log(String data) {
     ML.e(TAG, data);
+    Log.e(TAG, data);
   }
 
   @ReactMethod
@@ -160,6 +163,71 @@ public void getLocalizationPermissionState(Callback callback) {
     }
   }
 
+  @ReactMethod
+  public void getDeviceId(Callback callback) {
+    String deviceID = MyBubblesSDK.mInstance.deviceID;
+    if (deviceID != null) {
+      try {
+        JSONObject result = new JSONObject();
+        result.put("deviceId", deviceID);
+        callback.invoke(null, result.toString());
+      } catch (JSONException e) {
+        callback.invoke(createRejectCallback(CALLBACK_CODE_JSON_EXCEPTION, e.getMessage()), null);
+      }
+    } else {
+      callback.invoke(createRejectCallback(CALLBACK_CODE_INTERNAL_ERROR, "Is SDK init?"), null);
+    }
+  }
+
+  @ReactMethod
+  public void getApplicationId(Callback callback) {
+    String apiKey = MyBubblesSDK.mInstance.apiKey;
+    if (apiKey != null) {
+      try {
+        JSONObject result = new JSONObject();
+        result.put("applicationId", apiKey);
+        callback.invoke(null, result.toString());
+      } catch (JSONException e) {
+        callback.invoke(createRejectCallback(CALLBACK_CODE_JSON_EXCEPTION, e.getMessage()), null);
+      }
+    } else {
+      callback.invoke(createRejectCallback(CALLBACK_CODE_INTERNAL_ERROR, "Is SDK init?"), null);
+    }
+  }
+
+  @ReactMethod
+  public void getUserId(Callback callback) {
+    String userID = MyBubblesSDK.mInstance.userID;
+    if (userID != null) {
+      try {
+        JSONObject result = new JSONObject();
+        result.put("userId", userID);
+        callback.invoke(null, result.toString());
+      } catch (JSONException e) {
+        callback.invoke(createRejectCallback(CALLBACK_CODE_JSON_EXCEPTION, e.getMessage()), null);
+      }
+    } else {
+      callback.invoke(createRejectCallback(CALLBACK_CODE_INTERNAL_ERROR, "Is SDK init?"), null);
+    }
+  }
+
+  @ReactMethod
+  public void getUniqueDeviceId(Callback callback) {
+    String uniqueID = MyBubblesSDK.mInstance.uniqueID;
+    if (uniqueID != null) {
+      try {
+        JSONObject result = new JSONObject();
+        result.put("isAuthorized", true);
+        result.put("uniqueDeviceId", uniqueID);
+        callback.invoke(null, result.toString());
+      } catch (JSONException e) {
+        callback.invoke(createRejectCallback(CALLBACK_CODE_JSON_EXCEPTION, e.getMessage()), null);
+      }
+    } else {
+      callback.invoke(createRejectCallback(CALLBACK_CODE_PERMISSION_REQUIRED, "Permission required"), null);
+    }
+  }
+
   @ReactMethod
   public void askForUniqueIdPermission() {
     log("askForUniqueIdPermission");
@@ -359,9 +427,14 @@ public void update(Observable observable, Object data) {
         try {
 
           log("onSendUniqueId");
+          boolean isAuthorized = (Boolean) data;
 
           JSONObject result = new JSONObject();
-          result.put("isAuthorized", data);
+          result.put("isAuthorized", isAuthorized);
+          if (isAuthorized) {
+            result.put("uniqueDeviceId", MyBubblesSDK.mInstance.uniqueID);
+          }
+
           sendEvent("onSendUniqueId", result.toString());
 
         } catch (JSONException e) {
@@ -458,7 +531,7 @@ private String createFormattableFailedReturn(final String message) {
     return null;
   }
 
-  private WritableMap createRejectCallback(int code, String message) {
+  private WritableMap createRejectCallback(String code, String message) {
     ErrorObject errorObject = new ErrorObject(code, message);
     WritableMap errorMap = null;
     try {
@@ -471,10 +544,10 @@ private WritableMap createRejectCallback(int code, String message) {
 
   private class ErrorObject {
 
-    private int code;
+    private String code;
     private String message;
 
-    public ErrorObject(final int code, final String message) {
+    public ErrorObject(final String code, final String message) {
       this.code = code;
       this.message = message;
     }

index.js

@@ -10,7 +10,10 @@ function moduleSelector() {
   }
   return BubblesReactBridgeIOS;
 }
-
 const BubblesReactBridge = moduleSelector();
+BubblesReactBridge.errorCode = {
+  PERMISSION_REJECTED: "PERMISSION_REJECTED",
+  PERMISSION_REQUIRED: "PERMISSION_REQUIRED",
+}
 
 export default BubblesReactBridge;

ios/Frameworks/Bubbles.framework/Bubbles

@@ -0,0 +1,64 @@
+//
+//  DataAccess.h
+//  BubblesTwo
+//
+//  Created by Pierre RACINE on 30/03/2016.
+//  Copyright © 2016 Absolutlabs. All rights reserved.
+//
+#import <UIKit/UIKit.h>
+#import <CoreLocation/CoreLocation.h>
+
+#define DATA  [DataAccess dataAccess]
+
+@class CLLocation;
+
+@interface DataAccess : NSObject
+
++ (DataAccess *) dataAccess;
+
+
+@property BOOL debug;
+@property (nonatomic, strong) CLLocationManager * locationManager;
+@property (nonatomic, strong) NSString * latitude;
+@property (nonatomic, strong) NSString * longitude;
+
+//Header Parameters
+
+@property (nonatomic) NSInteger apiVersion;
+@property (nonatomic, strong) NSString * apiKey;
+@property (nonatomic, strong) NSString * deviceId;
+@property (nonatomic, strong) NSString * userId;
+@property (nonatomic, strong) NSString * uniqueId;
+@property (nonatomic, strong) NSString * applicationLanguage;
+
+@property (nonatomic) BOOL bluetoothEnable;
+
+
+#pragma mark - Request
+
+- (void) requestDeviceId;
+
+- (void) getAPIkey:(NSString*)apiKey andUserId:(NSString*)userID;
+
+- (void) requestServices;
+
+- (void) confirmLocalization;
+- (void) confirmNotification;
+
+
+-(void)requestPOSTWithUrl:(NSString *)stringURL andDictionaryPost:(NSDictionary *)dictionaryPost
+                  success:(void (^)(NSURLSessionDataTask * sessionDataTask, id response))success
+                  failure:(void (^)(NSURLSessionDataTask * sessionDataTask, NSString *error))failure;
+
+-(void)requestGETWithUrl:(NSString *)stringURL andDictionaryPost:(NSDictionary *)dictionaryPost
+                 success:(void (^)(NSURLSessionDataTask * sessionDataTask, id response))success
+                 failure:(void (^)(NSURLSessionDataTask * sessionDataTask, NSString *error))failure;
+
+-(void)requestPUTWithUrl:(NSString *)stringURL andDictionaryPost:(NSDictionary *)dictionaryPost
+                 success:(void (^)(NSURLSessionDataTask * sessionDataTask, id response))success
+                 failure:(void (^)(NSURLSessionDataTask * sessionDataTask, NSString *error))failure;
+
+
+
+
+@end