Skip to content

Commit 5b0c08e

Browse files
committed
Fixed file browser not showing any contents in a folder if it contains a system-protected file/folder (happened with '.android_secure' folder on Android)
1 parent 62d49ea commit 5b0c08e

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

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.2) =
1+
= Simple File Browser (v1.6.3) =
22

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

Plugins/SimpleFileBrowser/Scripts/FileBrowserHelpers.cs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,29 @@ public static FileSystemEntry[] GetEntriesInDirectory( string path, bool extract
239239

240240
try
241241
{
242-
FileSystemInfo[] items = new DirectoryInfo( path ).GetFileSystemInfos();
243-
FileSystemEntry[] result = new FileSystemEntry[items.Length];
242+
string[] files = Directory.GetFiles( path );
243+
string[] subDirectories = Directory.GetDirectories( path );
244+
FileSystemEntry[] result = new FileSystemEntry[files.Length + subDirectories.Length];
244245
int index = 0;
245-
for( int i = 0; i < items.Length; i++ )
246+
for( int i = 0; i < files.Length; i++ )
246247
{
247248
try
248249
{
249-
result[index] = new FileSystemEntry( items[i], FileBrowser.GetExtensionFromFilename( items[i].Name, extractOnlyLastSuffixFromExtensions ) );
250+
FileInfo fileInfo = new FileInfo( files[i] );
251+
result[index] = new FileSystemEntry( fileInfo, FileBrowser.GetExtensionFromFilename( fileInfo.Name, extractOnlyLastSuffixFromExtensions ) );
252+
index++;
253+
}
254+
catch( System.Exception e )
255+
{
256+
Debug.LogException( e );
257+
}
258+
}
259+
260+
for( int i = 0; i < subDirectories.Length; i++ )
261+
{
262+
try
263+
{
264+
result[index] = new FileSystemEntry( new DirectoryInfo( subDirectories[i] ), string.Empty );
250265
index++;
251266
}
252267
catch( System.Exception e )

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.2",
4+
"version": "1.6.3",
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)