浏览代码

Merge branch 'master' into master

Yonah Forst 7 年前
父节点
当前提交
f500914cc2

+ 1
- 1
RCTConvert+RNPStatus.h 查看文件

@@ -6,7 +6,7 @@
6 6
 //  Copyright © 2016 Yonah Forst. All rights reserved.
7 7
 //
8 8
 
9
-#import "RCTConvert.h"
9
+#import <React/RCTConvert.h>
10 10
 
11 11
 static NSString* RNPStatusUndetermined = @"undetermined";
12 12
 static NSString* RNPStatusDenied = @"denied";

+ 1
- 1
ReactNativePermissions.h 查看文件

@@ -5,7 +5,7 @@
5 5
 //  Created by Yonah Forst on 18/02/16.
6 6
 //  Copyright © 2016 Yonah Forst. All rights reserved.
7 7
 //
8
-#import "RCTBridgeModule.h"
8
+#import <React/RCTBridgeModule.h>
9 9
 
10 10
 #import <Foundation/Foundation.h>
11 11
 

+ 3
- 3
ReactNativePermissions.m 查看文件

@@ -10,9 +10,9 @@
10 10
 
11 11
 #import "ReactNativePermissions.h"
12 12
 
13
-#import "RCTBridge.h"
14
-#import "RCTConvert.h"
15
-#import "RCTEventDispatcher.h"
13
+#import <React/RCTBridge.h>
14
+#import <React/RCTConvert.h>
15
+#import <React/RCTEventDispatcher.h>
16 16
 
17 17
 #import "RNPLocation.h"
18 18
 #import "RNPBluetooth.h"

+ 1
- 0
android/src/main/java/com/joshblour/reactnativepermissions/ReactNativePermissionsModule.java 查看文件

@@ -93,6 +93,7 @@ public class ReactNativePermissionsModule extends ReactContextBaseJavaModule {
93 93
         // NOOP
94 94
       }
95 95
     };
96
+    
96 97
     mPermissionsModule.requestPermission(permission, new PromiseImpl(resolve, reject));
97 98
   }
98 99