- Bugfix for LoadImageAtPathAsync and GetVideoThumbnailAsync

- Closed #274
yasirkula · Mar 24, 2023 · 8ccd3b6 · 8ccd3b6
1 parent 46eb0de
commit 8ccd3b6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/...AAR Source (Android)/java/com/yasirkula/unity/NativeGalleryMediaPickerResultFragment.java b/...AAR Source (Android)/java/com/yasirkula/unity/NativeGalleryMediaPickerResultFragment.java
@@ -32,7 +32,7 @@ public void run()
 			if( resultOperation.finished )
 			{
 				resultOperation.sendResultToUnity();
-				dismiss();
+				dismissAllowingStateLoss();
 			}
 			else
 			{
@@ -132,7 +132,7 @@ public void onClick( DialogInterface dialog, int which )
 						resultOperation.cancel();
 						resultOperation.sendResultToUnity();
 
-						dismiss();
+						dismissAllowingStateLoss();
 					}
 				} )
 				.setCancelable( false )

diff --git a/Plugins/NativeGallery/Android/NativeGallery.aar b/Plugins/NativeGallery/Android/NativeGallery.aar
diff --git a/Plugins/NativeGallery/NativeGallery.cs b/Plugins/NativeGallery/NativeGallery.cs
@@ -806,9 +806,11 @@ public static async Task<Texture2D> LoadImageAtPathAsync( string imagePath, int
 			maxSize = SystemInfo.maxTextureSize;
 
 #if !UNITY_EDITOR && UNITY_ANDROID
-		string loadPath = await TryCallNativeAndroidFunctionOnSeparateThread( () => AJC.CallStatic<string>( "LoadImageAtPath", Context, imagePath, TemporaryImagePath, maxSize ) );
+		string temporaryImagePath = TemporaryImagePath; // Must be accessed from main thread
+		string loadPath = await TryCallNativeAndroidFunctionOnSeparateThread( () => AJC.CallStatic<string>( "LoadImageAtPath", Context, imagePath, temporaryImagePath, maxSize ) );
 #elif !UNITY_EDITOR && UNITY_IOS
-		string loadPath = await Task.Run( () => _NativeGallery_LoadImageAtPath( imagePath, TemporaryImagePath, maxSize ) );
+		string temporaryImagePath = TemporaryImagePath; // Must be accessed from main thread
+		string loadPath = await Task.Run( () => _NativeGallery_LoadImageAtPath( imagePath, temporaryImagePath, maxSize ) );
 #else
 		string loadPath = imagePath;
 #endif
@@ -941,9 +943,11 @@ public static async Task<Texture2D> GetVideoThumbnailAsync( string videoPath, in
 			maxSize = SystemInfo.maxTextureSize;
 
 #if !UNITY_EDITOR && UNITY_ANDROID
-		string thumbnailPath = await TryCallNativeAndroidFunctionOnSeparateThread( () => AJC.CallStatic<string>( "GetVideoThumbnail", Context, videoPath, TemporaryImagePath + ".png", false, maxSize, captureTimeInSeconds ) );
+		string temporaryImagePath = TemporaryImagePath; // Must be accessed from main thread
+		string thumbnailPath = await TryCallNativeAndroidFunctionOnSeparateThread( () => AJC.CallStatic<string>( "GetVideoThumbnail", Context, videoPath, temporaryImagePath + ".png", false, maxSize, captureTimeInSeconds ) );
 #elif !UNITY_EDITOR && UNITY_IOS
-		string thumbnailPath = await Task.Run( () => _NativeGallery_GetVideoThumbnail( videoPath, TemporaryImagePath + ".png", maxSize, captureTimeInSeconds ) );
+		string temporaryImagePath = TemporaryImagePath; // Must be accessed from main thread
+		string thumbnailPath = await Task.Run( () => _NativeGallery_GetVideoThumbnail( videoPath, temporaryImagePath + ".png", maxSize, captureTimeInSeconds ) );
 #else
 		string thumbnailPath = null;
 #endif

diff --git a/Plugins/NativeGallery/README.txt b/Plugins/NativeGallery/README.txt
@@ -1,4 +1,4 @@
-= Native Gallery for Android & iOS (v1.7.1) =
+= Native Gallery for Android & iOS (v1.7.2) =
 
 Online documentation & example code available at: https://github.com/yasirkula/UnityNativeGallery
 E-mail: [email protected]

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.nativegallery",
   "displayName": "Native Gallery",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "documentationUrl": "https://github.com/yasirkula/UnityNativeGallery",
   "changelogUrl": "https://github.com/yasirkula/UnityNativeGallery/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityNativeGallery/blob/master/LICENSE.txt",