Merge branch 'hotfix/v2.9.0-beta.2'

android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:3.1.3'
+ classpath 'com.android.tools.build:gradle:3.1.4'
  }
 }
 
@@ -34,7 +34,7 @@ android {
 
  defaultConfig {
  minSdkVersion 16
- targetSdkVersion 22
+ targetSdkVersion 27
  }
 
  lintOptions {
@@ -45,5 +45,5 @@ android {
 
 dependencies {
  implementation 'com.facebook.react:react-native:+'
- api 'it.near.sdk:nearit:2.9.4'
+ api 'it.near.sdk:nearit:2.9.5'
 }

android/src/main/java/it/near/sdk/reactnative/rnnearitsdk/RNNearItModule.java

@@ -175,8 +175,8 @@ private Map<String, Object> getEventContentConstants() {
  private Map<String, Object> getStatusConstants() {
  return Collections.unmodifiableMap(new HashMap<String, Object>() {
  {
- put("notified", Recipe.RECEIVED);
- put("engaged", Recipe.OPENED);
+ put("received", Recipe.RECEIVED);
+ put("opened", Recipe.OPENED);
  }
  });
  }

index.d.ts

@@ -26,8 +26,8 @@ declare module 'react-native-nearit' {
  }
 
  interface NearItStatuses {
- notified: string
- engaged: string
+ received: string
+ opened: string
  }
 
  interface NearItEvent {

index.js

@@ -1,9 +1,11 @@
 /*
  * Copyright (c) 2017 Mattia Panzeri <[email protected]>
+ * Latest changes by Federico Boschini <[email protected]>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 export { NearItManager as default, constants as NearItConstants } from './lib/NearItManager'
+export { NearITPermissions } from './lib/permissions'

ios/Permissions/RCTConvert+RNNPermissionStatus.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018 Federico Boschini <[email protected]>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#if __has_include(<React/RCTConvert.h>)
+ #import <React/RCTConvert.h>
+#elif __has_include("React/RCTConvert.h")
+ #import "React/RCTConvert.h"
+#else
+ #import "RCTConvert.h"
+#endif
+
+static NSString* RNNStatusNeverAsked = @"never_asked";
+static NSString* RNNStatusDenied = @"denied";
+static NSString* RNNStatusGrantedAlways = @"always";
+static NSString* RNNStatusGrantedWhenInUse = @"when_in_use";
+
+typedef NS_ENUM(NSInteger, RNNPermissionType) {
+ RNNPermissionTypeUnknown,
+ RNNPermissionTypeLocation,
+ RNNPermissionTypeNotification
+};
+
+@interface RCTConvert (RNNPermissionStatus)
+
+@end

ios/Permissions/RCTConvert+RNNPermissionStatus.m

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Federico Boschini <[email protected]>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#import "RCTConvert+RNNPermissionStatus.h"
+
+@implementation RCTConvert (RNNPermissionStatus)
+
+RCT_ENUM_CONVERTER(RNNPermissionType, (@{ @"location" : @(RNNPermissionTypeLocation),
+ @"notification" : @(RNNPermissionTypeNotification)
+ }),
+ RNNPermissionTypeUnknown, integerValue)
+
+@end

ios/Permissions/RNNLocationPermission.h

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2018 Federico Boschini <[email protected]>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#import <Foundation/Foundation.h>
+#import "RCTConvert+RNNPermissionStatus.h"
+
+@interface RNNLocationPermission : NSObject
+
++ (NSString *)getStatus;
+- (void)requestWithCompletionHandler:(void (^)(NSString *))completionHandler;
+
+@end

ios/Permissions/RNNLocationPermission.m

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2018 Federico Boschini <[email protected]>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#import "RNNLocationPermission.h"
+#import "RCTConvert+RNNPermissionStatus.h"
+#import <CoreLocation/CoreLocation.h>
+
+@interface RNNLocationPermission() <CLLocationManagerDelegate>
+@property (strong, nonatomic) CLLocationManager* locationManager;
+@property (copy) void (^completionHandler)(NSString *);
+@end
+
+@implementation RNNLocationPermission
+
++ (NSString *)getStatus {
+ int status = [CLLocationManager authorizationStatus];
+ switch (status) {
+ case kCLAuthorizationStatusAuthorizedAlways:
+ return RNNStatusGrantedAlways;
+ case kCLAuthorizationStatusAuthorizedWhenInUse:
+ return RNNStatusGrantedWhenInUse;
+ case kCLAuthorizationStatusNotDetermined:
+ return RNNStatusNeverAsked;
+ default:
+ return RNNStatusDenied;
+ }
+}
+
+- (void)requestWithCompletionHandler:(void (^)(NSString *))completionHandler {
+ NSString *status = [self.class getStatus];
+ if ([status isEqualToString:RNNStatusNeverAsked]) {
+ self.completionHandler = completionHandler;
+
+ if (self.locationManager == nil) {
+ self.locationManager = [[CLLocationManager alloc] init];
+ self.locationManager.delegate = self;
+ }
+
+ [self.locationManager requestAlwaysAuthorization];
+ } else if ([status isEqualToString:RNNStatusDenied]) {
+ if (@(UIApplicationOpenSettingsURLString != nil)) {
+
+ NSNotificationCenter * __weak center = [NSNotificationCenter defaultCenter];
+ id __block token = [center addObserverForName:UIApplicationDidBecomeActiveNotification
+ object:nil
+ queue:nil
+ usingBlock:^(NSNotification *note) {
+ [center removeObserver:token];
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ completionHandler(RNNLocationPermission.getStatus);
+ });
+ }];
+
+ NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
+ [[UIApplication sharedApplication] openURL:url];
+ } else {
+ NSLog(@"E_OPEN_SETTINGS_ERROR: Can't open app settings");
+ completionHandler(status);
+ }
+ } else {
+ completionHandler(status);
+ }
+}
+
+-(void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status {
+ if (status != kCLAuthorizationStatusNotDetermined) {
+ if (self.locationManager) {
+ self.locationManager.delegate = nil;
+ self.locationManager = nil;
+ }
+
+ if (self.completionHandler) {
+ //for some reason, checking permission right away returns denied. need to wait a tiny bit
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ self.completionHandler([RNNLocationPermission getStatus]);
+ self.completionHandler = nil;
+ });
+ }
+ }
+}
+
+@end

ios/Permissions/RNNNotificationPermission.h

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2018 Federico Boschini <[email protected]>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#import <Foundation/Foundation.h>
+#import "RCTConvert+RNNPermissionStatus.h"
+
+@interface RNNNotificationPermission : NSObject
+
++ (NSString *)getStatus;
+- (void)requestWithCompletionHandler:(void (^)(NSString*))completionHandler;
+
+@end