Skip to content
This repository was archived by the owner on May 15, 2024. It is now read-only.

Fixup some build 1.6.0 - dep warnings & update verison code #1231

Merged
merged 5 commits into from
Apr 24, 2020
Merged

Fixup some build 1.6.0 - dep warnings & update verison code #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e4fe97
Fixup some dep warnings & update verison code
jamesmontemagno Apr 7, 2020
6c22354
Merge branch 'develop' into dev/android-dep-fixes
jamesmontemagno Apr 20, 2020
419f360
Merge branch '1.6.0' into dev/android-dep-fixes
Redth Apr 21, 2020
dfaabfa
Merge branch '1.6.0' into dev/android-dep-fixes
Redth Apr 21, 2020
afc8408
Fix build for permissions
jamesmontemagno Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Xamarin.Essentials/AppInfo/AppInfo.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
using Android.Content.PM;
using Android.Content.Res;
using Android.Provider;
#if __ANDROID_29__
using AndroidX.Core.Content.PM;
#else
using Android.Support.V4.Content.PM;
#endif

namespace Xamarin.Essentials
{
Expand Down Expand Up @@ -33,7 +38,13 @@ static string PlatformGetBuild()
var packageName = Platform.AppContext.PackageName;
using (var info = pm.GetPackageInfo(packageName, PackageInfoFlags.MetaData))
{
#if __ANDROID_28__
return PackageInfoCompat.GetLongVersionCode(info).ToString(CultureInfo.InvariantCulture);
#else
#pragma warning disable CS0618 // Type or member is obsolete
return info.VersionCode.ToString(CultureInfo.InvariantCulture);
#pragma warning restore CS0618 // Type or member is obsolete
#endif
}
}

Expand Down
2 changes: 2 additions & 0 deletions Xamarin.Essentials/Permissions/Permissions.macos.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public override Task<PermissionStatus> CheckStatusAsync() =>
public override Task<PermissionStatus> RequestAsync() =>
Task.FromResult(PermissionStatus.Granted);

public override bool ShouldShowRationale() => false;

public override void EnsureDeclared()
{
var plistKeys = RequiredInfoPlistKeys?.Invoke();
Expand Down
8 changes: 8 additions & 0 deletions Xamarin.Essentials/Platform/Platform.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ internal static Java.Util.Locale GetLocale()
return config.Locales.Get(0);
#endif

#pragma warning disable CS0618 // Type or member is obsolete
return config.Locale;
#pragma warning restore CS0618 // Type or member is obsolete
}

internal static void SetLocale(Java.Util.Locale locale)
Expand All @@ -231,9 +233,15 @@ internal static void SetLocale(Java.Util.Locale locale)
var config = resources.Configuration;

if (HasApiLevelN)
{
config.SetLocale(locale);
}
else
{
#pragma warning disable CS0618 // Type or member is obsolete
config.Locale = locale;
#pragma warning restore CS0618 // Type or member is obsolete
}

#pragma warning disable CS0618 // Type or member is obsolete
resources.UpdateConfiguration(config, resources.DisplayMetrics);
Expand Down