Fix opening zip files

Author: gave92

src/Files.App/Filesystem/StorageFileHelpers/StorageFileExtensions.cs

@@ -157,7 +157,7 @@ public async static Task<BaseStorageFile> DangerousGetFileFromPathAsync
 		public async static Task<StorageFileWithPath> DangerousGetFileWithPathFromPathAsync
 			(string value, StorageFolderWithPath rootFolder = null, StorageFolderWithPath parentFolder = null)
 		{
-			if (rootFolder is not null || parentFolder is not null)
+			if (rootFolder is not null)
 			{
 				var currComponents = GetDirectoryPathComponents(value);
 
@@ -175,7 +175,7 @@ public async static Task<StorageFileWithPath> DangerousGetFileWithPathFromPathAs
 					path = PathNormalization.Combine(path, file.Name);
 					return new StorageFileWithPath(file, path);
 				}
-				else if (rootFolder is not null && value.IsSubPathOf(rootFolder.Path))
+				else if (value.IsSubPathOf(rootFolder.Path))
 				{
 					var folder = rootFolder.Item;
 					var path = rootFolder.Path;
@@ -195,7 +195,7 @@ public async static Task<StorageFileWithPath> DangerousGetFileWithPathFromPathAs
 				: value;
 			var item = await BaseStorageFile.GetFileFromPathAsync(fullPath);
 
-			if (parentFolder is not null && parentFolder.Path.IsSubPathOf(value) && parentFolder.Item is IPasswordProtectedItem ppis && item is IPasswordProtectedItem ppid)
+			if (parentFolder is not null && parentFolder.Item is IPasswordProtectedItem ppis && item is IPasswordProtectedItem ppid)
 				ppid.Credentials = ppis.Credentials;
 
 			return new StorageFileWithPath(item);
@@ -211,11 +211,11 @@ public async static Task<BaseStorageFolder> DangerousGetFolderFromPathAsync
 		public async static Task<StorageFolderWithPath> DangerousGetFolderWithPathFromPathAsync
 			(string value, StorageFolderWithPath rootFolder = null, StorageFolderWithPath parentFolder = null)
 		{
-			if (rootFolder is not null || parentFolder is not null)
+			if (rootFolder is not null)
 			{
 				var currComponents = GetDirectoryPathComponents(value);
 
-				if (rootFolder is not null && rootFolder.Path == value)
+				if (rootFolder.Path == value)
 				{
 					return rootFolder;
 				}
@@ -231,7 +231,7 @@ public async static Task<StorageFolderWithPath> DangerousGetFolderWithPathFromPa
 					}
 					return new StorageFolderWithPath(folder, path);
 				}
-				else if (rootFolder is not null && value.IsSubPathOf(rootFolder.Path))
+				else if (value.IsSubPathOf(rootFolder.Path))
 				{
 					var folder = rootFolder.Item;
 					var path = rootFolder.Path;
@@ -249,7 +249,7 @@ public async static Task<StorageFolderWithPath> DangerousGetFolderWithPathFromPa
 				: value;
 			var item = await BaseStorageFolder.GetFolderFromPathAsync(fullPath);
 
-			if (parentFolder is not null && parentFolder.Path.IsSubPathOf(value) && parentFolder.Item is IPasswordProtectedItem ppis && item is IPasswordProtectedItem ppid)
+			if (parentFolder is not null && parentFolder.Item is IPasswordProtectedItem ppis && item is IPasswordProtectedItem ppid)
 				ppid.Credentials = ppis.Credentials;
 
 			return new StorageFolderWithPath(item);