Potential fix for IllegalStateException on Android

yasirkula · yasirkula · commit b6e0fd9530e4 · 2023-11-14T23:58:20.000+03:00
diff --git a/./AAR Source (Android)/java/com/yasirkula/unity/NativeGallery.java b/./AAR Source (Android)/java/com/yasirkula/unity/NativeGallery.java
@@ -333,7 +333,7 @@ public static void PickMedia( Context context, final NativeGalleryMediaReceiver
 		final Fragment request = new NativeGalleryMediaPickerFragment( mediaReceiver );
 		request.setArguments( bundle );
 
-		( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commit();
+		( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commitAllowingStateLoss();
 	}
 
 	@TargetApi( Build.VERSION_CODES.M )
@@ -384,7 +384,7 @@ public static void RequestPermission( Context context, final NativeGalleryPermis
 		final Fragment request = new NativeGalleryPermissionFragment( permissionReceiver );
 		request.setArguments( bundle );
 
-		( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commit();
+		( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commitAllowingStateLoss();
 	}
 
 	// Credit: https://stackoverflow.com/a/35456817/2373034
diff --git a/./AAR Source (Android)/java/com/yasirkula/unity/NativeGalleryMediaPickerFragment.java b/./AAR Source (Android)/java/com/yasirkula/unity/NativeGalleryMediaPickerFragment.java
@@ -163,8 +163,8 @@ else if( resultCode != Activity.RESULT_OK || data == null )
 		}
 
 		if( resultFragment == null )
-			getFragmentManager().beginTransaction().remove( this ).commit();
+			getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();
 		else
-			getFragmentManager().beginTransaction().remove( this ).add( 0, resultFragment ).commit();
+			getFragmentManager().beginTransaction().remove( this ).add( 0, resultFragment ).commitAllowingStateLoss();
 	}
 }
diff --git a/./AAR Source (Android)/java/com/yasirkula/unity/NativeGalleryPermissionFragment.java b/./AAR Source (Android)/java/com/yasirkula/unity/NativeGalleryPermissionFragment.java
@@ -79,7 +79,7 @@ public void onRequestPermissionsResult( int requestCode, String[] permissions, i
 		{
 			Log.e( "Unity", "Fragment data got reset while asking permissions!" );
 
-			getFragmentManager().beginTransaction().remove( this ).commit();
+			getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();
 			return;
 		}
 
@@ -107,7 +107,7 @@ public void onRequestPermissionsResult( int requestCode, String[] permissions, i
 		}
 
 		permissionReceiver.OnPermissionResult( result );
-		getFragmentManager().beginTransaction().remove( this ).commit();
+		getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();
 
 		// Resolves a bug in Unity 2019 where the calling activity
 		// doesn't resume automatically after the fragment finishes
diff --git a/Plugins/NativeGallery/Android/NativeGallery.aar b/Plugins/NativeGallery/Android/NativeGallery.aar
diff --git a/Plugins/NativeGallery/README.txt b/Plugins/NativeGallery/README.txt
@@ -1,4 +1,4 @@
-= Native Gallery for Android & iOS (v1.7.6) =
+= Native Gallery for Android & iOS (v1.7.7) =
 
 Documentation: https://.com/yasirkula/UnityNativeGallery
 FAQ: https://.com/yasirkula/UnityNativeGallery#faq
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.nativegallery",
   "displayName": "Native Gallery",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "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
`@@ -333,7 +333,7 @@ public static void PickMedia( Context context, final NativeGalleryMediaReceiver`
`333`	`333`	`final Fragment request = new NativeGalleryMediaPickerFragment( mediaReceiver );`
`334`	`334`	`request.setArguments( bundle );`
`335`	`335`
`336`		`-( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commit();`
	`336`	`+( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commitAllowingStateLoss();`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`@TargetApi( Build.VERSION_CODES.M )`
`@@ -384,7 +384,7 @@ public static void RequestPermission( Context context, final NativeGalleryPermis`
`384`	`384`	`final Fragment request = new NativeGalleryPermissionFragment( permissionReceiver );`
`385`	`385`	`request.setArguments( bundle );`
`386`	`386`
`387`		`-( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commit();`
	`387`	`+( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commitAllowingStateLoss();`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`// Credit: https://stackoverflow.com/a/35456817/2373034`
Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,8 @@ else if( resultCode != Activity.RESULT_OK \|\| data == null )`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`if( resultFragment == null )`
`166`		`-getFragmentManager().beginTransaction().remove( this ).commit();`
	`166`	`+getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();`
`167`	`167`	`else`
`168`		`-getFragmentManager().beginTransaction().remove( this ).add( 0, resultFragment ).commit();`
	`168`	`+getFragmentManager().beginTransaction().remove( this ).add( 0, resultFragment ).commitAllowingStateLoss();`
`169`	`169`	`}`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void onRequestPermissionsResult( int requestCode, String[] permissions, i`
`79`	`79`	`{`
`80`	`80`	`Log.e( "Unity", "Fragment data got reset while asking permissions!" );`
`81`	`81`
`82`		`-getFragmentManager().beginTransaction().remove( this ).commit();`
	`82`	`+getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();`
`83`	`83`	`return;`
`84`	`84`	`}`
`85`	`85`
`@@ -107,7 +107,7 @@ public void onRequestPermissionsResult( int requestCode, String[] permissions, i`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`permissionReceiver.OnPermissionResult( result );`
`110`		`-getFragmentManager().beginTransaction().remove( this ).commit();`
	`110`	`+getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();`
`111`	`111`
`112`	`112`	`// Resolves a bug in Unity 2019 where the calling activity`
`113`	`113`	`// doesn't resume automatically after the fragment finishes`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-= Native Gallery for Android & iOS (v1.7.6) =`
	`1`	`+= Native Gallery for Android & iOS (v1.7.7) =`
`2`	`2`
`3`	`3`	`Documentation: https://.com/yasirkula/UnityNativeGallery`
`4`	`4`	`FAQ: https://.com/yasirkula/UnityNativeGallery#faq`
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.6",`
	`4`	`+"version": "1.7.7",`
`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",`