From cf642da661634d5a853eef1030dda218cec3580f Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 16 Dec 2020 17:09:00 +0300 Subject: [PATCH 1/2] landing page --- lib/pages/landing/landing_page.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index f1ab7c46..2e972b6e 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -542,7 +542,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { } void setUserValues(value) async { - GifLoaderDialogUtils.hideDialog(context); + //GifLoaderDialogUtils.hideDialog(context); requestPermissions(); sharedPref.setObject(IMEI_USER_DATA, value); } From e312671e245e43422392c4f1b8beb1cbb8c0f6d9 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 16 Dec 2020 17:17:23 +0300 Subject: [PATCH 2/2] hot fixes --- lib/pages/landing/landing_page.dart | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 2e972b6e..5935617d 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -151,17 +151,18 @@ class _LandingPageState extends State with WidgetsBindingObserver { _firebaseMessaging.getToken().then((String token) async { sharedPref.setString(PUSH_TOKEN, token); - Future.delayed(Duration.zero, () async { - if (token != null && await sharedPref.getObject(USER_PROFILE) == null) { - DEVICE_TOKEN = token; - checkUserStatus(token); - } else if (await sharedPref.getObject(USER_PROFILE) != null) { - getNotificationCount(token); - } - }).catchError((err) { - print(err); - }); + + if (token != null && await sharedPref.getObject(USER_PROFILE) == null) { + DEVICE_TOKEN = token; + checkUserStatus(token); + } else if (projectViewModel.isLogin) { + getNotificationCount(token); + } + }).catchError((err) { + print(err); }); + requestPermissions(); + // }); // // //_firebase Background message handler Future.delayed(Duration.zero, () => setTheme()); @@ -543,7 +544,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { void setUserValues(value) async { //GifLoaderDialogUtils.hideDialog(context); - requestPermissions(); + sharedPref.setObject(IMEI_USER_DATA, value); }