From ae2ebf6382c2cd0089d73e51274c40f1c155ae81 Mon Sep 17 00:00:00 2001 From: yasirkula Date: Sat, 9 Mar 2024 00:01:02 +0300 Subject: [PATCH] Potential fix for #313 ("No such proxy method" error) --- .../NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs | 2 ++ Plugins/NativeGallery/Android/NGPermissionCallbackAndroid.cs | 2 ++ Plugins/NativeGallery/NativeGallery.cs | 4 ++-- Plugins/NativeGallery/README.txt | 2 +- Plugins/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs | 2 ++ Plugins/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs | 2 ++ Plugins/NativeGallery/iOS/NGPermissionCallbackiOS.cs | 1 + package.json | 2 +- 8 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Plugins/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs b/Plugins/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs index 853d6ed..f38c628 100644 --- a/Plugins/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs +++ b/Plugins/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs @@ -17,11 +17,13 @@ public NGMediaReceiveCallbackAndroid( NativeGallery.MediaPickCallback callback, callbackHelper = new GameObject( "NGCallbackHelper" ).AddComponent(); } + [UnityEngine.Scripting.Preserve] public void OnMediaReceived( string path ) { callbackHelper.CallOnMainThread( () => callback( !string.IsNullOrEmpty( path ) ? path : null ) ); } + [UnityEngine.Scripting.Preserve] public void OnMultipleMediaReceived( string paths ) { string[] result = null; diff --git a/Plugins/NativeGallery/Android/NGPermissionCallbackAndroid.cs b/Plugins/NativeGallery/Android/NGPermissionCallbackAndroid.cs index 3255a48..71d6b41 100644 --- a/Plugins/NativeGallery/Android/NGPermissionCallbackAndroid.cs +++ b/Plugins/NativeGallery/Android/NGPermissionCallbackAndroid.cs @@ -15,6 +15,7 @@ public NGPermissionCallbackAndroid( object threadLock ) : base( "com.yasirkula.u this.threadLock = threadLock; } + [UnityEngine.Scripting.Preserve] public void OnPermissionResult( int result ) { Result = result; @@ -37,6 +38,7 @@ public NGPermissionCallbackAsyncAndroid( NativeGallery.PermissionCallback callba callbackHelper = new GameObject( "NGCallbackHelper" ).AddComponent(); } + [UnityEngine.Scripting.Preserve] public void OnPermissionResult( int result ) { callbackHelper.CallOnMainThread( () => callback( (NativeGallery.Permission) result ) ); diff --git a/Plugins/NativeGallery/NativeGallery.cs b/Plugins/NativeGallery/NativeGallery.cs index 707024a..e080f97 100644 --- a/Plugins/NativeGallery/NativeGallery.cs +++ b/Plugins/NativeGallery/NativeGallery.cs @@ -596,13 +596,13 @@ private static Permission GetMediaFromGallery( MediaPickCallback callback, Media if( ( mediaType & MediaType.Video ) == MediaType.Video ) { editorFilters.Add( "Video files" ); - editorFilters.Add( "mp4,mov,wav,avi" ); + editorFilters.Add( "mp4,mov,webm,avi" ); } if( ( mediaType & MediaType.Audio ) == MediaType.Audio ) { editorFilters.Add( "Audio files" ); - editorFilters.Add( "mp3,aac,flac" ); + editorFilters.Add( "mp3,wav,aac,flac" ); } editorFilters.Add( "All files" ); diff --git a/Plugins/NativeGallery/README.txt b/Plugins/NativeGallery/README.txt index 036e888..1fa882e 100644 --- a/Plugins/NativeGallery/README.txt +++ b/Plugins/NativeGallery/README.txt @@ -1,4 +1,4 @@ -= Native Gallery for Android & iOS (v1.7.9) = += Native Gallery for Android & iOS (v1.8.0) = Documentation: https://github.com/yasirkula/UnityNativeGallery FAQ: https://github.com/yasirkula/UnityNativeGallery#faq diff --git a/Plugins/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs b/Plugins/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs index cc19572..e30081f 100644 --- a/Plugins/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs +++ b/Plugins/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs @@ -63,6 +63,7 @@ private void Update() } } + [UnityEngine.Scripting.Preserve] public void OnMediaReceived( string path ) { IsBusy = false; @@ -77,6 +78,7 @@ public void OnMediaReceived( string path ) _callback( path ); } + [UnityEngine.Scripting.Preserve] public void OnMultipleMediaReceived( string paths ) { IsBusy = false; diff --git a/Plugins/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs b/Plugins/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs index f356d4f..222965b 100644 --- a/Plugins/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs +++ b/Plugins/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs @@ -21,6 +21,7 @@ public static void Initialize( NativeGallery.MediaSaveCallback callback ) instance.callback = callback; } + [UnityEngine.Scripting.Preserve] public void OnMediaSaveCompleted( string message ) { NativeGallery.MediaSaveCallback _callback = callback; @@ -30,6 +31,7 @@ public void OnMediaSaveCompleted( string message ) _callback( true, null ); } + [UnityEngine.Scripting.Preserve] public void OnMediaSaveFailed( string error ) { NativeGallery.MediaSaveCallback _callback = callback; diff --git a/Plugins/NativeGallery/iOS/NGPermissionCallbackiOS.cs b/Plugins/NativeGallery/iOS/NGPermissionCallbackiOS.cs index ec26487..1936f76 100644 --- a/Plugins/NativeGallery/iOS/NGPermissionCallbackiOS.cs +++ b/Plugins/NativeGallery/iOS/NGPermissionCallbackiOS.cs @@ -21,6 +21,7 @@ public static void Initialize( NativeGallery.PermissionCallback callback ) instance.callback = callback; } + [UnityEngine.Scripting.Preserve] public void OnPermissionRequested( string message ) { NativeGallery.PermissionCallback _callback = callback; diff --git a/package.json b/package.json index c34468e..ed00c08 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.yasirkula.nativegallery", "displayName": "Native Gallery", - "version": "1.7.9", + "version": "1.8.0", "documentationUrl": "https://github.com/yasirkula/UnityNativeGallery", "changelogUrl": "https://github.com/yasirkula/UnityNativeGallery/releases", "licensesUrl": "https://github.com/yasirkula/UnityNativeGallery/blob/master/LICENSE.txt",