Skip to content

Commit 3830c06

Browse files
committed
chore(demo): delay API 33 permission request
1 parent 39b3b89 commit 3830c06

File tree

2 files changed

+36
-13
lines changed

2 files changed

+36
-13
lines changed

apps/demo/src/app.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,18 @@ Application.on('launch', (args) => {
5151
});
5252
});
5353

54-
messaging
55-
.requestPermission()
56-
.then(() => {
57-
console.log('requestPermission', 'done');
58-
messaging.registerDeviceForRemoteMessages().catch((e) => {
59-
console.error('registerDeviceForRemoteMessages', e);
54+
if (global.isIOS) {
55+
messaging
56+
.requestPermission()
57+
.then(() => {
58+
console.log('requestPermission', 'done');
59+
messaging.registerDeviceForRemoteMessages().catch((e) => {
60+
console.error('registerDeviceForRemoteMessages', e);
61+
});
62+
})
63+
.catch((e) => {
64+
console.error('requestPermission', e);
6065
});
61-
})
62-
.catch((e) => {
63-
console.error('requestPermission', e);
64-
});
66+
}
6567

6668
Application.run({ moduleName: 'app-root' });

apps/demo/src/main-page.ts

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,28 @@
11
import { EventData, Page } from '@nativescript/core';
2-
import { MainViewModel } from "./main-view-model";
2+
import { firebase } from '@nativescript/firebase-core';
3+
import { MainViewModel } from './main-view-model';
34

5+
let didFire = false;
46
export function navigatingTo(args: EventData) {
5-
const page = <Page>args.object;
6-
page.bindingContext = new MainViewModel();
7+
const page = <Page>args.object;
8+
page.bindingContext = new MainViewModel();
9+
10+
if (global.isAndroid && !didFire) {
11+
firebase()
12+
.messaging()
13+
.requestPermission()
14+
.then(() => {
15+
console.log('requestPermission', 'done');
16+
firebase()
17+
.messaging()
18+
.registerDeviceForRemoteMessages()
19+
.catch((e) => {
20+
console.error('registerDeviceForRemoteMessages', e);
21+
});
22+
})
23+
.catch((e) => {
24+
console.error('requestPermission', e);
25+
});
26+
didFire = true;
27+
}
728
}

0 commit comments

Comments
 (0)