Skip to content

Commit e656bee

Browse files
zoontekzoontek
committed
Cleanup indent
1 parent f4a9021 commit e656bee

File tree

14 files changed

+102
-138
lines changed

14 files changed

+102
-138
lines changed

‎RNPermissions.podspec‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,30 @@ Pod::Spec.new do |s|
1717
s.requires_arc = true
1818

1919
s.source = { :git => package["repository"]["url"], :tag => s.version }
20-
s.source_files = "ios/*.{h,m,mm}"
20+
s.source_files = "ios/*.{h,m,mm}"
2121

2222
if fabric_enabled
23-
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
23+
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
2424

25-
s.pod_target_xcconfig = {
25+
s.pod_target_xcconfig = {
2626
'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly"',
2727
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
2828
}
29-
s.platforms = { ios: '11.0', tvos: '11.0' }
30-
s.compiler_flags = folly_compiler_flags + ' -DRCT_NEW_ARCH_ENABLED'
31-
32-
s.dependency "React"
33-
s.dependency "React-RCTFabric" # This is for fabric component
34-
s.dependency "React-Codegen"
35-
s.dependency "RCT-Folly"
36-
s.dependency "RCTRequired"
37-
s.dependency "RCTTypeSafety"
38-
s.dependency "ReactCommon/turbomodule/core"
29+
30+
s.platforms = { ios: '11.0', tvos: '11.0' }
31+
s.compiler_flags = folly_compiler_flags + ' -DRCT_NEW_ARCH_ENABLED'
32+
33+
s.dependency "React"
34+
s.dependency "React-RCTFabric" # This is for fabric component
35+
s.dependency "React-Codegen"
36+
s.dependency "RCT-Folly"
37+
s.dependency "RCTRequired"
38+
s.dependency "RCTTypeSafety"
39+
s.dependency "ReactCommon/turbomodule/core"
3940
else
40-
s.platforms = { :ios => "9.0", :tvos => "9.0" }
41+
s.platforms = { :ios => "9.0", :tvos => "9.0" }
4142

42-
s.dependency "React-Core"
43+
s.dependency "React-Core"
4344
end
4445

4546
end

‎android/build.gradle‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ buildscript {
2020
apply plugin: "com.android.library"
2121

2222
def resolveReactNativeDirectory() {
23-
// monorepo workaround
24-
// react-native can be hoisted or in project's own node_modules
23+
// monorepo workaround (react-native can be hoisted or in project's own node_modules)
2524
def reactNativeFromProjectNodeModules = file("${rootProject.projectDir}/../node_modules/react-native")
2625
if (reactNativeFromProjectNodeModules.exists()) {
2726
return reactNativeFromProjectNodeModules
@@ -33,9 +32,9 @@ def resolveReactNativeDirectory() {
3332
}
3433

3534
throw new Exception(
36-
"[react-native-clipboard] Unable to resolve react-native location in " +
37-
"node_modules. You should add project extension property (in app/build.gradle) " +
38-
"`REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
35+
"[react-native-permissions] Unable to resolve react-native location in " +
36+
"node_modules. You should add project extension property (in app/build.gradle) " +
37+
"`REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
3938
)
4039
}
4140

@@ -60,7 +59,6 @@ if (isNewArchitectureEnabled()) {
6059
}
6160

6261
android {
63-
6462
// Used to override the NDK path/version on internal CI or by allowing
6563
// users to customize the NDK path/version from their root project (e.g. for M1 support)
6664
if (rootProject.hasProperty("ndkPath")) {
@@ -80,7 +78,6 @@ android {
8078
abortOnError false
8179
}
8280

83-
8481
sourceSets.main {
8582
java {
8683
if (!isNewArchitectureEnabled()) {

‎android/src/main/java/com/zoontek/rnpermissions/RNPermissionsModule.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ public void checkPermission(final String permission, final Promise promise) {
196196
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
197197
promise.resolve(context.checkPermission(permission, Process.myPid(), Process.myUid())
198198
== PackageManager.PERMISSION_GRANTED
199-
? GRANTED
200-
: BLOCKED);
199+
? GRANTED
200+
: BLOCKED);
201201
return;
202202
}
203203

@@ -214,6 +214,7 @@ public void shouldShowRequestPermissionRationale(final String permission, final
214214
promise.resolve(false);
215215
return;
216216
}
217+
217218
try {
218219
promise.resolve(
219220
getPermissionAwareActivity().shouldShowRequestPermissionRationale(permission));
@@ -307,7 +308,6 @@ public void requestMultiplePermissions(final ReadableArray permissions, final Pr
307308
final WritableMap output = new WritableNativeMap();
308309
final ArrayList<String> permissionsToCheck = new ArrayList<String>();
309310
int checkedPermissionsCount = 0;
310-
311311
Context context = getReactApplicationContext().getBaseContext();
312312

313313
for (int i = 0; i < permissions.size(); i++) {
@@ -418,6 +418,7 @@ public boolean onRequestPermissionsResult(int requestCode, String[] permissions,
418418

419419
private PermissionAwareActivity getPermissionAwareActivity() {
420420
Activity activity = getCurrentActivity();
421+
421422
if (activity == null) {
422423
throw new IllegalStateException(
423424
"Tried to use permissions API while not attached to an " + "Activity.");
@@ -426,6 +427,7 @@ private PermissionAwareActivity getPermissionAwareActivity() {
426427
"Tried to use permissions API but the host Activity doesn't"
427428
+ " implement PermissionAwareActivity.");
428429
}
430+
429431
return (PermissionAwareActivity) activity;
430432
}
431433
}

‎android/src/main/java/com/zoontek/rnpermissions/RNPermissionsPackage.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package com.zoontek.rnpermissions;
22

3-
import java.util.Collections;
4-
import java.util.HashMap;
5-
import java.util.List;
6-
import java.util.Map;
7-
83
import com.facebook.react.TurboReactPackage;
94
import com.facebook.react.ViewManagerOnDemandReactPackage;
105
import com.facebook.react.bridge.ModuleSpec;
@@ -17,6 +12,11 @@
1712
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
1813
import com.facebook.react.uimanager.ViewManager;
1914

15+
import java.util.Collections;
16+
import java.util.HashMap;
17+
import java.util.List;
18+
import java.util.Map;
19+
2020
import javax.annotation.Nonnull;
2121
import javax.annotation.Nullable;
2222

@@ -62,8 +62,7 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
6262
Class.forName("com.zoontek.rnpermissions.RNPermissionsPackage$$ReactModuleInfoProvider");
6363
return (ReactModuleInfoProvider) reactModuleInfoProviderClass.newInstance();
6464
} catch (ClassNotFoundException e) {
65-
// ReactModuleSpecProcessor does not run at build-time. Create this ReactModuleInfoProvider by
66-
// hand.
65+
// ReactModuleSpecProcessor does not run at build-time. Create this ReactModuleInfoProvider by hand.
6766
return new ReactModuleInfoProvider() {
6867
@Override
6968
public Map<String, ReactModuleInfo> getReactModuleInfos() {

‎example/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ PODS:
419419
- React-jsi (= 0.71.4)
420420
- React-logger (= 0.71.4)
421421
- React-perflogger (= 0.71.4)
422-
- RNPermissions (3.7.3):
422+
- RNPermissions (3.8.0):
423423
- React-Core
424424
- RNVectorIcons (9.2.0):
425425
- React-Core
@@ -634,7 +634,7 @@ SPEC CHECKSUMS:
634634
React-RCTVibration: ad17efcfb2fa8f6bfd8ac0cf48d96668b8b28e0b
635635
React-runtimeexecutor: 8fa50b38df6b992c76537993a2b0553d3b088004
636636
ReactCommon: b49a4b00ca6d181ff74b17c12b2d59ac4add0bde
637-
RNPermissions: 28159d74c6e6db06ad0378582727c41aee4903d0
637+
RNPermissions: 930f326a122d3e8efb5af00602e7ca8f2c7a0762
638638
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
639639
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
640640
Yoga: 79dd7410de6f8ad73a77c868d3d368843f0c93e0

‎ios/RNPermissionsHelper.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ @implementation RNPermissionsHelper
44

55
static NSString* SETTING_KEY = @"@RNPermissions:Requested";
66

7-
8-
97
+ (bool)isFlaggedAsRequested:(NSString * _Nonnull)handlerId {
108
NSArray<NSString *> *requested = [[NSUserDefaults standardUserDefaults] arrayForKey:SETTING_KEY];
119
return requested == nil ? false : [requested containsObject:handlerId];

‎ios/RNPermissionsModule.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
#else
44
#import <React/RCTBridge.h>
55
#endif
6+
67
#import <React/RCTConvert.h>
78
#import "RNPermissionsHelper.h"
89

910
@interface RCTConvert (RNPermission)
11+
1012
@end
1113

12-
@interface RNPermissionsModule : NSObject
1314
#ifdef RCT_NEW_ARCH_ENABLED
14-
<NativePermissionsModuleSpec>
15+
@interface RNPermissionsModule : NSObject<NativePermissionsModuleSpec>
1516
#else
16-
<RCTBridgeModule>
17+
@interface RNPermissionsModule : NSObject<RCTBridgeModule>
1718
#endif
1819

1920
@end

‎ios/RNPermissionsModule.mm‎

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -368,20 +368,18 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
368368

369369
RCT_EXPORT_METHOD(check:
370370
#ifdef RCT_NEW_ARCH_ENABLED
371-
(NSString *)
371+
(NSString *)permission
372372
#else
373-
(RNPermission)
373+
(RNPermission)permission
374374
#endif
375-
permission
376-
resolve:(RCTPromiseResolveBlock)resolve
377-
reject:(RCTPromiseRejectBlock)reject) {
378-
id<RNPermissionHandler> handler = [self handlerForPermission:
375+
resolve:(RCTPromiseResolveBlock)resolve
376+
reject:(RCTPromiseRejectBlock)reject) {
379377
#ifdef RCT_NEW_ARCH_ENABLED
380-
[RCTConvert RNPermission:permission]
378+
id<RNPermissionHandler> handler = [self handlerForPermission:[RCTConvert RNPermission:permission]];
381379
#else
382-
permission
380+
id<RNPermissionHandler> handler = [self handlerForPermission:permission];
383381
#endif
384-
];
382+
385383
NSString *lockId = [self lockHandler:handler];
386384

387385
[handler checkWithResolver:^(RNPermissionStatus status) {
@@ -395,20 +393,18 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
395393

396394
RCT_EXPORT_METHOD(request:
397395
#ifdef RCT_NEW_ARCH_ENABLED
398-
(NSString *)
396+
(NSString *)permission
397+
#else
398+
(RNPermission)permission
399+
#endif
400+
resolve:(RCTPromiseResolveBlock)resolve
401+
reject:(RCTPromiseRejectBlock)reject) {
402+
#ifdef RCT_NEW_ARCH_ENABLED
403+
id<RNPermissionHandler> handler = [self handlerForPermission:[RCTConvert RNPermission:permission]];
399404
#else
400-
(RNPermission)
401-
#endif
402-
permission
403-
resolve:(RCTPromiseResolveBlock)resolve
404-
reject:(RCTPromiseRejectBlock)reject) {
405-
id<RNPermissionHandler> handler = [self handlerForPermission:
406-
#ifdef RCT_NEW_ARCH_ENABLED
407-
[RCTConvert RNPermission:permission]
408-
#else
409-
permission
410-
#endif
411-
];
405+
id<RNPermissionHandler> handler = [self handlerForPermission:permission];
406+
#endif
407+
412408
NSString *lockId = [self lockHandler:handler];
413409

414410
[handler requestWithResolver:^(RNPermissionStatus status) {
@@ -421,7 +417,7 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
421417
}
422418

423419
RCT_EXPORT_METHOD(checkNotifications:(RCTPromiseResolveBlock)resolve
424-
reject:(RCTPromiseRejectBlock)reject) {
420+
reject:(RCTPromiseRejectBlock)reject) {
425421
#if __has_include("RNPermissionHandlerNotifications.h")
426422
RNPermissionHandlerNotifications *handler = [RNPermissionHandlerNotifications new];
427423
NSString *lockId = [self lockHandler:(id<RNPermissionHandler>)handler];
@@ -439,8 +435,8 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
439435
}
440436

441437
RCT_EXPORT_METHOD(requestNotifications:(NSArray<NSString *> * _Nonnull)options
442-
resolve:(RCTPromiseResolveBlock)resolve
443-
reject:(RCTPromiseRejectBlock)reject) {
438+
resolve:(RCTPromiseResolveBlock)resolve
439+
reject:(RCTPromiseRejectBlock)reject) {
444440
#if __has_include("RNPermissionHandlerNotifications.h")
445441
RNPermissionHandlerNotifications *handler = [RNPermissionHandlerNotifications new];
446442
NSString *lockId = [self lockHandler:(id<RNPermissionHandler>)handler];
@@ -458,7 +454,7 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
458454
}
459455

460456
RCT_EXPORT_METHOD(openLimitedPhotoLibraryPicker:(RCTPromiseResolveBlock)resolve
461-
reject:(RCTPromiseRejectBlock)reject) {
457+
reject:(RCTPromiseRejectBlock)reject) {
462458
#if __has_include("RNPermissionHandlerPhotoLibrary.h")
463459
RNPermissionHandlerPhotoLibrary *handler = [RNPermissionHandlerPhotoLibrary new];
464460
[handler openLimitedPhotoLibraryPickerWithResolver:resolve rejecter:reject];
@@ -468,7 +464,7 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
468464
}
469465

470466
RCT_EXPORT_METHOD(checkLocationAccuracy:(RCTPromiseResolveBlock)resolve
471-
reject:(RCTPromiseRejectBlock)reject) {
467+
reject:(RCTPromiseRejectBlock)reject) {
472468
#if __has_include("RNPermissionHandlerLocationAccuracy.h")
473469
[self checkUsageDescriptionKeys:[RNPermissionHandlerLocationAccuracy usageDescriptionKeys]];
474470

@@ -480,8 +476,8 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
480476
}
481477

482478
RCT_EXPORT_METHOD(requestLocationAccuracy:(NSString * _Nonnull)purposeKey
483-
resolve:(RCTPromiseResolveBlock)resolve
484-
reject:(RCTPromiseRejectBlock)reject) {
479+
resolve:(RCTPromiseResolveBlock)resolve
480+
reject:(RCTPromiseRejectBlock)reject) {
485481
#if __has_include("RNPermissionHandlerLocationAccuracy.h")
486482
[self checkUsageDescriptionKeys:[RNPermissionHandlerLocationAccuracy usageDescriptionKeys]];
487483

@@ -492,38 +488,47 @@ - (void)unlockHandler:(NSString * _Nonnull)lockId {
492488
#endif
493489
}
494490

495-
- (void)checkMultiplePermissions:(NSArray *)permissions resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
496-
reject(@"RNPermissions:checkMultiplePermissions", @"checkMultiplePermissions is not supported on iOS", nil);
491+
- (void)checkMultiplePermissions:(NSArray *)permissions
492+
resolve:(RCTPromiseResolveBlock)resolve
493+
reject:(RCTPromiseRejectBlock)reject {
494+
reject(@"RNPermissions:checkMultiplePermissions", @"checkMultiplePermissions is not supported on iOS", nil);
497495
}
498496

499-
- (void)checkPermission:(NSString *)permission resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
500-
reject(@"RNPermissions:checkPermission", @"checkPermission is not supported on iOS", nil);
497+
- (void)checkPermission:(NSString *)permission
498+
resolve:(RCTPromiseResolveBlock)resolve
499+
reject:(RCTPromiseRejectBlock)reject {
500+
reject(@"RNPermissions:checkPermission", @"checkPermission is not supported on iOS", nil);
501501
}
502502

503-
- (void)requestMultiplePermissions:(NSArray *)permissions resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
504-
reject(@"RNPermissions:requestMultiplePermissions", @"requestMultiplePermissions is not supported on iOS", nil);
503+
- (void)requestMultiplePermissions:(NSArray *)permissions
504+
resolve:(RCTPromiseResolveBlock)resolve
505+
reject:(RCTPromiseRejectBlock)reject {
506+
reject(@"RNPermissions:requestMultiplePermissions", @"requestMultiplePermissions is not supported on iOS", nil);
505507
}
506508

507-
- (void)requestPermission:(NSString *)permission resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
508-
reject(@"RNPermissions:requestPermission", @"requestPermission is not supported on iOS", nil);
509+
- (void)requestPermission:(NSString *)permission
510+
resolve:(RCTPromiseResolveBlock)resolve
511+
reject:(RCTPromiseRejectBlock)reject {
512+
reject(@"RNPermissions:requestPermission", @"requestPermission is not supported on iOS", nil);
509513
}
510514

511-
- (void)shouldShowRequestPermissionRationale:(NSString *)permission resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
512-
reject(@"RNPermissions:shouldShowRequestPermissionRationale", @"shouldShowRequestPermissionRationale is not supported on iOS", nil);
515+
- (void)shouldShowRequestPermissionRationale:(NSString *)permission
516+
resolve:(RCTPromiseResolveBlock)resolve
517+
reject:(RCTPromiseRejectBlock)reject {
518+
reject(@"RNPermissions:shouldShowRequestPermissionRationale", @"shouldShowRequestPermissionRationale is not supported on iOS", nil);
513519
}
514520

515-
516521
#if RCT_NEW_ARCH_ENABLED
517522

518523
- (facebook::react::ModuleConstants<JS::NativePermissionsModule::Constants::Builder>)getConstants {
519-
return [self constantsToExport];
524+
return [self constantsToExport];
520525
}
521526

522527
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
523-
(const facebook::react::ObjCTurboModule::InitParams &)params
524-
{
528+
(const facebook::react::ObjCTurboModule::InitParams &)params {
525529
return std::make_shared<facebook::react::NativePermissionsModuleSpecJSI>(params);
526530
}
531+
527532
#endif
528533

529534
@end

‎ios/Siri/RNPermissionHandlerSiri.mm‎ renamed to ‎ios/Siri/RNPermissionHandlerSiri.m‎

File renamed without changes.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-permissions",
3-
"version": "3.7.3",
3+
"version": "3.8.0",
44
"license": "MIT",
55
"description": "An unified permissions API for React Native on iOS, Android and Windows",
66
"author": "Mathieu Acthernoene <zoontek@gmail.com>",

0 commit comments

Comments
 (0)