From 3a95ea37da8d010054105638112c3f61ba661db9 Mon Sep 17 00:00:00 2001 From: Stoyan Stratev Date: Tue, 11 Sep 2018 14:05:40 +0300 Subject: [PATCH] fix: possible exception when converting dates in android --- src/login-manager.android.ts | 12 ++++++++---- src/platforms/android/include.gradle | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/login-manager.android.ts b/src/login-manager.android.ts index 41a80e4..79cbec0 100644 --- a/src/login-manager.android.ts +++ b/src/login-manager.android.ts @@ -114,8 +114,8 @@ export function getCurrentAccessToken() { accessToken = new FacebookAccessToken(); accessToken.accessToken = sdkAccessToken.getToken(); accessToken.userId = sdkAccessToken.getUserId(); - accessToken.expirationDate = convertToISOStringDate(sdkAccessToken.getExpires().toGMTString()); - accessToken.refreshDate = convertToISOStringDate(sdkAccessToken.getLastRefresh().toGMTString()); + accessToken.expirationDate = convertToISOStringDate(sdkAccessToken.getExpires().getTime()); + accessToken.refreshDate = convertToISOStringDate(sdkAccessToken.getLastRefresh().getTime()); } return accessToken; @@ -128,6 +128,10 @@ export function logout(callback: Function) { } } -function convertToISOStringDate(GMTStringDate: string) { - return new Date(GMTStringDate).toISOString(); +function convertToISOStringDate(time: number) { + if (time != null && !isNaN(time) && isFinite(time)) { + return new Date(time).toISOString(); + } else { + return ""; + } } diff --git a/src/platforms/android/include.gradle b/src/platforms/android/include.gradle index 4b32ca5..13996ea 100644 --- a/src/platforms/android/include.gradle +++ b/src/platforms/android/include.gradle @@ -9,5 +9,5 @@ android { } dependencies { - compile "com.facebook.android:facebook-android-sdk:4.22.0" + compile "com.facebook.android:facebook-android-sdk:4.36.0" } \ No newline at end of file