Skip to content

Commit f0224ac

Browse files
0x5bfa0x5bfa
authored
Merge branch 'main' into 5bfa/CQ-Win32PInvokeVanara
2 parents 56b3cdb + 9e7b3f5 commit f0224ac

30 files changed

+574
-585
lines changed

‎.github/PRIVACY.md‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
11
# Privacy Policy
22

3-
###### Effective date: June 2, 2024
4-
5-
This Privacy Policy ("Policy") for Files ("we", "us", or "our") describes how and why we collect, store, use, and disclose information about users ("you", "your") when you use our services ("Services"), and our desktop application (the "Application", "Files"). By using our Services, you acknowledge and consent to the practices described in this Policy.
6-
7-
## Table of Contents
8-
9-
1. Information We Collect
10-
2. How We Use Your Information
11-
3. Changes to This Privacy Policy
12-
13-
## Information We Collect
14-
15-
**Diagnostic Information.** Our Application collects non-personably identifiable diagnostic data such as fault analysis and performance logs. This information may include technical details about your device, such as its make, model, operating system, and Application version. In addition, Files may store log files containing diagnostic information on the user's device. These files are not shared with us by default.
16-
17-
**Usage Information.** We collect non-identifiable information about your use of our Services, including but not limited to interactions within the Application, enabled user preferences (Application settings), and usage patterns. Our Application uses Sentry for error reporting, please review the Sentry Privacy Policy here: https://sentry.io/privacy/.
18-
19-
Furthermore, we use certain Microsoft services such as Microsoft Partner Center to collect usage data, to learn more about how data is collected, used, and disclosed by Microsoft and its subsidiaries, please review the Microsoft Privacy Policy Statement available here: https://privacy.microsoft.com/privacystatement
20-
21-
Please note that any information we collect is non-identifiable and does not include any personal data. We do not share collected information with any third parties.
22-
23-
## How We Use Collected Information
24-
25-
**Mitigate Reliability Issues.** We may use the aggregated information to diagnose and address any unexpected issues that may arise during the use of our Application. This may include analyzing diagnostic data, such as fault analysis and performance logs, to identify the root cause of the issue and develop a solution to resolve it.
26-
27-
**Identify Usage Trends.** We may use the information to identify and analyze usage trends for our Services and Application. This may include analyzing aggregated usage data to understand how users interact with our Services and to measure their utilization intensity. We may use this analysis to improve the functionality, usability, and performance of our Services and to inform future development decisions.
28-
29-
## Changes to This Privacy Policy
30-
31-
We may modify, update, or amend this Privacy Policy from time to time to reflect changes made to our Application. When we change this Policy in a material manner, we will inform you of such changes by updating the 'Effective date' notice. It is your responsibility to review this Privacy Policy periodically to stay informed of any updates. Your continued use of the Services after any modifications to this Policy constitutes your acceptance of such changes.
3+
The privacy policy has been moved to here https://files.community/privacy

‎src/Files.App (Package)/Files.Package.wapproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
</ProjectReference>
108108
</ItemGroup>
109109
<ItemGroup>
110-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" IncludeAssets="build" />
110+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.241107002" IncludeAssets="build" />
111111
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" IncludeAssets="build" />
112112
</ItemGroup>
113113
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />

‎src/Files.App (Package)/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Identity
1717
Name="FilesDev"
1818
Publisher="CN=Files"
19-
Version="3.7.11.0" />
19+
Version="3.7.12.0" />
2020

2121
<Properties>
2222
<DisplayName>Files - Dev</DisplayName>

‎src/Files.App.Controls/Files.App.Controls.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
20-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
20+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.241107002" />
2121
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
2222
</ItemGroup>
2323

‎src/Files.App.Controls/ThemedIcon/Styles/Icons.Misc16.xaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,36 @@
239239
</Setter>
240240
</Style>
241241

