API Fixes

DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj

@@ -65,7 +65,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" />
@@ -74,8 +74,8 @@
     <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="27.0.2.1" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.devices" Version="2.5.20" />
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>

DeviceTests/DeviceTests.Shared/Barometer_Shared.cs

@@ -29,7 +29,7 @@ void Barometer_ReadingChanged(object sender, BarometerChangedEventArgs e)
 
             var d = await tcs.Task;
 
-            Assert.True(d.Pressure >= 0);
+            Assert.True(d.PressureInHectopascals >= 0);
             Barometer.Stop();
             Barometer.ReadingChanged -= Barometer_ReadingChanged;
         }

DeviceTests/DeviceTests.Shared/Battery_Tests.cs

@@ -42,5 +42,11 @@ public void Charge_Power()
 
             Assert.NotEqual(BatteryPowerSource.Unknown, Battery.PowerSource);
         }
+
+        [Fact]
+        public void App_Is_Not_Lower_Power_mode()
+        {
+            Assert.Equal(EnergySaverStatus.Off, Battery.EnergySaverStatus);
+        }
     }
 }

DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs

@@ -13,10 +13,7 @@ public Task Set_Clipboard_Values(string text)
         {
             return Utils.OnMainThread(async () =>
             {
-                Clipboard.SetText(text);
-
-                await Task.Delay(100);
-
+                await Clipboard.SetTextAsync(text);
                 Assert.True(Clipboard.HasText);
             });
         }
