fix merge issues

lib/pages/landing/landing_page.dart

@@ -4,7 +4,6 @@ import 'dart:typed_data';
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
-import 'package:diplomaticquarterapp/core/service/geofencing/GeofencingServices.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
 import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
@@ -17,11 +16,7 @@ import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
 import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart';
-import 'package:diplomaticquarterapp/uitl/HMGNetworkConnectivity.dart';
-import 'package:diplomaticquarterapp/uitl/HMG_Geofence.dart';
 import 'package:diplomaticquarterapp/uitl/LocalNotification.dart';
-import 'package:diplomaticquarterapp/uitl/PlatformBridge.dart';
-import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart';
@@ -49,8 +44,6 @@ class LandingPage extends StatefulWidget {
 }
 
 class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
-  var authProvider = new AuthProvider();
-
   int currentTab = 0;
   PageController pageController;
   ProjectViewModel projectProvider;
@@ -134,7 +127,6 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
   @override
   void initState() {
     super.initState();
-
     WidgetsBinding.instance.addObserver(this);
     //setState(() {
     AppGlobal.context = context;
@@ -143,46 +135,10 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
     pageController = PageController(keepPage: true);
     _firebaseMessaging.setAutoInitEnabled(true);
 
-    // HMG (Guest/Internet) Wifi Access [Zohaib Kambrani]
-    HMGNetworkConnectivity(context, () {
-      GifLoaderDialogUtils.showMyDialog(context);
-      PlatformBridge().connectHMGGuestWifi().then((value) => {GifLoaderDialogUtils.hideDialog(context)});
-    }).checkAndConnectIfNoInternet();
-
     if (Platform.isIOS) {
       _firebaseMessaging.requestNotificationPermissions();
     }
 
-    // Flip Permission Checks [Zohaib Kambrani]
-    requestPermissions().then((results) {
-      if (results[Permission.location].isGranted) {
-        debugPrint("Fetching GEO ZONES from HMG service...");
-        locator<GeofencingServices>().getAllGeoZones(GeoZonesRequestModel()).then((geoZones) {
-          debugPrint("Finished Fetching GEO ZONES from HMG service...");
-          debugPrint("GEO ZONES saved to AppPreferences with key '$HMG_GEOFENCES'");
-          authProvider.authenticatedUserObject.getUser().then((value) {
-            debugPrint(value.toString());
-          });
-          if (authProvider.authenticatedUserObject.user != null) {
-            projectViewModel.platformBridge().registerHmgGeofences();
-          }
-        });
-      }
-
-      if (results[Permission.notification].isGranted)
-        _firebaseMessaging.getToken().then((String token) {
-          sharedPref.setString(PUSH_TOKEN, token);
-          if (token != null && DEVICE_TOKEN == "") {
-            DEVICE_TOKEN = token;
-            checkUserStatus(token);
-          }
-        });
-
-      if (results[Permission.storage].isGranted) ;
-      if (results[Permission.camera].isGranted) ;
-      if (results[Permission.photos].isGranted) ;
-      if (results[Permission.accessMediaLocation].isGranted) ;
-      if (results[Permission.calendar].isGranted) ;
     _firebaseMessaging.getToken().then((String token) {
       sharedPref.setString(PUSH_TOKEN, token);
       if (token != null && DEVICE_TOKEN == "") {
@@ -193,7 +149,6 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
     }).catchError((err) {
       print(err);
     });
-
     //
     // //_firebase Background message handler
     // _firebaseMessaging.configure(
@@ -553,4 +508,3 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
     }
   }
 }
-