- Fixed #16

- Fixed a possible NullPointerException on Android when selecting a new folder using SAF

Author: yasirkula

Assets/Plugins/SimpleFileBrowser/Android/SimpleFileBrowser.jar

@@ -796,11 +796,12 @@ private void OnOperationSuccessful( string path )
 
 			Hide();
 
-			if( onSuccess != null )
-				onSuccess( path );
-
+			OnSuccess _onSuccess = onSuccess;
 			onSuccess = null;
 			onCancel = null;
+
+			if( _onSuccess != null )
+				_onSuccess( path );
 		}
 
 		private void OnOperationCanceled( bool invokeCancelCallback )
@@ -810,11 +811,12 @@ private void OnOperationCanceled( bool invokeCancelCallback )
 
 			Hide();
 
-			if( invokeCancelCallback && onCancel != null )
-				onCancel();
-
+			OnCancel _onCancel = onCancel;
 			onSuccess = null;
 			onCancel = null;
+
+			if( invokeCancelCallback && _onCancel != null )
+				_onCancel();
 		}
 
 		public void OnPathChanged( string newPath )

Assets/Plugins/SimpleFileBrowser/Scripts/FileBrowser.cs

@@ -300,10 +300,15 @@ public static void ReadFromSAFEntry( Context context, String rawUri, String dest
 			}
 			finally
 			{
-				if( output != null )
-					output.close();
-
-				input.close();
+				try
+				{
+					if( output != null )
+						output.close();
+				}
+				finally
+				{
+					input.close();
+				}
 			}
 		}
 		catch( Exception e )

JAR Source/FileBrowser.java

@@ -56,7 +56,7 @@ public void onActivityResult( int requestCode, int resultCode, Intent data )
 
 		String rawUri = "";
 		String name = "";
-		if( resultCode == Activity.RESULT_OK )
+		if( resultCode == Activity.RESULT_OK && data != null )
 		{
 			Uri directoryUri = data.getData();
 			if( directoryUri != null )

JAR Source/FileBrowserDirectoryPickerFragment.java

@@ -115,4 +115,4 @@ public void onRequestPermissionsResult( int requestCode, String[] permissions, i
 			Log.e( "Unity", "Exception (resume):", e );
 		}
 	}
-}
+}