- Bugfix for LoadImageAtPathAsync and GetVideoThumbnailAsync

yasirkula · yasirkula · commit 8ccd3b61397a · 2023-03-24T23:31:29.000+03:00
- Closed yasirkula#274
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://.com/yasirkula/UnityNativeGallery
 E-mail: yasirkula@gmail.com
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://.com/yasirkula/UnityNativeGallery",
   "changelogUrl": "https://.com/yasirkula/UnityNativeGallery/releases",
   "licensesUrl": "https://.com/yasirkula/UnityNativeGallery/blob/master/LICENSE.txt",

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void run()`
`32`	`32`	`if( resultOperation.finished )`
`33`	`33`	`{`
`34`	`34`	`resultOperation.sendResultToUnity();`
`35`		`-dismiss();`
	`35`	`+dismissAllowingStateLoss();`
`36`	`36`	`}`
`37`	`37`	`else`
`38`	`38`	`{`
`@@ -132,7 +132,7 @@ public void onClick( DialogInterface dialog, int which )`
`132`	`132`	`resultOperation.cancel();`
`133`	`133`	`resultOperation.sendResultToUnity();`
`134`	`134`
`135`		`-dismiss();`
	`135`	`+dismissAllowingStateLoss();`
`136`	`136`	`}`
`137`	`137`	`} )`
`138`	`138`	`.setCancelable( false )`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-= Native Gallery for Android & iOS (v1.7.1) =`
	`1`	`+= Native Gallery for Android & iOS (v1.7.2) =`
`2`	`2`
`3`	`3`	`Online documentation & example code available at: https://.com/yasirkula/UnityNativeGallery`
`4`	`4`	`E-mail: [email protected]`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.yasirkula.nativegallery",`
`3`	`3`	`"displayName": "Native Gallery",`
`4`		`-"version": "1.7.1",`
	`4`	`+"version": "1.7.2",`
`5`	`5`	`"documentationUrl": "https://.com/yasirkula/UnityNativeGallery",`
`6`	`6`	`"changelogUrl": "https://.com/yasirkula/UnityNativeGallery/releases",`
`7`	`7`	`"licensesUrl": "https://.com/yasirkula/UnityNativeGallery/blob/master/LICENSE.txt",`