@@ -28,7 +25,7 @@ public Task Get_Clipboard_Values(string text)
         {
             return Utils.OnMainThread(async () =>
             {
-                Clipboard.SetText(text);
+                await Clipboard.SetTextAsync(text);
                 var clipText = await Clipboard.GetTextAsync();
 
                 Assert.NotNull(clipText);

DeviceTests/DeviceTests.Shared/Connectivity_Tests.cs

@@ -11,7 +11,7 @@ public void Network_Access() =>
             Assert.Equal(NetworkAccess.Internet, Connectivity.NetworkAccess);
 
         [Fact]
-        public void Profiles() =>
-            Assert.True(Connectivity.Profiles.Count() > 0);
+        public void ConnectionProfiles() =>
+            Assert.True(Connectivity.ConnectionProfiles.Count() > 0);
     }
 }

DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs

@@ -68,11 +68,11 @@ public void AppPackageName_Is_Correct()
         public void Platform_Is_Correct()
         {
 #if WINDOWS_UWP
-            Assert.Equal(DeviceInfo.Platforms.UWP, DeviceInfo.Platform);
+            Assert.Equal(DevicePlatform.UWP, DeviceInfo.Platform);
 #elif __IOS__
-            Assert.Equal(DeviceInfo.Platforms.iOS, DeviceInfo.Platform);
+            Assert.Equal(DevicePlatform.iOS, DeviceInfo.Platform);
 #elif __ANDROID__
-            Assert.Equal(DeviceInfo.Platforms.Android, DeviceInfo.Platform);
+            Assert.Equal(DevicePlatform.Android, DeviceInfo.Platform);
 #else
             throw new PlatformNotSupportedException();
 #endif
@@ -96,12 +96,56 @@ public Task Screen_Metrics_Are_Not_Null()
         {
             return Utils.OnMainThread(() =>
             {
-                var metrics = DeviceDisplay.ScreenMetrics;
+                var metrics = DeviceDisplay.MainDisplayInfo;
 
                 Assert.True(metrics.Width > 0);
                 Assert.True(metrics.Height > 0);
                 Assert.True(metrics.Density > 0);
             });
         }
+
+        [Fact]
+        public Task ScreenLock_Locks()
+        {
+            return Utils.OnMainThread(() =>
+            {
+                Assert.False(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = true;
+                Assert.True(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = false;
+                Assert.False(DeviceDisplay.KeepScreenOn);
+            });
+        }
+
+        [Fact]
+        public Task ScreenLock_Unlocks_Without_Locking()
+        {
+            return Utils.OnMainThread(() =>
+            {
+                Assert.False(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = false;
+                Assert.False(DeviceDisplay.KeepScreenOn);
+            });
+        }
+
+        [Fact]
+        public Task ScreenLock_Locks_Only_Once()
+        {
+            return Utils.OnMainThread(() =>
+            {
+                Assert.False(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = true;
+                Assert.True(DeviceDisplay.KeepScreenOn);
+                DeviceDisplay.KeepScreenOn = true;
+                Assert.True(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = false;
+                Assert.False(DeviceDisplay.KeepScreenOn);
+            });
+        }
     }
 }

DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj

@@ -29,17 +29,17 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.60" PrivateAssets="All" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.devices" Version="2.3.3" />
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <ProjectReference Include="..\..\Xamarin.Essentials\Xamarin.Essentials.csproj" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
     <SDKReference Include="WindowsMobile, Version=10.0.16299.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>

DeviceTests/DeviceTests.Shared/Geocoding_Tests.cs

@@ -9,7 +9,9 @@ public class Geocoding_Tests
     {
         public Geocoding_Tests()
         {
-            Geocoding.MapKey = "RJHqIE53Onrqons5CNOx~FrDr3XhjDTyEXEjng-CRoA~Aj69MhNManYUKxo6QcwZ0wmXBtyva0zwuHB04rFYAPf7qqGJ5cHb03RCDw1jIW8l";
+#if WINDOWS_UWP
+            Platform.MapServiceToken = "RJHqIE53Onrqons5CNOx~FrDr3XhjDTyEXEjng-CRoA~Aj69MhNManYUKxo6QcwZ0wmXBtyva0zwuHB04rFYAPf7qqGJ5cHb03RCDw1jIW8l";
+#endif
         }
 
         [Theory]

DeviceTests/DeviceTests.Shared/Maps_Tests.cs

@@ -15,7 +15,7 @@ public class Maps_Tests
         [Trait(Traits.InteractionType, Traits.InteractionTypes.Human)]
         public async Task LaunchMap_CoordinatesDisplayCorrectPlace()
         {
-            await Maps.OpenAsync(testLatitude, testLongitude, new MapsLaunchOptions { Name = mapName });
+            await Map.OpenAsync(testLatitude, testLongitude, new MapLaunchOptions { Name = mapName });
         }
 
         [Fact]
@@ -29,28 +29,28 @@ public async Task LaunchMap_PlacemarkDisplayCorrectPlace()
                 Thoroughfare = "Microsoft Building 25",
                 Locality = "Redmond"
             };
-            await Maps.OpenAsync(placemark, new MapsLaunchOptions { Name = mapName });
+            await Map.OpenAsync(placemark, new MapLaunchOptions { Name = mapName });
         }
 
         [Fact]
         public async Task LaunchMap_NullLocation()
         {
             Location location = null;
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location));
         }
 
         [Fact]
         public async Task LaunchMap_NullOptionsLocation()
         {
             var location = new Location(testLatitude, testLongitude);
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location, null));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location, null));
         }
 
         [Fact]
         public async Task LaunchMap_NullPlacemark()
         {
             Placemark location = null;
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location));
         }
 
         [Fact]
@@ -63,7 +63,7 @@ public async Task LaunchMap_NullOptionsPlacemark()
                 Thoroughfare = "Microsoft Building 25",
                 Locality = "Redmond"
             };
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(placemark, null));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(placemark, null));
         }
     }
 }

DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs

