Merge branch 'sultan' into 'diplomatic-quarter-live'

Sultan

See merge request Cloud_Solution/diplomatic-quarter!196
dq_and_master
Mohammad Aljammal 5 years ago
commit 9b67b2632b

@ -151,17 +151,18 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
_firebaseMessaging.getToken().then((String token) async { _firebaseMessaging.getToken().then((String token) async {
sharedPref.setString(PUSH_TOKEN, token); sharedPref.setString(PUSH_TOKEN, token);
Future.delayed(Duration.zero, () async {
if (token != null && await sharedPref.getObject(USER_PROFILE) == null) { if (token != null && await sharedPref.getObject(USER_PROFILE) == null) {
DEVICE_TOKEN = token; DEVICE_TOKEN = token;
checkUserStatus(token); checkUserStatus(token);
} else if (await sharedPref.getObject(USER_PROFILE) != null) { } else if (projectViewModel.isLogin) {
getNotificationCount(token); getNotificationCount(token);
} }
}).catchError((err) { }).catchError((err) {
print(err); print(err);
});
}); });
requestPermissions();
// });
// //
// //_firebase Background message handler // //_firebase Background message handler
Future.delayed(Duration.zero, () => setTheme()); Future.delayed(Duration.zero, () => setTheme());
@ -542,8 +543,8 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
} }
void setUserValues(value) async { void setUserValues(value) async {
GifLoaderDialogUtils.hideDialog(context); //GifLoaderDialogUtils.hideDialog(context);
requestPermissions();
sharedPref.setObject(IMEI_USER_DATA, value); sharedPref.setObject(IMEI_USER_DATA, value);
} }

Loading…
Cancel
Save