Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 2aaffe7

Browse files
David BritchDavid Britch
authored andcommitted
Removed lazy creation of PermissionsService on iOS and Android.
1 parent f49518d commit 2aaffe7

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public override void OnTrimMemory([GeneratedEnum] TrimMemory level)
5757
public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
5858
{
5959
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
60-
((PermissionsService)PermissionsService.Current.Value).OnRequestPermissionResult(requestCode, permissions, grantResults);
60+
((PermissionsService)PermissionsService.Instance).OnRequestPermissionResult(requestCode, permissions, grantResults);
6161
}
6262
}
6363
}

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/LocationServiceImplementation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ public LocationServiceImplementation()
4444

4545
async Task<bool> CheckPermissionsAsync()
4646
{
47-
var status = await PermissionsService.Current.Value.CheckPermissionStatusAsync(Permission.Location);
47+
var status = await PermissionsService.Instance.CheckPermissionStatusAsync(Permission.Location);
4848
if (status != PermissionStatus.Granted)
4949
{
5050
Console.WriteLine("Currently do not have Location permissions, requesting permissions.");
5151

52-
var request = await PermissionsService.Current.Value.RequestPermissionsAsync(Permission.Location);
52+
var request = await PermissionsService.Instance.RequestPermissionsAsync(Permission.Location);
5353
if (request[Permission.Location] != PermissionStatus.Granted)
5454
{
5555
Console.WriteLine("Location permission denied.");

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/PermissionsService.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Collections.Generic;
99
using System.Diagnostics;
1010
using System.Linq;
11-
using System.Threading;
1211
using System.Threading.Tasks;
1312

1413
namespace eShopOnContainers.Droid.Services
@@ -21,7 +20,7 @@ public class PermissionsService : IPermissionsService
2120
Dictionary<Permission, PermissionStatus> _results;
2221
IList<string> _requestedPermissions;
2322

24-
public static Lazy<IPermissionsService> Current = new Lazy<IPermissionsService>(() => new PermissionsService(), LazyThreadSafetyMode.PublicationOnly);
23+
public static IPermissionsService Instance = new PermissionsService();
2524

2625
#region Internal Implementation
2726

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/LocationServiceImplementation.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ namespace eShopOnContainers.iOS.Services
1515
{
1616
public class LocationServiceImplementation : ILocationServiceImplementation
1717
{
18-
Lazy<IPermissionsService> _permissionsService;
18+
IPermissionsService _permissionsService;
1919

2020
public LocationServiceImplementation()
2121
{
2222
DesiredAccuracy = 100;
23-
_permissionsService = new Lazy<IPermissionsService>(() => new PermissionsService(), LazyThreadSafetyMode.PublicationOnly);
23+
_permissionsService = new PermissionsService();
2424
}
2525

2626
#region Internal Implementation
2727

2828
async Task<bool> CheckPermissions(Permission permission)
2929
{
30-
var status = await _permissionsService.Value.CheckPermissionStatusAsync(permission);
30+
var status = await _permissionsService.CheckPermissionStatusAsync(permission);
3131
if (status != PermissionStatus.Granted)
3232
{
3333
Console.WriteLine("Currently do not have Location permissions, requesting permissions");
3434

35-
var request = await _permissionsService.Value.RequestPermissionsAsync(permission);
35+
var request = await _permissionsService.RequestPermissionsAsync(permission);
3636
if (request[permission] != PermissionStatus.Granted)
3737
{
3838
Console.WriteLine("Location permission denied, can not get positions async.");

0 commit comments

Comments
 (0)