Android LocationService refactoring.

Author: David Britch

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Location/ActivityType.cs

@@ -11,6 +11,6 @@ public interface ILocationServiceImplementation
         bool IsGeolocationAvailable { get; }
         bool IsGeolocationEnabled { get; }
 
-        Task<Position> GetPositionAsync(TimeSpan? timeout = null, CancellationToken? token = null, bool includeHeading = false);
+        Task<Position> GetPositionAsync(TimeSpan? timeout = null, CancellationToken? token = null);
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Location/Address.cs

@@ -10,6 +10,7 @@
 using System;
 using Xamarin.Forms.Platform.Android;
 using eShopOnContainers.Droid.Services;
+using eShopOnContainers.Core.Services.Permissions;
 
 namespace eShopOnContainers.Droid.Activities
 {
@@ -20,6 +21,8 @@ namespace eShopOnContainers.Droid.Activities
         ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity : FormsAppCompatActivity
     {
+        public static IPermissionsService PermissionsService = new PermissionsService();
+
         protected override void OnCreate(Bundle bundle)
         {
             FormsAppCompatActivity.ToolbarResource = Resource.Layout.Toolbar;
@@ -57,7 +60,7 @@ public override void OnTrimMemory([GeneratedEnum] TrimMemory level)
         public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
         {
             base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-            PermissionsService.Instance.OnRequestPermissionResult(requestCode, permissions, grantResults);
+            ((PermissionsService)PermissionsService).OnRequestPermissionResult(requestCode, permissions, grantResults);
         }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Location/ListenerSettings.cs

@@ -59,7 +59,6 @@ internal static bool IsBetterLocation(this Android.Locations.Location location,
             var isLessAccurate = accuracyDelta > 0;
             var isMoreAccurate = accuracyDelta < 0;
             var isSignificantlyLessAccurage = accuracyDelta > 200;
-
             var isFromSameProvider = IsSameProvider(location.Provider, bestLocation.Provider);
 
             if (isMoreAccurate)

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Location/PositionErrorEventArgs.cs

@@ -26,7 +26,6 @@ public GeolocationSingleListener(LocationManager manager, float desiredAccuracy,
         {
             _desiredAccuracy = desiredAccuracy;
             _finishedCallback = finishedCallback;
-
             _activeProviders = new HashSet<string>(activeProviders);
 
             foreach (var provider in activeProviders)
@@ -36,7 +35,6 @@ public GeolocationSingleListener(LocationManager manager, float desiredAccuracy,
                     _bestLocation = location;
             }
 
-
             if (timeout != Timeout.Infinite)
                 _timer = new Timer(TimesUp, null, timeout, 0);
         }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Location/PositionEventArgs.cs

@@ -4,14 +4,14 @@
 using System;
 using eShopOnContainers.Core.Services.Location;
 using eShopOnContainers.Core.Models.Location;
-using eShopOnContainers.Core.Services.Permissions;
 using eShopOnContainers.Core.Models.Permissions;
 using System.Threading;
 using System.Threading.Tasks;
 using Android.Locations;
 using System.Linq;
 using System.Collections.Generic;
 using Android.OS;
+using eShopOnContainers.Droid.Activities;
 
 [assembly: Xamarin.Forms.Dependency(typeof(LocationServiceImplementation))]
 namespace eShopOnContainers.Droid.Services
@@ -45,20 +45,18 @@ public LocationServiceImplementation()
 
         async Task<bool> CheckPermissionsAsync()
         {
-            IPermissionsService permissionsService = new PermissionsService();
-            var status = await permissionsService.CheckPermissionStatusAsync(Permission.Location);
+            var status = await MainActivity.PermissionsService.CheckPermissionStatusAsync(Permission.Location);
             if (status != PermissionStatus.Granted)
             {
-                Console.WriteLine("Currently do not have Location permissions, requesting permissions");
+                Console.WriteLine("Currently do not have Location permissions, requesting permissions.");
 
-                var request = await permissionsService.RequestPermissionsAsync(Permission.Location);
+                var request = await MainActivity.PermissionsService.RequestPermissionsAsync(Permission.Location);
                 if (request[Permission.Location] != PermissionStatus.Granted)
                 {
                     Console.WriteLine("Location permission denied.");
                     return false;
                 }
             }
-
             return true;
         }
 
@@ -72,7 +70,7 @@ async Task<bool> CheckPermissionsAsync()
 
         public bool IsGeolocationEnabled => Providers.Any(p => !IgnoredProviders.Contains(p) && Manager.IsProviderEnabled(p));
 
-        public async Task<Position> GetPositionAsync(TimeSpan? timeout = null, CancellationToken? cancelToken = null, bool includeHeading = false)
+        public async Task<Position> GetPositionAsync(TimeSpan? timeout = null, CancellationToken? cancelToken = null)
         {
             var timeoutMilliseconds = timeout.HasValue ? (int)timeout.Value.TotalMilliseconds : Timeout.Infinite;
             if (timeoutMilliseconds <= 0 && timeoutMilliseconds != Timeout.Infinite)