DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash: GetPolicyFromPathForUser (#1826)

Browse Source
This commit is contained in:
Tian L 2022-05-09 08:33:09 +08:00 committed by GitHub
parent 4f6838fbd5
commit d070cbad64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CalcViewModel/Common/NavCategory.cpp
View File

@ -49,7 +49,7 @@ static constexpr int GRAPHING_ID = 17;
namespace // put the utils within this TU namespace // put the utils within this TU
{ {
Platform::Agile<Windows::System::User^> CurrentUser; Platform::String^ CurrentUserId;
std::mutex GraphingModeCheckMutex; std::mutex GraphingModeCheckMutex;
bool IsGraphingModeEnabled() bool IsGraphingModeEnabled()
@ -64,8 +64,14 @@ namespace // put the utils within this TU
} }
else else
{ {
auto user = User::GetFromId(CurrentUserId);
if (user == nullptr)
{
return true;
}
auto namedPolicyData = NamedPolicy::GetPolicyFromPathForUser( auto namedPolicyData = NamedPolicy::GetPolicyFromPathForUser(
CurrentUser.Get(), user,
L"Education", L"Education",
L"AllowGraphingCalculator"); L"AllowGraphingCalculator");
isEnabled = namedPolicyData->GetBoolean(); isEnabled = namedPolicyData->GetBoolean();
@ -310,10 +316,10 @@ NavCategoryGroup::NavCategoryGroup(const NavCategoryGroupInitializer& groupIniti
} }
} }
void NavCategoryStates::SetCurrentUser(Windows::System::User^ user) void NavCategoryStates::SetCurrentUser(Platform::String^ userId)
{ {
std::scoped_lock<std::mutex> lock(GraphingModeCheckMutex); std::scoped_lock<std::mutex> lock(GraphingModeCheckMutex);
CurrentUser = user; CurrentUserId = userId;
} }
IObservableVector<NavCategoryGroup ^> ^ NavCategoryStates::CreateMenuOptions() IObservableVector<NavCategoryGroup ^> ^ NavCategoryStates::CreateMenuOptions()

2
src/CalcViewModel/Common/NavCategory.h
View File

@ -152,7 +152,7 @@ namespace CalculatorApp::ViewModel
public ref class NavCategoryStates sealed public ref class NavCategoryStates sealed
{ {
public: public:
static void SetCurrentUser(Windows::System::User^ user); static void SetCurrentUser(Platform::String^ user);
static Windows::Foundation::Collections::IObservableVector<NavCategoryGroup ^> ^ CreateMenuOptions(); static Windows::Foundation::Collections::IObservableVector<NavCategoryGroup ^> ^ CreateMenuOptions();
static NavCategoryGroup ^ CreateCalculatorCategoryGroup(); static NavCategoryGroup ^ CreateCalculatorCategoryGroup();
static NavCategoryGroup ^ CreateConverterCategoryGroup(); static NavCategoryGroup ^ CreateConverterCategoryGroup();

3
src/Calculator/App.xaml.cs
View File

@ -85,7 +85,8 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
// If the app got pre-launch activated, then save that state in a flag // If the app got pre-launch activated, then save that state in a flag
m_preLaunched = true; m_preLaunched = true;
} }
NavCategoryStates.SetCurrentUser(args.User);
NavCategoryStates.SetCurrentUser(args.User.NonRoamableId);
// It takes time to check GraphingMode at the 1st time. So, do it in a background thread // It takes time to check GraphingMode at the 1st time. So, do it in a background thread
Task.Run(() => NavCategoryStates.IsViewModeEnabled(ViewMode.Graphing)); Task.Run(() => NavCategoryStates.IsViewModeEnabled(ViewMode.Graphing));