Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 9a84661

Browse files
authored
Merge pull request #268 from Salakar/master
Add podspec and fix iOS database null pointer
2 parents 7de26d3 + 8fc12c1 commit 9a84661

File tree

2 files changed

+30
-59
lines changed

2 files changed

+30
-59
lines changed

‎Firestack.podspec

Lines changed: 24 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,28 @@
11
require 'json'
2-
package = JSON.parse(File.read('package.json'))
3-
version = package["version"]
4-
repo = package['repository']
5-
author = package['author']
62

7-
all_pods = [
8-
'FirebaseAnalytics', 'FirebaseAuth', 'FirebaseRemoteConfig',
9-
'FirebaseDatabase', 'FirebaseStorage', 'FirebaseInstanceID',
10-
'GoogleInterchangeUtilities', 'GoogleIPhoneUtilities',
11-
'GoogleNetworkingUtilities', 'GoogleParsingUtilities',
12-
'GoogleSymbolUtilities'
13-
]
3+
package = JSON.parse(File.read('package.json'))
144

155
Pod::Spec.new do |s|
16-
17-
s.name = "Firestack"
18-
s.version = version
19-
s.summary = "Firestack makes working with Firebase v3 easy"
20-
21-
s.description = <<-DESC
22-
Wanna integrate firebase into your app using React Native?
23-
DESC
24-
25-
s.homepage = "http://fullstackreact.com"
26-
27-
s.license = { :type => "MIT", :file => "LICENSE" }
28-
s.author = { "Ari Lerner" => author }
29-
s.social_media_url = 'http://twitter.com/fullstackio'
30-
31-
# When using multiple platforms
32-
s.ios.deployment_target = "8.0"
33-
# s.osx.deployment_target = "10.7"
34-
# s.watchos.deployment_target = "2.0"
35-
# s.tvos.deployment_target = "9.0"
36-
37-
s.source = { :git => repo['url'], :tag => "v#{version}" }
38-
s.public_header_files = "ios/Firestack/*.h"
39-
40-
s.source_files = 'ios/Firestack/*.{h,m}'
41-
s.preserve_paths = 'README.md', 'package.json', '*.js'
42-
43-
s.ios.frameworks = [
44-
'CFNetwork', 'Security', 'SystemConfiguration'
45-
]
46-
s.ios.libraries = ['icucore', 'c++', 'sqlite3', 'z']
47-
48-
s.xcconfig = {
49-
'HEADER_SEARCH_PATHS' => [
50-
"$(inherited)",
51-
"${SRCROOT}/../../React/**",
52-
"${SRCROOT}/../../node_modules/react-native/**"
53-
].join(' '),
54-
'FRAMEWORK_SEARCH_PATHS' => [
55-
"$(inherited)",
56-
"${PODS_ROOT}/Firebase/**",
57-
"${PODS_ROOT}/FirebaseStorage/**",
58-
].join(' '),
59-
'OTHER_LDFLAGS' => '$(inherited) -ObjC'
60-
}
61-
end
6+
s.name = "Firestack"
7+
s.version = package["version"]
8+
s.summary = package["description"]
9+
s.description = <<-DESC
10+
Wanna integrate firebase into your app using React Native?
11+
DESC
12+
s.homepage = "http://fullstackreact.com"
13+
s.license = package['license']
14+
s.author = "Ari Lerner"
15+
s.source = { :git => "https://github.com/fullstackreact/react-native-firestack.git", :tag => "v#{s.version}" }
16+
s.social_media_url = 'http://twitter.com/fullstackio'
17+
s.platform = :ios, "8.0"
18+
s.header_dir = 'ios/Firestack'
19+
s.preserve_paths = 'README.md', 'package.json', '*.js'
20+
s.source_files = 'ios/Firestack/*.{h,m}'
21+
s.dependency 'React'
22+
s.dependency 'Firebase/Auth'
23+
s.dependency 'Firebase/Core'
24+
s.dependency 'Firebase/Database'
25+
s.dependency 'Firebase/Messaging'
26+
s.dependency 'Firebase/RemoteConfig'
27+
s.dependency 'Firebase/Storage'
28+
end

‎ios/Firestack/FirestackDatabase.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,8 +593,11 @@ - (id) init
593593
callback:(RCTResponseSenderBlock) callback)
594594
{
595595
NSString *key = [self getDBListenerKey:path withModifiers:modifiersString];
596+
NSArray *listenerKeys;
596597
FirestackDBReference *ref = [_dbReferences objectForKey:key];
597-
if (ref != nil) {
598+
if (ref == nil) {
599+
listenerKeys = @[];
600+
} else {
598601
if (eventName == nil || [eventName isEqualToString:@""]) {
599602
[ref cleanup];
600603
[_dbReferences removeObjectForKey:key];
@@ -604,12 +607,13 @@ - (id) init
604607
[_dbReferences removeObjectForKey:key];
605608
}
606609
}
610+
listenerKeys = [ref listenerKeys];
607611
}
608612
callback(@[[NSNull null], @{
609613
@"result": @"success",
610614
@"handle": path,
611615
@"modifiersString": modifiersString,
612-
@"remainingListeners": [ref listenerKeys],
616+
@"remainingListeners": listenerKeys,
613617
}]);
614618
}
615619

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /