Skip to content

Commit f30a865

Browse files
authored
Merge pull request xamarin#1231 from xamarin/dev/android-dep-fixes
Fixup some build 1.6.0 - dep warnings & update verison code
2 parents 3b5a9da + afc8408 commit f30a865

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

Xamarin.Essentials/AppInfo/AppInfo.android.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
using Android.Content.PM;
44
using Android.Content.Res;
55
using Android.Provider;
6+
#if __ANDROID_29__
7+
using AndroidX.Core.Content.PM;
8+
#else
9+
using Android.Support.V4.Content.PM;
10+
#endif
611

712
namespace Xamarin.Essentials
813
{
@@ -33,7 +38,13 @@ static string PlatformGetBuild()
3338
var packageName = Platform.AppContext.PackageName;
3439
using (var info = pm.GetPackageInfo(packageName, PackageInfoFlags.MetaData))
3540
{
41+
#if __ANDROID_28__
42+
return PackageInfoCompat.GetLongVersionCode(info).ToString(CultureInfo.InvariantCulture);
43+
#else
44+
#pragma warning disable CS0618 // Type or member is obsolete
3645
return info.VersionCode.ToString(CultureInfo.InvariantCulture);
46+
#pragma warning restore CS0618 // Type or member is obsolete
47+
#endif
3748
}
3849
}
3950

Xamarin.Essentials/Permissions/Permissions.macos.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public override Task<PermissionStatus> CheckStatusAsync() =>
2525
public override Task<PermissionStatus> RequestAsync() =>
2626
Task.FromResult(PermissionStatus.Granted);
2727

28+
public override bool ShouldShowRationale() => false;
29+
2830
public override void EnsureDeclared()
2931
{
3032
var plistKeys = RequiredInfoPlistKeys?.Invoke();

Xamarin.Essentials/Platform/Platform.android.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,9 @@ internal static Java.Util.Locale GetLocale()
221221
return config.Locales.Get(0);
222222
#endif
223223

224+
#pragma warning disable CS0618 // Type or member is obsolete
224225
return config.Locale;
226+
#pragma warning restore CS0618 // Type or member is obsolete
225227
}
226228

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

233235
if (HasApiLevelN)
236+
{
234237
config.SetLocale(locale);
238+
}
235239
else
240+
{
241+
#pragma warning disable CS0618 // Type or member is obsolete
236242
config.Locale = locale;
243+
#pragma warning restore CS0618 // Type or member is obsolete
244+
}
237245

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

0 commit comments

Comments
 (0)