Browse Source

Merge pull request #64 from Kottidev/master

Fixed compatibility with React Native 0.40.0
Yonah Forst 7 years ago
parent
commit
1aa1035044

+ 1
- 1
RCTConvert+RNPStatus.h View File

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

+ 1
- 1
ReactNativePermissions.h View File

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

+ 3
- 3
ReactNativePermissions.m View File

10
 
10
 
11
 #import "ReactNativePermissions.h"
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
 #import "RNPLocation.h"
17
 #import "RNPLocation.h"
18
 #import "RNPBluetooth.h"
18
 #import "RNPBluetooth.h"

+ 2
- 1
android/src/main/java/com/joshblour/reactnativepermissions/ReactNativePermissionsModule.java View File

93
         // NOOP
93
         // NOOP
94
       }
94
       }
95
     };
95
     };
96
-    mPermissionsModule.requestPermission(permission, resolve, reject);
96
+    
97
+    mPermissionsModule.requestPermission(permission, new PromiseImpl(resolve, reject));
97
   }
98
   }
98
 
99
 
99
 
100