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

Commit a9edcae

Browse files
EddyVerbruggenEddyVerbruggen
committed
Upgrade native SDKs to iOS 6.2.0 and Android 16.0.9 #1283 (Android)
1 parent 6b26519 commit a9edcae

8 files changed

Lines changed: 59 additions & 42 deletions

File tree

‎src/inappmessaging/inappmessaging.android.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ import { OnMessageImpressionCallbackData, OnMessageClickedCallbackData } from ".
33
export function onMessageClicked(callback: (data: OnMessageClickedCallbackData) => void): void {
44
const listener = new com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener({
55
messageClicked: (message: com.google.firebase.inappmessaging.model.InAppMessage, action: com.google.firebase.inappmessaging.model.Action) => {
6-
console.log(">> listener, messageClicked");
7-
console.log(">> listener, messageClicked, message: " + message);
8-
console.log(">> listener, messageClicked, action: " + action);
9-
console.log(">> listener, messageClicked, campaign: " + message.getCampaignName());
106
callback({
117
campaignName: message.getCampaignName()
128
})
@@ -19,9 +15,6 @@ export function onMessageClicked(callback: (data: OnMessageClickedCallbackData)
1915
export function onMessageImpression(callback: (data: OnMessageImpressionCallbackData) => void): void {
2016
const listener = new com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener({
2117
impressionDetected: (message: com.google.firebase.inappmessaging.model.InAppMessage) => {
22-
console.log(">> listener, impressionDetected");
23-
console.log(">> listener, impressionDetected, message: " + message);
24-
console.log(">> listener, impressionDetected, campaign: " + message.getCampaignName());
2518
callback({
2619
campaignName: message.getCampaignName()
2720
})

‎src/messaging/messaging.android.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as application from "tns-core-modules/application/application";
44
import { PushNotificationModel } from "./messaging.ios";
55
import { MessagingOptions } from "../firebase";
66

7-
declare const android, com, org, global: any;
7+
declare const com, global: any;
88
const NotificationManagerCompatClass = useAndroidX() ? global.androidx.core.app.NotificationManagerCompat : android.support.v4.app.NotificationManagerCompat;
99

1010
let _launchNotification = null;
@@ -119,7 +119,8 @@ export function addOnMessageReceivedCallback(callback) {
119119

120120
org.nativescript.plugins.firebase.FirebasePlugin.setOnNotificationReceivedCallback(
121121
new org.nativescript.plugins.firebase.FirebasePluginListener({
122-
success: notification => callback(JSON.parse(notification))
122+
success: notification => callback(JSON.parse(notification)),
123+
error: err => console.log("Error handling message: " + err)
123124
})
124125
);
125126

‎src/mlkit/mlkit-cameraview.android.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ declare const global: any;
66
const ActivityCompatClass = useAndroidX() ? global.androidx.core.app.ActivityCompat : android.support.v4.app.ActivityCompat;
77
const CAMERA_PERMISSION_REQUEST_CODE = 502;
88

9-
// declare const com, android: any;
10-
119
class SizePair {
1210
pictureSize: {
1311
width: number;

‎src/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@
8585
"generate.typings.android.mlkit": "npm run generate.typings.android --nativescript-plugin-firebase:typings=mlkit",
8686
"generate.typings.android.crashlytics": "npm run generate.typings.android --nativescript-plugin-firebase:typings=crashlytics",
8787
"generate.typings.android.inappmessaging": "npm run generate.typings.android --nativescript-plugin-firebase:typings=inappmessaging",
88-
"generate.typings.android.performance": "npm run generate.typings.android --nativescript-plugin-firebase:typings=performance"
88+
"generate.typings.android.performance": "npm run generate.typings.android --nativescript-plugin-firebase:typings=performance",
89+
"generate.typings.android.nativescript-android-lib": "npm run generate.typings.android --nativescript-plugin-firebase:typings=nativescript-android-lib"
8990
},
9091
"repository": {
9192
"type": "git",

‎src/platforms/android/typings/nativescript-android-lib/_helpers.d.ts‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/platforms/android/typings/nativescript-android-lib/android-declarations.d.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
declare module native { export class Array<T> { constructor(); length: number; [index: number]: T; } }
2+
3+
import globalAndroid = android;
4+

‎src/platforms/android/typings/nativescript-android-lib/android.d.ts‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
/// <reference path="./_helpers.d.ts" />
1+
/// <reference path="android-declarations.d.ts"/>
2+
23
declare module org {
34
export module nativescript {
45
export module plugins {
56
export module firebase {
67
export class BuildConfig {
8+
public static class: java.lang.Class<org.nativescript.plugins.firebase.BuildConfig>;
79
public static DEBUG: boolean;
810
public static APPLICATION_ID: string;
911
public static BUILD_TYPE: string;
@@ -17,40 +19,63 @@ declare module org {
1719
}
1820
}
1921

20-
/// <reference path="./java.lang.String.d.ts" />
21-
/// <reference path="./org.nativescript.plugins.firebase.FirebasePluginListener.d.ts" />
2222
declare module org {
2323
export module nativescript {
2424
export module plugins {
2525
export module firebase {
2626
export class FirebasePlugin {
27+
public static class: java.lang.Class<org.nativescript.plugins.firebase.FirebasePlugin>;
28+
public static unregisterForPushNotifications(param0: string): void;
2729
public static setOnPushTokenReceivedCallback(param0: org.nativescript.plugins.firebase.FirebasePluginListener): void;
2830
public static executeOnPushTokenReceivedCallback(param0: string): void;
2931
public constructor();
32+
public static registerForPushNotifications(param0: string): void;
3033
public static setOnNotificationReceivedCallback(param0: org.nativescript.plugins.firebase.FirebasePluginListener): void;
3134
public static executeOnNotificationReceivedCallback(param0: string): void;
35+
public static getCurrentPushToken(param0: string, param1: org.nativescript.plugins.firebase.FirebasePluginListener): void;
36+
}
37+
}
38+
}
39+
}
40+
}
41+
42+
declare module org {
43+
export module nativescript {
44+
export module plugins {
45+
export module firebase {
46+
export class FirebasePluginLifecycleCallbacks {
47+
public static class: java.lang.Class<org.nativescript.plugins.firebase.FirebasePluginLifecycleCallbacks>;
48+
public onActivitySaveInstanceState(param0: globalAndroid.app.Activity, param1: globalAndroid.os.Bundle): void;
49+
public static registerCallbacks(param0: globalAndroid.app.Application): void;
50+
public onActivityStarted(param0: globalAndroid.app.Activity): void;
51+
public onActivityCreated(param0: globalAndroid.app.Activity, param1: globalAndroid.os.Bundle): void;
52+
public onActivityStopped(param0: globalAndroid.app.Activity): void;
53+
public constructor();
54+
public onActivityPaused(param0: globalAndroid.app.Activity): void;
55+
public onActivityResumed(param0: globalAndroid.app.Activity): void;
56+
public onActivityDestroyed(param0: globalAndroid.app.Activity): void;
3257
}
3358
}
3459
}
3560
}
3661
}
3762

38-
import javalangObject = java.lang.Object;
39-
/// <reference path="./java.lang.Object.d.ts" />
4063
declare module org {
4164
export module nativescript {
4265
export module plugins {
4366
export module firebase {
4467
export class FirebasePluginListener {
68+
public static class: java.lang.Class<org.nativescript.plugins.firebase.FirebasePluginListener>;
4569
/**
46-
* Constructs a new instance of the org.nativescript.plugins.firebase.FirebasePluginListener interface with the provided implementation.
70+
* Constructs a new instance of the org.nativescript.plugins.firebase.FirebasePluginListener interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
4771
*/
4872
public constructor(implementation: {
49-
success(param0: javalangObject): void;
50-
error(param0: javalangObject): void;
73+
success(param0: any): void;
74+
error(param0: any): void;
5175
});
52-
public success(param0: javalangObject): void;
53-
public error(param0: javalangObject): void;
76+
public constructor();
77+
public success(param0: any): void;
78+
public error(param0: any): void;
5479
}
5580
}
5681
}
@@ -62,6 +87,7 @@ declare module org {
6287
export module plugins {
6388
export module firebase {
6489
export class MyFirebaseInstanceIDService {
90+
public static class: java.lang.Class<org.nativescript.plugins.firebase.MyFirebaseInstanceIDService>;
6591
public onTokenRefresh(): void;
6692
public constructor();
6793
}
@@ -70,18 +96,19 @@ declare module org {
7096
}
7197
}
7298

73-
import comgooglefirebasemessagingRemoteMessage = com.google.firebase.messaging.RemoteMessage;
74-
/// <reference path="./com.google.firebase.messaging.RemoteMessage.d.ts" />
7599
declare module org {
76100
export module nativescript {
77101
export module plugins {
78102
export module firebase {
79103
export class MyFirebaseMessagingService {
104+
public static class: java.lang.Class<org.nativescript.plugins.firebase.MyFirebaseMessagingService>;
80105
public constructor();
81-
public onMessageReceived(param0: comgooglefirebasemessagingRemoteMessage): void;
106+
public onMessageReceived(param0: com.google.firebase.messaging.RemoteMessage): void;
82107
}
83108
}
84109
}
85110
}
86111
}
87112

113+
//Generics information:
114+

‎src/storage/storage.android.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
UploadFileResult
99
} from "./storage";
1010

11-
declare const android, com: any;
11+
const gmsTasks = (<any>com.google.android.gms).tasks;
1212

1313
function getStorageRef(reject, arg) {
1414
if (typeof(com.google.firebase.storage) === "undefined") {
@@ -42,7 +42,7 @@ export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
4242

4343
const storageReference = storageRef.child(arg.remoteFullPath);
4444

45-
const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
45+
const onSuccessListener = new gmsTasks.OnSuccessListener({
4646
onSuccess: uploadTaskSnapshot => {
4747
const metadata = uploadTaskSnapshot.getMetadata();
4848
resolve({
@@ -57,14 +57,14 @@ export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
5757
}
5858
});
5959

60-
const onFailureListener = new com.google.android.gms.tasks.OnFailureListener({
60+
const onFailureListener = new gmsTasks.OnFailureListener({
6161
onFailure: exception => {
6262
reject("Upload failed. " + exception);
6363
}
6464
});
6565

6666
const onProgressListener = new com.google.firebase.storage.OnProgressListener({
67-
onProgress: snapshot => {
67+
onProgress: (snapshot: any) => {
6868
if (typeof(arg.onProgress) === "function") {
6969
const fractionCompleted = snapshot.getBytesTransferred() / snapshot.getTotalByteCount();
7070
arg.onProgress({
@@ -139,11 +139,11 @@ export function downloadFile(arg: DownloadFileOptions): Promise<string> {
139139

140140
const storageReference = storageRef.child(arg.remoteFullPath);
141141

142-
const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
142+
const onSuccessListener = new gmsTasks.OnSuccessListener({
143143
onSuccess: downloadTaskSnapshot => resolve()
144144
});
145145

146-
const onFailureListener = new com.google.android.gms.tasks.OnFailureListener({
146+
const onFailureListener = new gmsTasks.OnFailureListener({
147147
onFailure: exception => reject("Download failed. " + exception)
148148
});
149149

@@ -189,13 +189,13 @@ export function getDownloadUrl(arg: GetDownloadUrlOptions): Promise<string> {
189189

190190
const storageReference = storageRef.child(arg.remoteFullPath);
191191

192-
const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
192+
const onSuccessListener = new gmsTasks.OnSuccessListener({
193193
onSuccess: uri => {
194194
resolve(uri.toString());
195195
}
196196
});
197197

198-
const onFailureListener = new com.google.android.gms.tasks.OnFailureListener({
198+
const onFailureListener = new gmsTasks.OnFailureListener({
199199
onFailure: exception => {
200200
reject(exception.getMessage());
201201
}
@@ -224,13 +224,13 @@ export function deleteFile(arg: DeleteFileOptions): Promise<void> {
224224

225225
const storageReference = storageRef.child(arg.remoteFullPath);
226226

227-
const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
227+
const onSuccessListener = new gmsTasks.OnSuccessListener({
228228
onSuccess: () => {
229229
resolve();
230230
}
231231
});
232232

233-
const onFailureListener = new com.google.android.gms.tasks.OnFailureListener({
233+
const onFailureListener = new gmsTasks.OnFailureListener({
234234
onFailure: exception => {
235235
reject(exception.getMessage());
236236
}

0 commit comments

Comments
 (0)