Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit 93a50f4

Browse files
EddyVerbruggenEddyVerbruggen
committed
Notification Icon not showing on Oreo devices (Android) #660 (typings updated)
1 parent 64abf9a commit 93a50f4

9 files changed

+371
-13
lines changed

‎src/firebase.ios.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,7 +2287,7 @@ firebase.firestore.onCollectionSnapshot = (colRef: FIRCollectionReference, callb
22872287
const listener = colRef.addSnapshotListener((snapshot: FIRQuerySnapshot, error: NSError) => {
22882288
const docSnapshots: Array<firestore.DocumentSnapshot> = [];
22892289
for (let i = 0, l = snapshot.documents.count; i < l; i++) {
2290-
const document: FIRDocumentSnapshot = snapshot.documents.objectAtIndex(i);
2290+
const document: FIRQueryDocumentSnapshot = snapshot.documents.objectAtIndex(i);
22912291
docSnapshots.push(new DocumentSnapshot(document.documentID, true, firebase.toJsObject(document.data())));
22922292
}
22932293

@@ -2480,7 +2480,7 @@ firebase.firestore.getCollection = (collectionPath: string): Promise<firestore.Q
24802480
} else {
24812481
const docSnapshots: Array<firestore.DocumentSnapshot> = [];
24822482
for (let i = 0, l = snapshot.documents.count; i < l; i++) {
2483-
const document: FIRDocumentSnapshot = snapshot.documents.objectAtIndex(i);
2483+
const document: FIRQueryDocumentSnapshot = snapshot.documents.objectAtIndex(i);
24842484
docSnapshots.push(new DocumentSnapshot(document.documentID, true, firebase.toJsObject(document.data())));
24852485
}
24862486
const snap = new QuerySnapshot();
@@ -2537,7 +2537,7 @@ firebase.firestore._getQuery = (collectionPath: string, query: FIRQuery): firest
25372537
console.log(">> .where, snapshot: " + snapshot);
25382538
const docSnapshots: Array<firestore.DocumentSnapshot> = [];
25392539
for (let i = 0, l = snapshot.documents.count; i < l; i++) {
2540-
const document: FIRDocumentSnapshot = snapshot.documents.objectAtIndex(i);
2540+
const document: FIRQueryDocumentSnapshot = snapshot.documents.objectAtIndex(i);
25412541
docSnapshots.push(new DocumentSnapshot(document.documentID, true, firebase.toJsObject(document.data())));
25422542
}
25432543
const snap = new QuerySnapshot();

‎src/platforms/ios/typings/objc!FBSDKCoreKit.d.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,4 +707,8 @@ declare class FBSDKUtility extends NSObject {
707707
static new(): FBSDKUtility; // inherited from NSObject
708708

709709
static queryStringWithDictionaryError(dictionary: NSDictionary<any, any>): string;
710+
711+
static startGCDTimerWithIntervalBlock(interval: number, block: () => void): NSObject;
712+
713+
static stopGCDTimer(timer: NSObject): void;
710714
}

‎src/platforms/ios/typings/objc!FirebaseAuth.d.ts‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ declare const enum FIRActionCodeOperation {
1818

1919
VerifyEmail = 2,
2020

21-
RecoverEmail = 3
21+
RecoverEmail = 3,
22+
23+
EmailLink = 4
2224
}
2325

2426
declare class FIRActionCodeSettings extends NSObject {
@@ -98,10 +100,16 @@ declare class FIRAuth extends NSObject {
98100

99101
confirmPasswordResetWithCodeNewPasswordCompletion(code: string, newPassword: string, completion: (p1: NSError) => void): void;
100102

103+
createUserAndRetrieveDataWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
104+
101105
createUserWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRUser, p2: NSError) => void): void;
102106

103107
fetchProvidersForEmailCompletion(email: string, completion: (p1: NSArray<string>, p2: NSError) => void): void;
104108

109+
fetchSignInMethodsForEmailCompletion(email: string, completion: (p1: NSArray<string>, p2: NSError) => void): void;
110+
111+
isSignInWithEmailLink(link: string): boolean;
112+
105113
removeAuthStateDidChangeListener(listenerHandle: NSObjectProtocol): void;
106114

107115
removeIDTokenDidChangeListener(listenerHandle: NSObjectProtocol): void;
@@ -110,16 +118,26 @@ declare class FIRAuth extends NSObject {
110118

111119
sendPasswordResetWithEmailCompletion(email: string, completion: (p1: NSError) => void): void;
112120

121+
sendSignInLinkToEmailActionCodeSettingsCompletion(email: string, actionCodeSettings: FIRActionCodeSettings, completion: (p1: NSError) => void): void;
122+
113123
setAPNSTokenType(token: NSData, type: FIRAuthAPNSTokenType): void;
114124

115125
signInAndRetrieveDataWithCredentialCompletion(credential: FIRAuthCredential, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
116126

127+
signInAndRetrieveDataWithCustomTokenCompletion(token: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
128+
129+
signInAndRetrieveDataWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
130+
131+
signInAnonymouslyAndRetrieveDataWithCompletion(completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
132+
117133
signInAnonymouslyWithCompletion(completion: (p1: FIRUser, p2: NSError) => void): void;
118134

119135
signInWithCredentialCompletion(credential: FIRAuthCredential, completion: (p1: FIRUser, p2: NSError) => void): void;
120136

121137
signInWithCustomTokenCompletion(token: string, completion: (p1: FIRUser, p2: NSError) => void): void;
122138

139+
signInWithEmailLinkCompletion(email: string, link: string, completion: (p1: FIRAuthDataResult, p2: NSError) => void): void;
140+
123141
signInWithEmailPasswordCompletion(email: string, password: string, completion: (p1: FIRUser, p2: NSError) => void): void;
124142

125143
signOut(): boolean;
@@ -299,15 +317,21 @@ declare class FIREmailAuthProvider extends NSObject {
299317

300318
static alloc(): FIREmailAuthProvider; // inherited from NSObject
301319

320+
static credentialWithEmailLink(email: string, link: string): FIRAuthCredential;
321+
302322
static credentialWithEmailPassword(email: string, password: string): FIRAuthCredential;
303323

304324
static new(): FIREmailAuthProvider; // inherited from NSObject
305325
}
306326

307327
declare var FIREmailAuthProviderID: string;
308328

329+
declare var FIREmailLinkAuthSignInMethod: string;
330+
309331
declare var FIREmailPasswordAuthProviderID: string;
310332

333+
declare var FIREmailPasswordAuthSignInMethod: string;
334+
311335
declare class FIRFacebookAuthProvider extends NSObject {
312336

313337
static alloc(): FIRFacebookAuthProvider; // inherited from NSObject
@@ -319,6 +343,8 @@ declare class FIRFacebookAuthProvider extends NSObject {
319343

320344
declare var FIRFacebookAuthProviderID: string;
321345

346+
declare var FIRFacebookAuthSignInMethod: string;
347+
322348
declare class FIRGitHubAuthProvider extends NSObject {
323349

324350
static alloc(): FIRGitHubAuthProvider; // inherited from NSObject
@@ -330,6 +356,8 @@ declare class FIRGitHubAuthProvider extends NSObject {
330356

331357
declare var FIRGitHubAuthProviderID: string;
332358

359+
declare var FIRGitHubAuthSignInMethod: string;
360+
333361
declare class FIRGoogleAuthProvider extends NSObject {
334362

335363
static alloc(): FIRGoogleAuthProvider; // inherited from NSObject
@@ -341,6 +369,8 @@ declare class FIRGoogleAuthProvider extends NSObject {
341369

342370
declare var FIRGoogleAuthProviderID: string;
343371

372+
declare var FIRGoogleAuthSignInMethod: string;
373+
344374
declare class FIROAuthProvider extends NSObject {
345375

346376
static alloc(): FIROAuthProvider; // inherited from NSObject
@@ -378,6 +408,8 @@ declare class FIRPhoneAuthProvider extends NSObject {
378408

379409
declare var FIRPhoneAuthProviderID: string;
380410

411+
declare var FIRPhoneAuthSignInMethod: string;
412+
381413
declare class FIRTwitterAuthProvider extends NSObject {
382414

383415
static alloc(): FIRTwitterAuthProvider; // inherited from NSObject
@@ -389,6 +421,8 @@ declare class FIRTwitterAuthProvider extends NSObject {
389421

390422
declare var FIRTwitterAuthProviderID: string;
391423

424+
declare var FIRTwitterAuthSignInMethod: string;
425+
392426
declare class FIRUser extends NSObject implements FIRUserInfo {
393427

394428
static alloc(): FIRUser; // inherited from NSObject

‎src/platforms/ios/typings/objc!FirebaseDatabase.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ declare class FIRDataSnapshot extends NSObject {
1818

1919
static new(): FIRDataSnapshot; // inherited from NSObject
2020

21-
readonly children: NSEnumerator<any>;
21+
readonly children: NSEnumerator<FIRDataSnapshot>;
2222

2323
readonly childrenCount: number;
2424

@@ -216,7 +216,7 @@ declare class FIRMutableData extends NSObject {
216216

217217
static new(): FIRMutableData; // inherited from NSObject
218218

219-
readonly children: NSEnumerator<any>;
219+
readonly children: NSEnumerator<FIRMutableData>;
220220

221221
readonly childrenCount: number;
222222

‎src/platforms/ios/typings/objc!FirebaseDynamicLinks.d.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11

2+
declare const enum FIRDLMatchType {
3+
4+
None = 0,
5+
6+
Weak = 1,
7+
8+
Default = 2,
9+
10+
Unique = 3
11+
}
12+
213
declare class FIRDynamicLink extends NSObject {
314

415
static alloc(): FIRDynamicLink; // inherited from NSObject
@@ -7,6 +18,8 @@ declare class FIRDynamicLink extends NSObject {
718

819
readonly matchConfidence: FIRDynamicLinkMatchConfidence;
920

21+
readonly matchType: FIRDLMatchType;
22+
1023
readonly minimumAppVersion: string;
1124

1225
readonly url: NSURL;

‎src/platforms/ios/typings/objc!FirebaseFirestore.d.ts‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ declare class FIRDocumentChange extends NSObject {
2626

2727
static new(): FIRDocumentChange; // inherited from NSObject
2828

29-
readonly document: FIRDocumentSnapshot;
29+
readonly document: FIRQueryDocumentSnapshot;
3030

3131
readonly newIndex: number;
3232

@@ -52,7 +52,7 @@ declare class FIRDocumentListenOptions extends NSObject {
5252

5353
static options(): FIRDocumentListenOptions;
5454

55-
readonly includeMetadataChanges: boolean;
55+
includeMetadataChanges(includeMetadataChanges: boolean): this;
5656
}
5757

5858
declare class FIRDocumentReference extends NSObject {
@@ -110,7 +110,13 @@ declare class FIRDocumentSnapshot extends NSObject {
110110

111111
data(): NSDictionary<string, any>;
112112

113+
dataWithOptions(options: FIRSnapshotOptions): NSDictionary<string, any>;
114+
113115
objectForKeyedSubscript(key: any): any;
116+
117+
valueForField(field: any): any;
118+
119+
valueForFieldOptions(field: any, options: FIRSnapshotOptions): any;
114120
}
115121

116122
declare class FIRFieldPath extends NSObject implements NSCopying {
@@ -159,8 +165,12 @@ declare class FIRFirestore extends NSObject {
159165

160166
collectionWithPath(collectionPath: string): FIRCollectionReference;
161167

168+
disableNetworkWithCompletion(completion: (p1: NSError) => void): void;
169+
162170
documentWithPath(documentPath: string): FIRDocumentReference;
163171

172+
enableNetworkWithCompletion(completion: (p1: NSError) => void): void;
173+
164174
runTransactionWithBlockCompletion(updateBlock: (p1: FIRTransaction, p2: interop.Pointer | interop.Reference<NSError>) => any, completion: (p1: any, p2: NSError) => void): void;
165175
}
166176

@@ -268,6 +278,8 @@ declare class FIRQuery extends NSObject {
268278

269279
queryEndingBeforeValues(fieldValues: NSArray<any>): FIRQuery;
270280

281+
queryFilteredUsingPredicate(predicate: NSPredicate): FIRQuery;
282+
271283
queryLimitedTo(limit: number): FIRQuery;
272284

273285
queryOrderedByField(field: string): FIRQuery;
@@ -307,6 +319,13 @@ declare class FIRQuery extends NSObject {
307319
queryWhereFieldPathIsLessThanOrEqualTo(path: FIRFieldPath, value: any): FIRQuery;
308320
}
309321

322+
declare class FIRQueryDocumentSnapshot extends FIRDocumentSnapshot {
323+
324+
static alloc(): FIRQueryDocumentSnapshot; // inherited from NSObject
325+
326+
static new(): FIRQueryDocumentSnapshot; // inherited from NSObject
327+
}
328+
310329
declare class FIRQueryListenOptions extends NSObject {
311330

312331
static alloc(): FIRQueryListenOptions; // inherited from NSObject
@@ -330,7 +349,7 @@ declare class FIRQuerySnapshot extends NSObject {
330349

331350
readonly documentChanges: NSArray<FIRDocumentChange>;
332351

333-
readonly documents: NSArray<FIRDocumentSnapshot>;
352+
readonly documents: NSArray<FIRQueryDocumentSnapshot>;
334353

335354
readonly empty: boolean;
336355

@@ -339,6 +358,15 @@ declare class FIRQuerySnapshot extends NSObject {
339358
readonly query: FIRQuery;
340359
}
341360

361+
declare const enum FIRServerTimestampBehavior {
362+
363+
None = 0,
364+
365+
Estimate = 1,
366+
367+
Previous = 2
368+
}
369+
342370
declare class FIRSetOptions extends NSObject {
343371

344372
static alloc(): FIRSetOptions; // inherited from NSObject
@@ -361,6 +389,42 @@ declare class FIRSnapshotMetadata extends NSObject {
361389
readonly pendingWrites: boolean;
362390
}
363391

392+
declare class FIRSnapshotOptions extends NSObject {
393+
394+
static alloc(): FIRSnapshotOptions; // inherited from NSObject
395+
396+
static new(): FIRSnapshotOptions; // inherited from NSObject
397+
398+
static serverTimestampBehavior(serverTimestampBehavior: FIRServerTimestampBehavior): FIRSnapshotOptions;
399+
}
400+
401+
declare class FIRTimestamp extends NSObject implements NSCopying {
402+
403+
static alloc(): FIRTimestamp; // inherited from NSObject
404+
405+
static new(): FIRTimestamp; // inherited from NSObject
406+
407+
static timestamp(): FIRTimestamp;
408+
409+
static timestampWithDate(date: Date): FIRTimestamp;
410+
411+
static timestampWithSecondsNanoseconds(seconds: number, nanoseconds: number): FIRTimestamp;
412+
413+
readonly nanoseconds: number;
414+
415+
readonly seconds: number;
416+
417+
constructor(o: { seconds: number; nanoseconds: number; });
418+
419+
approximateDateValue(): Date;
420+
421+
compare(other: FIRTimestamp): NSComparisonResult;
422+
423+
copyWithZone(zone: interop.Pointer | interop.Reference<any>): any;
424+
425+
initWithSecondsNanoseconds(seconds: number, nanoseconds: number): this;
426+
}
427+
364428
declare class FIRTransaction extends NSObject {
365429

366430
static alloc(): FIRTransaction; // inherited from NSObject
@@ -384,6 +448,8 @@ declare class FIRWriteBatch extends NSObject {
384448

385449
static new(): FIRWriteBatch; // inherited from NSObject
386450

451+
commit(): void;
452+
387453
commitWithCompletion(completion: (p1: NSError) => void): void;
388454

389455
deleteDocument(document: FIRDocumentReference): FIRWriteBatch;

‎src/platforms/ios/typings/objc!FirebaseMessaging.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ declare class FIRMessaging extends NSObject {
1111

1212
readonly FCMToken: string;
1313

14+
autoInitEnabled: boolean;
15+
1416
delegate: FIRMessagingDelegate;
1517

1618
readonly isDirectChannelEstablished: boolean;

‎src/platforms/ios/typings/objc!FirebaseStorage.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ declare class FIRStorageMetadata extends NSObject implements NSCopying {
134134

135135
readonly generation: number;
136136

137+
readonly md5Hash: string;
138+
137139
readonly metageneration: number;
138140

139141
readonly name: string;

0 commit comments

Comments
 (0)