Skip to content

Commit 0148901

Browse files
committed
fix(app, ios): use NSInteger not NSInteger* for prefs
the native API for user prefs takes NSInteger, conform to that
1 parent c834624 commit 0148901

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

packages/app/ios/RNFBApp/RNFBPreferences.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525

2626
- (void)setBooleanValue:(NSString *)key boolValue:(BOOL)boolValue;
2727

28-
- (void)setIntegerValue:(NSString *)key integerValue:(NSInteger *)integerValue;
28+
- (void)setIntegerValue:(NSString *)key integerValue:(NSInteger)integerValue;
2929

3030
- (void)setStringValue:(NSString *)key stringValue:(NSString *)stringValue;
3131

3232
- (NSString *)getStringValue:(NSString *)key defaultValue:(NSString *)defaultValue;
3333

34-
- (NSInteger *)getIntegerValue:(NSString *)key defaultValue:(NSInteger *)defaultValue;
34+
- (NSInteger)getIntegerValue:(NSString *)key defaultValue:(NSInteger)defaultValue;
3535

3636
- (NSDictionary *)getAll;
3737

packages/app/ios/RNFBApp/RNFBPreferences.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ - (void)setBooleanValue:(NSString *)key boolValue:(BOOL)boolValue {
5555
[_userDefaults synchronize];
5656
}
5757

58-
- (void)setIntegerValue:(NSString *)key integerValue:(NSInteger *)integerValue {
58+
- (void)setIntegerValue:(NSString *)key integerValue:(NSInteger)integerValue {
5959
[_userDefaults setInteger:(NSInteger)integerValue forKey:key];
6060
[_userDefaults synchronize];
6161
}
6262

63-
- (NSInteger *)getIntegerValue:(NSString *)key defaultValue:(NSInteger *)defaultValue {
63+
- (NSInteger)getIntegerValue:(NSString *)key defaultValue:(NSInteger)defaultValue {
6464
if ([_userDefaults objectForKey:key] == nil) return defaultValue;
65-
return (NSInteger *)[_userDefaults integerForKey:key];
65+
return [_userDefaults integerForKey:key];
6666
}
6767

6868
- (NSString *)getStringValue:(NSString *)key defaultValue:(NSString *)defaultValue {

packages/database/ios/RNFBDatabase/RNFBDatabaseCommon.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ + (void)setDatabaseConfig:(FIRDatabase *)firDatabase dbURL:(NSString *)dbURL {
8585

8686
// Persistence cache size
8787
if ([preferences contains:DATABASE_PERSISTENCE_CACHE_SIZE]) {
88-
NSInteger *cacheSizeBytes = [preferences getIntegerValue:DATABASE_PERSISTENCE_CACHE_SIZE
89-
defaultValue:(NSInteger *)10000000];
88+
NSInteger cacheSizeBytes = [preferences getIntegerValue:DATABASE_PERSISTENCE_CACHE_SIZE
89+
defaultValue:10000000];
9090
[firDatabase setPersistenceCacheSizeBytes:(NSUInteger)cacheSizeBytes];
9191
}
9292

packages/database/ios/RNFBDatabase/RNFBDatabaseModule.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ - (dispatch_queue_t)methodQueue {
7676
RCT_EXPORT_METHOD(setPersistenceCacheSizeBytes
7777
: (FIRApp *)firebaseApp
7878
: (NSString *)dbURL
79-
: (NSInteger *)bytes) {
80-
[[RNFBPreferences shared] setIntegerValue:DATABASE_PERSISTENCE_CACHE_SIZE integerValue:bytes];
79+
: (NSNumber *_Nonnull)bytes) {
80+
[[RNFBPreferences shared] setIntegerValue:DATABASE_PERSISTENCE_CACHE_SIZE
81+
integerValue:[bytes intValue]];
8182
}
8283

8384
@end

packages/firestore/ios/RNFBFirestore/RNFBFirestoreCommon.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ + (void)setFirestoreSettings:(FIRFirestore *)firestore appName:(NSString *)appNa
6666
firestoreSettings.dispatchQueue = [self getFirestoreQueue];
6767

6868
NSString *cacheKey = [NSString stringWithFormat:@"%@_%@", FIRESTORE_CACHE_SIZE, appName];
69-
NSInteger *size = [preferences getIntegerValue:cacheKey defaultValue:0];
69+
NSInteger size = [preferences getIntegerValue:cacheKey defaultValue:0];
7070

71-
if (size == (NSInteger *)-1) {
71+
if (size == -1) {
7272
firestoreSettings.cacheSizeBytes = kFIRFirestoreCacheSizeUnlimited;
7373
} else if (size == 0) {
7474
firestoreSettings.cacheSizeBytes = firestore.settings.cacheSizeBytes;
7575
} else {
76-
firestoreSettings.cacheSizeBytes = (int64_t)size;
76+
firestoreSettings.cacheSizeBytes = size;
7777
}
7878

7979
NSString *hostKey = [NSString stringWithFormat:@"%@_%@", FIRESTORE_HOST, appName];

0 commit comments

Comments
 (0)