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

Commit 24e26c7

Browse files
author
Brendan Ingham
committed
Android Implementation Finished!
1 parent 9e95e71 commit 24e26c7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"nativescript": {
33
"id": "org.nativescript.firebasedemo",
44
"tns-android": {
5-
"version": "4.3.0-2018-09-21-01"
5+
"version": "4.2.0"
66
},
77
"tns-ios": {
88
"version": "4.3.0-2018-09-19-01"
@@ -12,7 +12,7 @@
1212
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.0.1.tgz",
1313
"nativescript-theme-core": "^1.0.4",
1414
"nativescript-unit-test-runner": "^0.3.4",
15-
"tns-core-modules": "^4.3.0-2018-09-20-01"
15+
"tns-core-modules": "^4.2.1"
1616
},
1717
"devDependencies": {
1818
"@types/jasmine": "~2.8.0",

src/firebase.android.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ firebase.toValue = val => {
191191
}
192192
}
193193
return returnVal;
194-
}
194+
};
195195

196196
firebase.toJsObject = javaObj => {
197197
if (javaObj === null || typeof javaObj !== "object") {

src/functions/functions.android.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ export function httpsCallable<I = {}, O = {}>(functionName: string): HttpsCallab
1515

1616
try {
1717
const result = task.getResult() as com.google.firebase.functions.HttpsCallableResult;
18-
const resultData = result.getData() as O;
18+
const resultData = result.getData();
1919

20-
resolve( resultData );
20+
resolve( firebase.toJsObject(resultData) as O );
2121
} catch (e) {
2222
console.log('Error Caught:', e);
2323
reject( e.message );

0 commit comments

Comments
 (0)