- Fixed UnauthorizedAccessException on iOS

yasirkula · yasirkula · commit d38e5f1e6da3 · 2025-04-07T21:49:43.000+03:00
- Tiny performance optimization
diff --git a/Plugins/SimpleFileBrowser/Android/FBCallbackHelper.cs b/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
 				{
diff --git a/Plugins/SimpleFileBrowser/README.txt b/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
diff --git a/Plugins/SimpleFileBrowser/Scripts/EventSystemHandler.cs b/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();
 		}
 
diff --git a/Plugins/SimpleFileBrowser/Scripts/FileBrowser.cs b/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 );
 		}
diff --git a/Plugins/SimpleFileBrowser/Scripts/FileBrowserHelpers.cs b/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;
+			}
 		}
 	}
 
diff --git a/Plugins/SimpleFileBrowser/Scripts/UISkin.cs b/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();
diff --git a/package.json b/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",

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,14 @@ private void Update()`
`31`	`31`	`{`
`32`	`32`	`try`
`33`	`33`	`{`
	`34`	`+ Action temp;`
`34`	`35`	`lock( this )`
`35`	`36`	`{`
`36`		`- Action temp = mainThreadAction;`
	`37`	`+ temp = mainThreadAction;`
`37`	`38`	`mainThreadAction = null;`
`38`		`- temp();`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ temp();`
`40`	`42`	`}`
`41`	`43`	`finally`
`42`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-= Simple File Browser (v1.7.1) =`
	`1`	`+= Simple File Browser (v1.7.2) =`
`2`	`2`
`3`	`3`	`Documentation: https://github.com/yasirkula/UnitySimpleFileBrowser`
`4`	`4`	`FAQ: https://github.com/yasirkula/UnitySimpleFileBrowser#faq`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,7 @@ private void OnDisable()`
`48`	`48`
`49`	`49`	`private void OnSceneLoaded( Scene scene, LoadSceneMode mode )`
`50`	`50`	`{`
`51`		`-#if UNITY_2017_2_OR_NEWER`
`52`	`51`	`DeactivateEventSystem();`
`53`		`-#endif`
`54`	`52`	`ActivateEventSystemIfNeeded();`
`55`	`53`	`}`
`56`	`54`
Original file line number	Diff line number	Diff line change
`@@ -2102,16 +2102,16 @@ public void RefreshFiles( bool pathChanged )`
`2102`	`2102`	`}`
`2103`	`2103`
`2104`	`2104`	`// Returns whether or not the FileSystemEntry passes the file browser's filters and should be displayed in the files list`
`2105`		`- private bool FileSystemEntryMatchesFilters( FileSystemEntry item, bool allExtensionsHaveSingleSuffix )`
	`2105`	`+ private bool FileSystemEntryMatchesFilters( in FileSystemEntry item, bool allExtensionsHaveSingleSuffix )`
`2106`	`2106`	`{`
	`2107`	`+ if( ( item.Attributes & ignoredFileAttributes ) != 0 )`
	`2108`	`+ return false;`
	`2109`	`+`
`2107`	`2110`	`if( !item.IsDirectory )`
`2108`	`2111`	`{`
`2109`	`2112`	`if( m_pickerMode == PickMode.Folders )`
`2110`	`2113`	`return false;`
`2111`	`2114`
`2112`		`- if( ( item.Attributes & ignoredFileAttributes ) != 0 )`
`2113`		`- return false;`
`2114`		`-`
`2115`	`2115`	`string extension = item.Extension;`
`2116`	`2116`	`if( excludedExtensionsSet.Contains( extension ) )`
`2117`	`2117`	`return false;`
`@@ -2130,11 +2130,6 @@ private bool FileSystemEntryMatchesFilters( FileSystemEntry item, bool allExtens`
`2130`	`2130`	`if( !filters[filtersDropdown.value].MatchesExtension( extension, !allExtensionsHaveSingleSuffix ) )`
`2131`	`2131`	`return false;`
`2132`	`2132`	`}`
`2133`		`- else`
`2134`		`- {`
`2135`		`- if( ( item.Attributes & ignoredFileAttributes ) != 0 )`
`2136`		`- return false;`
`2137`		`- }`
`2138`	`2133`
`2139`	`2134`	`if( m_searchString.Length > 0 && textComparer.IndexOf( item.Name, m_searchString, textCompareOptions ) < 0 )`
`2140`	`2135`	`return false;`
`@@ -2511,7 +2506,7 @@ internal void OnWindowDimensionsChanged( Vector2 size )`
`2511`	`2506`	`}`
`2512`	`2507`	`}`
`2513`	`2508`
`2514`		`- internal Sprite GetIconForFileEntry( FileSystemEntry fileInfo )`
	`2509`	`+ internal Sprite GetIconForFileEntry( in FileSystemEntry fileInfo )`
`2515`	`2510`	`{`
`2516`	`2511`	`return m_skin.GetIconForFileEntry( fileInfo, !AllExtensionsHaveSingleSuffix );`
`2517`	`2512`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace SimpleFileBrowser`
`5`	`5`	`{`
`6`		`- public struct FileSystemEntry`
	`6`	`+ public readonly struct FileSystemEntry`
`7`	`7`	`{`
`8`	`8`	`public readonly string Path;`
`9`	`9`	`public readonly string Name;`
`@@ -25,7 +25,15 @@ public FileSystemEntry( FileSystemInfo fileInfo, string extension )`
`25`	`25`	`Path = fileInfo.FullName;`
`26`	`26`	`Name = fileInfo.Name;`
`27`	`27`	`Extension = extension;`
`28`		`- Attributes = fileInfo.Attributes;`
	`28`	`+ try`
	`29`	`+ {`
	`30`	`+ Attributes = fileInfo.Attributes;`
	`31`	`+ }`
	`32`	`+ catch`
	`33`	`+ {`
	`34`	`+ /// I've encountered UnauthorizedAccessException while accessing <see cref="FileSystemInfo.Attributes"/> on iOS.`
	`35`	`+ Attributes = ( fileInfo is DirectoryInfo ) ? FileAttributes.Directory : 0;`
	`36`	`+ }`
`29`	`37`	`}`
`30`	`38`	`}`
`31`	`39`
Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ public void ApplyTo( Scrollbar scrollbar )`
`620`	`620`	`scrollbar.image.color = m_scrollbarColor;`
`621`	`621`	`}`
`622`	`622`
`623`		`- public Sprite GetIconForFileEntry( FileSystemEntry fileInfo, bool extensionMayHaveMultipleSuffixes )`
	`623`	`+ public Sprite GetIconForFileEntry( in FileSystemEntry fileInfo, bool extensionMayHaveMultipleSuffixes )`
`624`	`624`	`{`
`625`	`625`	`if( !initializedFiletypeIcons )`
`626`	`626`	`InitializeFiletypeIcons();`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.yasirkula.simplefilebrowser",`
`3`	`3`	`"displayName": "Simple File Browser",`
`4`		`- "version": "1.7.1",`
	`4`	`+ "version": "1.7.2",`
`5`	`5`	`"documentationUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser",`
`6`	`6`	`"changelogUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/releases",`
`7`	`7`	`"licensesUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/blob/master/LICENSE.txt",`