- Fixed UnauthorizedAccessException on iOS

- Tiny performance optimization

Author: yasirkula

Plugins/SimpleFileBrowser/Android/FBCallbackHelper.cs

@@ -31,12 +31,14 @@ private void Update()
 			{
 				try
 				{
+					Action temp;
 					lock( this )
 					{
-						Action temp = mainThreadAction;
+						temp = mainThreadAction;
 						mainThreadAction = null;
-						temp();
 					}
+
+					temp();
 				}
 				finally
 				{

Plugins/SimpleFileBrowser/README.txt

@@ -1,4 +1,4 @@
-= Simple File Browser (v1.7.1) =
+= Simple File Browser (v1.7.2) =
 
 Documentation: https://github.com/yasirkula/UnitySimpleFileBrowser
 FAQ: https://github.com/yasirkula/UnitySimpleFileBrowser#faq

Plugins/SimpleFileBrowser/Scripts/EventSystemHandler.cs

@@ -48,9 +48,7 @@ private void OnDisable()
 
 		private void OnSceneLoaded( Scene scene, LoadSceneMode mode )
 		{
-#if UNITY_2017_2_OR_NEWER
 			DeactivateEventSystem();
-#endif
 			ActivateEventSystemIfNeeded();
 		}
 

Plugins/SimpleFileBrowser/Scripts/FileBrowser.cs

@@ -2102,16 +2102,16 @@ public void RefreshFiles( bool pathChanged )
 		}
 
 		// Returns whether or not the FileSystemEntry passes the file browser's filters and should be displayed in the files list
-		private bool FileSystemEntryMatchesFilters( FileSystemEntry item, bool allExtensionsHaveSingleSuffix )
+		private bool FileSystemEntryMatchesFilters( in FileSystemEntry item, bool allExtensionsHaveSingleSuffix )
 		{
+			if( ( item.Attributes & ignoredFileAttributes ) != 0 )
+				return false;
+
 			if( !item.IsDirectory )
 			{
 				if( m_pickerMode == PickMode.Folders )
 					return false;
 
-				if( ( item.Attributes & ignoredFileAttributes ) != 0 )
-					return false;
-
 				string extension = item.Extension;
 				if( excludedExtensionsSet.Contains( extension ) )
 					return false;
@@ -2130,11 +2130,6 @@ private bool FileSystemEntryMatchesFilters( FileSystemEntry item, bool allExtens
 				if( !filters[filtersDropdown.value].MatchesExtension( extension, !allExtensionsHaveSingleSuffix ) )
 					return false;
 			}
-			else
-			{
-				if( ( item.Attributes & ignoredFileAttributes ) != 0 )
-					return false;
-			}
 
 			if( m_searchString.Length > 0 && textComparer.IndexOf( item.Name, m_searchString, textCompareOptions ) < 0 )
 				return false;
@@ -2511,7 +2506,7 @@ internal void OnWindowDimensionsChanged( Vector2 size )
 			}
 		}
 
-		internal Sprite GetIconForFileEntry( FileSystemEntry fileInfo )
+		internal Sprite GetIconForFileEntry( in FileSystemEntry fileInfo )
 		{
 			return m_skin.GetIconForFileEntry( fileInfo, !AllExtensionsHaveSingleSuffix );
 		}

Plugins/SimpleFileBrowser/Scripts/FileBrowserHelpers.cs

@@ -3,7 +3,7 @@
 
 namespace SimpleFileBrowser
 {
-	public struct FileSystemEntry
+	public readonly struct FileSystemEntry
 	{
 		public readonly string Path;
 		public readonly string Name;
@@ -25,7 +25,15 @@ public FileSystemEntry( FileSystemInfo fileInfo, string extension )
 			Path = fileInfo.FullName;
 			Name = fileInfo.Name;
 			Extension = extension;
-			Attributes = fileInfo.Attributes;
+			try
+			{
+				Attributes = fileInfo.Attributes;
+			}
+			catch
+			{
+				/// I've encountered UnauthorizedAccessException while accessing <see cref="FileSystemInfo.Attributes"/> on iOS.
+				Attributes = ( fileInfo is DirectoryInfo ) ? FileAttributes.Directory : 0;
+			}
 		}
 	}
 

Plugins/SimpleFileBrowser/Scripts/UISkin.cs

@@ -620,7 +620,7 @@ public void ApplyTo( Scrollbar scrollbar )
 			scrollbar.image.color = m_scrollbarColor;
 		}
 
-		public Sprite GetIconForFileEntry( FileSystemEntry fileInfo, bool extensionMayHaveMultipleSuffixes )
+		public Sprite GetIconForFileEntry( in FileSystemEntry fileInfo, bool extensionMayHaveMultipleSuffixes )
 		{
 			if( !initializedFiletypeIcons )
 				InitializeFiletypeIcons();

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.simplefilebrowser",
   "displayName": "Simple File Browser",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "documentationUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser",
   "changelogUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/releases",
   "licensesUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/blob/master/LICENSE.txt",