Skip to content

Commit 54e6d5c

Browse files
authored
Merge pull request #124 from NativeScript/lini/fix-android-token-exception
fix: possible exception when converting dates in android
2 parents 7eb7a6e + d45d551 commit 54e6d5c

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/login-manager.android.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ export function getCurrentAccessToken() {
114114
accessToken = new FacebookAccessToken();
115115
accessToken.accessToken = sdkAccessToken.getToken();
116116
accessToken.userId = sdkAccessToken.getUserId();
117-
accessToken.expirationDate = convertToISOStringDate(sdkAccessToken.getExpires().toGMTString());
118-
accessToken.refreshDate = convertToISOStringDate(sdkAccessToken.getLastRefresh().toGMTString());
117+
accessToken.expirationDate = convertToISOStringDate(sdkAccessToken.getExpires().getTime());
118+
accessToken.refreshDate = convertToISOStringDate(sdkAccessToken.getLastRefresh().getTime());
119119
}
120120

121121
return accessToken;
@@ -128,6 +128,10 @@ export function logout(callback: Function) {
128128
}
129129
}
130130

131-
function convertToISOStringDate(GMTStringDate: string) {
132-
return new Date(GMTStringDate).toISOString();
131+
function convertToISOStringDate(time: number) {
132+
if (time != null && !isNaN(time) && isFinite(time)) {
133+
return new Date(time).toISOString();
134+
} else {
135+
return "";
136+
}
133137
}

src/platforms/android/include.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ android {
99
}
1010

1111
dependencies {
12-
compile "com.facebook.android:facebook-android-sdk:4.22.0"
12+
compile "com.facebook.android:facebook-android-sdk:4.36.0"
1313
}

0 commit comments

Comments
 (0)