@@ -6,6 +6,11 @@ namespace DeviceTests
 {
     public class SecureStorage_Tests
     {
+        public SecureStorage_Tests()
+        {
+            SecureStorage.RemoveAll();
+        }
+
         [Theory]
         [InlineData("test.txt", "data", true, true)]
         [InlineData("noextension", "data2", true, false)]
@@ -40,6 +45,32 @@ public async Task Saves_And_Loads(string key, string data, bool emulatePreApi23,
             Assert.Equal(data, c);
         }
 
+#if __ANDROID__
+        [Theory]
+        [InlineData("test.txt", "data")]
+        public async Task Fix_Corrupt_Key(string key, string data)
+        {
+            // set a valid key
+            SecureStorage.AlwaysUseAsymmetricKeyStorage = true;
+            await SecureStorage.SetAsync(key, data);
+
+            // simulate corrupt the key
+            var prefKey = "SecureStorageKey";
+            var mainKey = "A2PfJSNdEDjM+422tpu7FqFcVQQbO3ti/DvnDnIqrq9CFwaBi6NdXYcicjvMW6nF7X/Clpto5xerM41U1H4qtWJDO0Ijc5QNTHGZl9tDSbXJ6yDCDDnEDryj2uTa8DiHoNcNX68QtcV3at4kkJKXXAwZXSC88a73/xDdh1u5gUdCeXJzVc5vOY6QpAGUH0bjR5NHrqEQNNGDdquFGN9n2ZJPsEK6C9fx0QwCIL+uldpAYSWrpmUIr+/0X7Y0mJpN84ldygEVxHLBuVrzB4Bbu5XGLUN/0Sr2plWcKm7XhM6wp3JRW6Eae2ozys42p1YLeM0HXWrhTqP6FRPkS6mOtw==";
+
+            Preferences.Set(prefKey, mainKey, SecureStorage.Alias);
+
+            var c = await SecureStorage.GetAsync(key);
+            Assert.Null(c);
+
+            // try to reset and get again
+            await SecureStorage.SetAsync(key, data);
+            c = await SecureStorage.GetAsync(key);
+
+            Assert.Equal(data, c);
+        }
+#endif
+
         [Theory]
         [InlineData(true)]
         [InlineData(false)]

DeviceTests/DeviceTests.Shared/Vibration_Tests.cs

@@ -17,7 +17,7 @@ public void Vibrate()
 #elif __IOS__
             // TODO: remove this as soon as the test harness can filter
             // the iOS simulator does not emulate a flashlight
-            if (DeviceInfo.DeviceType == DeviceType.Virtual && DeviceInfo.Platform == DeviceInfo.Platforms.iOS)
+            if (DeviceInfo.DeviceType == DeviceType.Virtual && DeviceInfo.Platform == DevicePlatform.iOS)
                 return;
 #endif
 
@@ -35,7 +35,7 @@ public void Vibrate_Cancel()
 #elif __IOS__
             // TODO: remove this as soon as the test harness can filter
             // the iOS simulator does not emulate a flashlight
-            if (DeviceInfo.DeviceType == DeviceType.Virtual && DeviceInfo.Platform == DeviceInfo.Platforms.iOS)
+            if (DeviceInfo.DeviceType == DeviceType.Virtual && DeviceInfo.Platform == DevicePlatform.iOS)
                 return;
 #endif
 

DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj

@@ -127,10 +127,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.devices" Version="2.3.3" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>

DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj

@@ -110,9 +110,9 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.devices" Version="2.5.20" />
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>

README.md

@@ -67,7 +67,6 @@ The following cross-platform APIs are available in Xamarin.Essentials:
 * [Open Browser](https://docs.microsoft.com/xamarin/essentials/open-browser)
 * [Orientation Sensor](https://docs.microsoft.com/en-us/xamarin/essentials/orientation-sensor)
 * [Phone Dialer](https://docs.microsoft.com/xamarin/essentials/phone-dialer)
-* [Power](https://docs.microsoft.com/en-us/xamarin/essentials/power)
 * [Preferences](https://docs.microsoft.com/xamarin/essentials/preferences)
 * [Screen Lock](https://docs.microsoft.com/xamarin/essentials/screen-lock)
 * [Secure Storage](https://docs.microsoft.com/xamarin/essentials/secure-storage)