242+
243+
<Style
244+
x:Key="App.ThemedIcons.AltDataStream"
245+
BasedOn="{StaticResource DefaultThemedIconStyle}"
246+
TargetType="local:ThemedIcon">
247+
248+
249+
<Setter Property="IconSize" Value="16" />
250+
251+
<Setter Property="OutlineIconData" Value="M14.6,4.4l-3.9-3.9C10.4,0.2,10,0,9.6,0H6C4.9,0,4,0.9,4,2v4h1V2c0-0.6,0.4-1,1-1h3v3.5C9,5.3,9.7,6,10.5,6H14v7c0,0.6-0.4,1-1,1h-2c0,0.4-0.1,0.7-0.2,1H13c1.1,0,2-0.9,2-2V5.4C15,5,14.8,4.6,14.6,4.4z M10.5,5C10.2,5,10,4.8,10,4.5V1.2L13.8,5H10.5z M7.5,9h-5C2.2,9,2,9.2,2,9.5S2.2,10,2.5,10h5C7.8,10,8,9.8,8,9.5S7.8,9,7.5,9z M7.5,11h-5C2.2,11,2,11.2,2,11.5S2.2,12,2.5,12h5C7.8,12,8,11.8,8,11.5S7.8,11,7.5,11z M7.5,13h-5C2.2,13,2,13.2,2,13.5S2.2,14,2.5,14h5C7.8,14,8,13.8,8,13.5S7.8,13,7.5,13z M8,7H2C0.9,7,0,7.9,0,9v5c0,1.1,0.9,2,2,2h6c1.1,0,2-0.9,2-2V9C10,7.9,9.1,7,8,7z M9,14c0,0.6-0.4,1-1,1H2c-0.6,0-1-0.4-1-1V9c0-0.6,0.4-1,1-1h6c0.6,0,1,0.4,1,1V14z" />
252+
<Setter Property="FilledIconData" Value="M10.5,6C9.7,6,9,5.3,9,4.5V0H6C4.9,0,4,0.9,4,2v4h4c1.7,0,3,1.3,3,3v5c0,0.3-0.1,0.7-0.2,1l2.2,0c1.1,0,2-0.9,2-2V6H10.5z M10.5,5h4.2L10,0.2v4.2C10,4.8,10.2,5,10.5,5z M8,7H2C0.9,7,0,7.9,0,9v5c0,1.1,0.9,2,2,2h6c1.1,0,2-0.9,2-2V9C10,7.9,9.1,7,8,7z M7.5,14h-5C2.2,14,2,13.8,2,13.5S2.2,13,2.5,13h5C7.8,13,8,13.2,8,13.5S7.8,14,7.5,14z M7.5,12h-5C2.2,12,2,11.8,2,11.5S2.2,11,2.5,11h5C7.8,11,8,11.2,8,11.5S7.8,12,7.5,12z M7.5,10h-5C2.2,10,2,9.8,2,9.5S2.2,9,2.5,9h5C7.8,9,8,9.2,8,9.5S7.8,10,7.5,10z" />
253+
254+
<Setter Property="Layers">
255+
<Setter.Value>
256+
<local:ThemedIconLayers>
257+
<local:ThemedIconLayer
258+
LayerSize="16"
259+
LayerType="Alt"
260+
PathData="M9.5,0.5H6C5.2,0.5,4.5,1.2,4.5,2v4H8c1.7,0,3,1.3,3,3v5c0,0.2,0,0.3,0,0.5h2c0.8,0,1.5-0.7,1.5-1.5V5.5h-4c-0.6,0-1-0.4-1-1V0.5z" />
261+
<local:ThemedIconLayer
262+
LayerSize="16"
263+
LayerType="Base"
264+
PathData="M14.6,4.4l-3.9-3.9C10.4,0.2,10,0,9.6,0H6C4.9,0,4,0.9,4,2v4h1V2c0-0.6,0.4-1,1-1h3v3.5C9,5.3,9.7,6,10.5,6H14v7c0,0.6-0.4,1-1,1h-2c0,0.4-0.1,0.7-0.2,1H13c1.1,0,2-0.9,2-2V5.4C15,5,14.8,4.6,14.6,4.4z M10.5,5C10.2,5,10,4.8,10,4.5V1.2L13.8,5H10.5z M7.5,9h-5C2.2,9,2,9.2,2,9.5S2.2,10,2.5,10h5C7.8,10,8,9.8,8,9.5S7.8,9,7.5,9z M7.5,11h-5C2.2,11,2,11.2,2,11.5S2.2,12,2.5,12h5C7.8,12,8,11.8,8,11.5S7.8,11,7.5,11z M7.5,13h-5C2.2,13,2,13.2,2,13.5S2.2,14,2.5,14h5C7.8,14,8,13.8,8,13.5S7.8,13,7.5,13z" />
265+
<local:ThemedIconLayer
266+
LayerSize="16"
267+
LayerType="Accent"
268+
PathData="M10,9v5c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2V9c0-1.1,0.9-2,2-2h6C9.1,7,10,7.9,10,9zM9,9c0-0.6-0.4-1-1-1H2C1.4,8,1,8.4,1,9v5c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1V9z" />
269+
</local:ThemedIconLayers>
270+
</Setter.Value>
271+
</Setter>
272+
</Style>
273+
242274
</ResourceDictionary>

