@ -8,7 +8,10 @@ using System.Threading.Tasks;
using Android ; using Android ;
using Android.App ; using Android.App ;
using Android.Content ; using Android.Content ;
using Android.OS ;
using Android.Provider ; using Android.Provider ;
using Android.Webkit ;
using AndroidX.DocumentFile.Provider ;
using Avalonia.Logging ; using Avalonia.Logging ;
using Avalonia.Platform.Storage ; using Avalonia.Platform.Storage ;
using Java.Lang ; using Java.Lang ;
@ -22,20 +25,25 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
{ {
private Activity ? _ activity ; private Activity ? _ activity ;
private readonly bool _ needsExternalFilesPermission ; private readonly bool _ needsExternalFilesPermission ;
private readonly AndroidStorageFolder ? _ parent ;
private readonly AndroidUri ? _ permissionRoot ;
protected AndroidStorageItem ( Activity activity , AndroidUri uri , bool needsExternalFilesPermission ) protected AndroidStorageItem ( Activity activity , AndroidUri uri , bool needsExternalFilesPermission , AndroidStorageFolder ? parent = null , AndroidUri ? permissionRoot = null )
{ {
_ activity = activity ; _ activity = activity ;
_ needsExternalFilesPermission = needsExternalFilesPermission ; _ needsExternalFilesPermission = needsExternalFilesPermission ;
_ parent = parent ;
_ permissionRoot = permissionRoot ? ? parent ? . Uri ? ? Uri ;
Uri = uri ; Uri = uri ;
} }
internal AndroidUri Uri { get ; } internal AndroidUri Uri { get ; set ; }
protected Activity Activity = > _ activity ? ? throw new ObjectDisposedException ( nameof ( AndroidStorageItem ) ) ; protected Activity Activity = > _ activity ? ? throw new ObjectDisposedException ( nameof ( AndroidStorageItem ) ) ;
public virtual string Name = > GetColumnValue ( Activity , Uri , MediaStore . IMediaColumns . DisplayName ) public virtual string Name = > GetColumnValue ( Activity , Uri , MediaStore . IMediaColumns . DisplayName )
? ? Uri . PathSegments ? . LastOrDefault ( ) ? ? string . Empty ; ? ? Document ? . Name
? ? Uri . PathSegments ? . LastOrDefault ( ) ? . Split ( "/" , StringSplitOptions . RemoveEmptyEntries ) . LastOrDefault ( ) ? ? string . Empty ;
public Uri Path = > new ( Uri . ToString ( ) ! ) ; public Uri Path = > new ( Uri . ToString ( ) ! ) ;
@ -92,6 +100,23 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
return null ; return null ;
} }
if ( _ parent ! = null )
{
return _ parent ;
}
var document = Document ;
if ( document = = null )
{
return null ;
}
if ( document . ParentFile ! = null )
{
return new AndroidStorageFolder ( Activity , document . ParentFile . Uri , true ) ;
}
using var javaFile = new JavaFile ( Uri . Path ! ) ; using var javaFile = new JavaFile ( Uri . Path ! ) ;
// Java file represents files AND directories. Don't be confused.
// Java file represents files AND directories. Don't be confused.
@ -118,12 +143,88 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
{ {
_ activity = null ; _ activity = null ;
} }
internal DocumentFile ? Document
{
get
{
if ( this is AndroidStorageFile )
{
return DocumentFile . FromSingleUri ( Activity , Uri ) ;
}
else
{
return DocumentFile . FromTreeUri ( Activity , Uri ) ;
}
}
}
internal AndroidUri ? PermissionRoot = > _ permissionRoot ;
public abstract Task DeleteAsync ( ) ;
public abstract Task < IStorageItem ? > MoveAsync ( IStorageFolder destination ) ;
} }
internal class AndroidStorageFolder : AndroidStorageItem , IStorageBookmarkFolder internal class AndroidStorageFolder : AndroidStorageItem , IStorageBookmarkFolder
{ {
public AndroidStorageFolder ( Activity activity , AndroidUri uri , bool needsExternalFilesPermission ) : base ( activity , uri , needsExternalFilesPermission ) public AndroidStorageFolder ( Activity activity , AndroidUri uri , bool needsExternalFilesPermission , AndroidStorageFolder ? parent = null , AndroidUri ? permissionRoot = null ) : base ( activity , uri , needsExternalFilesPermission , parent , permissionRoot )
{
}
public async Task < IStorageFile ? > CreateFileAsync ( string name )
{
var mimeType = MimeTypeMap . Singleton ? . GetMimeTypeFromExtension ( MimeTypeMap . GetFileExtensionFromUrl ( name ) ) ? ? "application/octet-stream" ;
var newFile = Document . CreateFile ( mimeType , name ) ;
if ( newFile = = null )
{
return null ;
}
return new AndroidStorageFile ( Activity , newFile . Uri , this ) ;
}
public async Task < IStorageFolder ? > CreateFolderAsync ( string name )
{ {
var newFolder = Document ? . CreateDirectory ( name ) ;
if ( newFolder = = null )
{
return null ;
}
return new AndroidStorageFolder ( Activity , newFolder . Uri , false , this , PermissionRoot ) ;
}
public override async Task DeleteAsync ( )
{
if ( ! await EnsureExternalFilesPermission ( false ) )
{
return ;
}
if ( Activity ! = null )
{
await DeleteContents ( this ) ;
}
async Task DeleteContents ( AndroidStorageFolder storageFolder )
{
await foreach ( var file in storageFolder . GetItemsAsync ( ) )
{
if ( file is AndroidStorageFolder folder )
{
await DeleteContents ( folder ) ;
}
else if ( file is AndroidStorageFile storageFile )
{
await storageFile . DeleteAsync ( ) ;
}
}
DocumentFile . FromTreeUri ( Activity , storageFolder . Uri ) ? . Delete ( ) ;
}
} }
public override Task < StorageItemProperties > GetBasicPropertiesAsync ( ) public override Task < StorageItemProperties > GetBasicPropertiesAsync ( )
@ -131,22 +232,22 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
return Task . FromResult ( new StorageItemProperties ( ) ) ; return Task . FromResult ( new StorageItemProperties ( ) ) ;
} }
public async Task < IReadOnlyList < IStorageItem > > GetItemsAsync ( ) public async IAsyncEnumerable < IStorageItem > GetItemsAsync ( )
{ {
if ( ! await EnsureExternalFilesPermission ( false ) ) if ( ! await EnsureExternalFilesPermission ( false ) )
{ {
return Array . Empty < IStorageItem > ( ) ; yield break ;
} }
List < IStorageItem > files = new List < IStorageItem > ( ) ;
var contentResolver = Activity . ContentResolver ; var contentResolver = Activity . ContentResolver ;
if ( contentResolver = = null ) if ( contentResolver = = null )
{ {
return files ; yield break ;
} }
var childrenUri = DocumentsContract . BuildChildDocumentsUriUsingTree ( Uri ! , DocumentsContract . GetTreeDocumentId ( Uri ) ) ; var root = PermissionRoot ? ? Uri ;
var folderId = root ! = Uri ? DocumentsContract . GetDocumentId ( Uri ) : DocumentsContract . GetTreeDocumentId ( Uri ) ;
var childrenUri = DocumentsContract . BuildChildDocumentsUriUsingTree ( root , folderId ) ;
var projection = new [ ] var projection = new [ ]
{ {
@ -162,19 +263,55 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
{ {
var mime = cursor . GetString ( 1 ) ; var mime = cursor . GetString ( 1 ) ;
var id = cursor . GetString ( 0 ) ; var id = cursor . GetString ( 0 ) ;
var uri = DocumentsContract . BuildDocumentUriUsingTree ( Uri ! , id ) ;
bool isDirectory = mime = = DocumentsContract . Document . MimeTypeDir ;
var uri = DocumentsContract . BuildDocumentUriUsingTree ( root , id ) ;
if ( uri = = null ) if ( uri = = null )
{ {
continue ; continue ;
} }
yield return isDirectory ? new AndroidStorageFolder ( Activity , uri , false , this , root ) :
files . Add ( mime = = DocumentsContract . Document . MimeTypeDir ? new AndroidStorageFolder ( Activity , uri , false ) : new AndroidStorageFile ( Activity , uri , this , root ) ;
new AndroidStorageFile ( Activity , uri ) ) ;
} }
} }
}
public override async Task < IStorageItem ? > MoveAsync ( IStorageFolder destination )
{
if ( Activity ! = null )
{
return await MoveRecursively ( this , ( AndroidStorageFolder ) destination ) ;
}
return files ; return null ;
}
async Task < AndroidStorageFolder ? > MoveRecursively ( AndroidStorageFolder storageFolder , AndroidStorageFolder destination )
{
destination = await destination . CreateFolderAsync ( storageFolder . Name ) as AndroidStorageFolder ;
if ( destination = = null )
{
return null ;
}
await foreach ( var file in storageFolder . GetItemsAsync ( ) )
{
if ( file is AndroidStorageFolder folder )
{
await MoveRecursively ( folder , destination ) ;
}
else if ( file is AndroidStorageFile )
{
await file . MoveAsync ( destination ) ;
}
}
await storageFolder . DeleteAsync ( ) ;
return destination ;
}
}
} }
internal sealed class WellKnownAndroidStorageFolder : AndroidStorageFolder internal sealed class WellKnownAndroidStorageFolder : AndroidStorageFolder
@ -186,14 +323,14 @@ internal sealed class WellKnownAndroidStorageFolder : AndroidStorageFolder
} }
public override string Name { get ; } public override string Name { get ; }
} }
internal sealed class AndroidStorageFile : AndroidStorageItem , IStorageBookmarkFile internal sealed class AndroidStorageFile : AndroidStorageItem , IStorageBookmarkFile
{ {
public AndroidStorageFile ( Activity activity , AndroidUri uri ) : base ( activity , uri , false ) public AndroidStorageFile ( Activity activity , AndroidUri uri , AndroidStorageFolder ? parent = null , AndroidUri ? permissionRoot = null ) : base ( activity , uri , false , parent , permissionRoot )
{ {
} }
public Task < Stream > OpenReadAsync ( ) = > Task . FromResult ( OpenContentStream ( Activity , Uri , false ) public Task < Stream > OpenReadAsync ( ) = > Task . FromResult ( OpenContentStream ( Activity , Uri , false )
? ? throw new InvalidOperationException ( "Failed to open content stream" ) ) ; ? ? throw new InvalidOperationException ( "Failed to open content stream" ) ) ;
@ -317,4 +454,76 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
return Task . FromResult ( new StorageItemProperties ( size , itemDate , dateModified ) ) ; return Task . FromResult ( new StorageItemProperties ( size , itemDate , dateModified ) ) ;
} }
public override async Task DeleteAsync ( )
{
if ( ! await EnsureExternalFilesPermission ( false ) )
{
return ;
}
if ( Activity ! = null )
{
DocumentsContract . DeleteDocument ( Activity . ContentResolver ! , Uri ) ;
}
}
public override async Task < IStorageItem ? > MoveAsync ( IStorageFolder destination )
{
if ( ! await EnsureExternalFilesPermission ( false ) )
{
return null ;
}
if ( Activity ! = null & & destination is AndroidStorageFolder storageFolder )
{
if ( Build . VERSION . SdkInt > = BuildVersionCodes . N )
{
try
{
var uri = DocumentsContract . MoveDocument ( Activity . ContentResolver ! , Uri , ( ( await GetParentAsync ( ) ) as AndroidStorageFolder ) ! . Uri , storageFolder . Document ! . Uri ) ;
return new AndroidStorageFile ( Activity , uri , storageFolder ) ;
}
catch ( Exception ex )
{
// There are many reason why DocumentContract will fail to move a file. We fallback to copying.
return await MoveFileByCopy ( ) ;
}
}
else
{
return await MoveFileByCopy ( ) ;
}
}
async Task < AndroidStorageFile ? > MoveFileByCopy ( )
{
var newFile = await storageFolder . CreateFileAsync ( Name ) as AndroidStorageFile ;
try
{
if ( newFile ! = null )
{
using var input = await OpenReadAsync ( ) ;
using var output = await newFile . OpenWriteAsync ( ) ;
await input . CopyToAsync ( output ) ;
await DeleteAsync ( ) ;
return new AndroidStorageFile ( Activity , newFile . Uri , storageFolder ) ;
}
}
catch
{
newFile ? . DeleteAsync ( ) ;
}
return null ;
}
return null ;
}
} }
Max Katz
3 years ago
GitHub