Potential fix for IllegalStateException on Android

yasirkula · Nov 14, 2023 · 87a5735 · 87a5735
1 parent 37ca85f
commit 87a5735
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCamera.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCamera.java
@@ -42,7 +42,7 @@ public static void TakePicture( Context context, NativeCameraMediaReceiver media
 		final Fragment request = new NativeCameraPictureFragment( mediaReceiver );
 		request.setArguments( bundle );
 
-		( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commit();
+		( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commitAllowingStateLoss();
 	}
 
 	public static void RecordVideo( Context context, NativeCameraMediaReceiver mediaReceiver, int defaultCamera, int quality, int maxDuration, long maxSize )
@@ -60,7 +60,7 @@ public static void RecordVideo( Context context, NativeCameraMediaReceiver media
 		final Fragment request = new NativeCameraVideoFragment( mediaReceiver );
 		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
@@ -121,7 +121,7 @@ public static void RequestPermission( Context context, final NativeCameraPermiss
 		final Fragment request = new NativeCameraPermissionFragment( permissionReceiver );
 		request.setArguments( bundle );
 
-		( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commit();
+		( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commitAllowingStateLoss();
 	}
 
 	public static String LoadImageAtPath( Context context, String path, final String temporaryFilePath, final int maxSize )

diff --git a/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCameraPermissionFragment.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCameraPermissionFragment.java
@@ -90,7 +90,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;
 		}
 
@@ -118,7 +118,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/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCameraPictureFragment.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCameraPictureFragment.java
@@ -210,6 +210,6 @@ public void onActivityResult( int requestCode, int resultCode, Intent data )
 		if( mediaReceiver != null )
 			mediaReceiver.OnMediaReceived( result != null && result.length() > 1L ? result.getAbsolutePath() : "" );
 
-		getFragmentManager().beginTransaction().remove( this ).commit();
+		getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();
 	}
 }
diff --git a/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCameraVideoFragment.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCameraVideoFragment.java
@@ -250,6 +250,6 @@ public void onActivityResult( int requestCode, int resultCode, Intent data )
 		if( mediaReceiver != null )
 			mediaReceiver.OnMediaReceived( result != null && result.length() > 1L ? result.getAbsolutePath() : "" );
 
-		getFragmentManager().beginTransaction().remove( this ).commit();
+		getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();
 	}
 }
diff --git a/Plugins/NativeCamera/Android/NativeCamera.aar b/Plugins/NativeCamera/Android/NativeCamera.aar
diff --git a/Plugins/NativeCamera/README.txt b/Plugins/NativeCamera/README.txt
@@ -1,4 +1,4 @@
-= Native Camera for Android & iOS (v1.4.1) =
+= Native Camera for Android & iOS (v1.4.2) =
 
 Documentation: https://github.com/yasirkula/UnityNativeCamera
 FAQ: https://github.com/yasirkula/UnityNativeCamera#faq

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.nativecamera",
   "displayName": "Native Camera",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "documentationUrl": "https://github.com/yasirkula/UnityNativeCamera",
   "changelogUrl": "https://github.com/yasirkula/UnityNativeCamera/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityNativeCamera/blob/master/LICENSE.txt",