Browse Source

fix android file props (#21307)

pull/21320/head
Emmanuel Hansen 4 months ago
committed by GitHub
parent
commit
dcb607179b
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 24
      src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs

24
src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs

@ -546,8 +546,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
{
var projection = new[]
{
MediaStore.IMediaColumns.Size, MediaStore.IMediaColumns.DateAdded,
MediaStore.IMediaColumns.DateModified
Document.ColumnSize, Document.ColumnLastModified
};
using var cursor = Activity.ContentResolver!.Query(Uri, projection, null, null, null);
@ -555,7 +554,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
{
try
{
var columnIndex = cursor.GetColumnIndex(MediaStore.IMediaColumns.Size);
var columnIndex = cursor.GetColumnIndex(Document.ColumnSize);
if (columnIndex != -1)
{
size = (ulong)cursor.GetLong(columnIndex);
@ -569,22 +568,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
try
{
var columnIndex = cursor.GetColumnIndex(MediaStore.IMediaColumns.DateAdded);
if (columnIndex != -1)
{
var longValue = cursor.GetLong(columnIndex);
itemDate = longValue > 0 ? DateTimeOffset.FromUnixTimeMilliseconds(longValue) : null;
}
}
catch (Exception ex)
{
Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?
.Log(this, "File DateAdded metadata reader failed: '{Exception}'", ex);
}
try
{
var columnIndex = cursor.GetColumnIndex(MediaStore.IMediaColumns.DateModified);
var columnIndex = cursor.GetColumnIndex(Document.ColumnLastModified);
if (columnIndex != -1)
{
var longValue = cursor.GetLong(columnIndex);
@ -594,7 +578,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
catch (Exception ex)
{
Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?
.Log(this, "File DateAdded metadata reader failed: '{Exception}'", ex);
.Log(this, "File LastModified metadata reader failed: '{Exception}'", ex);
}
}
}

Loading…
Cancel
Save