‎src/Files.App.CsWin32/NativeMethods.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,18 @@ CreateFile
141141
GetFileSizeEx
142142
WIN32_FIND_DATAW
143143
FILE_ACCESS_RIGHTS
144+
SHAddToRecentDocs
145+
SHARD
146+
BHID_EnumItems
147+
FOLDERID_RecycleBinFolder
148+
CoTaskMemFree
149+
SHGetIDListFromObject
150+
SHCreateItemFromIDList
151+
BHID_SFUIObject
152+
IContextMenu
153+
CMF_NORMAL
154+
CMF_OPTIMIZEFORINVOKE
155+
IApplicationDestinations
156+
ApplicationDestinations
157+
IApplicationDocumentLists
158+
ApplicationDocumentLists

‎src/Files.App.CsWin32/Windows.Win32.Extras.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) 2024 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
using System;
54
using System.Runtime.InteropServices;
65
using Windows.Win32.Foundation;
76

@@ -18,17 +17,4 @@ namespace UI.WindowsAndMessaging
1817
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
1918
public delegate LRESULT WNDPROC(HWND hWnd, uint msg, WPARAM wParam, LPARAM lParam);
2019
}
21-
22-
namespace UI.Shell
23-
{
24-
public static partial class FOLDERID
25-
{
26-
public readonly static Guid FOLDERID_RecycleBinFolder = new(0xB7534046, 0x3ECB, 0x4C18, 0xBE, 0x4E, 0x64, 0xCD, 0x4C, 0xB7, 0xD6, 0xAC);
27-
}
28-
29-
public static partial class BHID
30-
{
31-
public readonly static Guid BHID_EnumItems = new(0x94f60519, 0x2850, 0x4924, 0xaa, 0x5a, 0xd1, 0x5e, 0x84, 0x86, 0x80, 0x39);
32-
}
33-
}
3420
}

‎src/Files.App/Actions/FileSystem/CreateAlternateDataStreamAction.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ public string Label
1919
public string Description
2020
=> Strings.CreateAlternateDataStreamDescription.GetLocalizedResource();
2121

22+
public RichGlyph Glyph
23+
=> new RichGlyph(themedIconStyle: "App.ThemedIcons.AltDataStream");
24+
2225
public override bool IsExecutable =>
2326
context.HasSelection &&
2427
context.CanCreateItem &&

‎src/Files.App/App.xaml.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public static CommandBarFlyout? LastOpenedFlyout
3939
public static QuickAccessManager QuickAccessManager { get; private set; } = null!;
4040
public static StorageHistoryWrapper HistoryWrapper { get; private set; } = null!;
4141
public static FileTagsManager FileTagsManager { get; private set; } = null!;
42-
public static RecentItems RecentItemsManager { get; private set; } = null!;
4342
public static LibraryManager LibraryManager { get; private set; } = null!;
4443
public static AppModel AppModel { get; private set; } = null!;
4544
public static ILogger Logger { get; private set; } = null!;
@@ -114,7 +113,6 @@ async Task ActivateAsync()
114113
QuickAccessManager = Ioc.Default.GetRequiredService<QuickAccessManager>();
115114
HistoryWrapper = Ioc.Default.GetRequiredService<StorageHistoryWrapper>();
116115
FileTagsManager = Ioc.Default.GetRequiredService<FileTagsManager>();
117-
RecentItemsManager = Ioc.Default.GetRequiredService<RecentItems>();
118116
LibraryManager = Ioc.Default.GetRequiredService<LibraryManager>();
119117
Logger = Ioc.Default.GetRequiredService<ILogger<App>>();
120118
AppModel = Ioc.Default.GetRequiredService<AppModel>();

‎src/Files.App/Constants.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public static class ExternalUrl
202202
public const string DiscordUrl = @"https://discord.gg/files";
203203
public const string FeatureRequestUrl = @"https://github.com/files-community/Files/issues/new?labels=feature+request&template=feature_request.yml";
204204
public const string BugReportUrl = @"https://github.com/files-community/Files/issues/new?labels=bug&template=bug_report.yml";
205-
public const string PrivacyPolicyUrl = @"https://github.com/files-community/Files/blob/main/.github/PRIVACY.md";
205+
public const string PrivacyPolicyUrl = @"https://files.community/privacy";
206206
public const string SupportUsUrl = @"https://github.com/sponsors/yaira2";
207207
public const string CrowdinUrl = @"https://crowdin.com/project/files-app";
208208
}

0 commit comments

Comments
 (0)