Skip to content

Commit c84d108

Browse files
committed
Potential fix for IllegalStateException on Android
1 parent 5b0c08e commit c84d108

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public static void RequestPermission( Context context, final FileBrowserPermissi
185185
}
186186

187187
final Fragment request = new FileBrowserPermissionFragment( permissionReceiver );
188-
( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commit();
188+
( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commitAllowingStateLoss();
189189
}
190190

191191
// Returns whether or not Storage Access Framework (SAF) should be used
@@ -199,7 +199,7 @@ public static boolean CheckSAF()
199199
public static void PickSAFFolder( Context context, final FileBrowserDirectoryReceiver directoryReceiver )
200200
{
201201
final Fragment request = new FileBrowserDirectoryPickerFragment( directoryReceiver );
202-
( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commit();
202+
( (Activity) context ).getFragmentManager().beginTransaction().add( 0, request ).commitAllowingStateLoss();
203203
}
204204

205205
// Retrieves the previously picked Storage Access Framework (SAF) folder uris

.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowserDirectoryPickerFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ public void onActivityResult( int requestCode, int resultCode, Intent data )
8686
if( directoryReceiver != null )
8787
directoryReceiver.OnDirectoryPicked( rawUri, name );
8888

89-
getFragmentManager().beginTransaction().remove( this ).commit();
89+
getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();
9090
}
9191
}

.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowserPermissionFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void onRequestPermissionsResult( int requestCode, String[] permissions, i
7474
{
7575
Log.e( "Unity", "Fragment data got reset while asking permissions!" );
7676

77-
getFragmentManager().beginTransaction().remove( this ).commit();
77+
getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();
7878
return;
7979
}
8080

@@ -102,7 +102,7 @@ public void onRequestPermissionsResult( int requestCode, String[] permissions, i
102102
}
103103

104104
permissionReceiver.OnPermissionResult( result );
105-
getFragmentManager().beginTransaction().remove( this ).commit();
105+
getFragmentManager().beginTransaction().remove( this ).commitAllowingStateLoss();
106106

107107
// Resolves a bug in Unity 2019 where the calling activity
108108
// doesn't resume automatically after the fragment finishes
35 Bytes
Binary file not shown.

Plugins/SimpleFileBrowser/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= Simple File Browser (v1.6.3) =
1+
= Simple File Browser (v1.6.4) =
22

33
Documentation: https://github.com/yasirkula/UnitySimpleFileBrowser
44
FAQ: https://github.com/yasirkula/UnitySimpleFileBrowser#faq

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.yasirkula.simplefilebrowser",
33
"displayName": "Simple File Browser",
4-
"version": "1.6.3",
4+
"version": "1.6.4",
55
"documentationUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser",
66
"changelogUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/releases",
77
"licensesUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/blob/master/LICENSE.txt",

0 commit comments

Comments
 (0)