piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

analytics: Collect less data about controllers.

Browse Source 
The name field can contain personal information, particularly in the
case of bluetooth devices on OSX which get configured with the user's
full name.
This commit is contained in:
Scott Mansell 2016-06-22 01:33:53 +12:00
parent ce4e6804a5
commit 2ec3a24e4e
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Analytics.cpp
View File

@ -247,12 +247,10 @@ void DolphinAnalytics::MakePerGameBuilder()
builder.AddData("movie", Movie::IsMovieActive());
// Controller information
// We grab enough to tell what percentage of our users are playing with keyboard/mouse, some kind of gamepad
// or the official gamecube adapter.
builder.AddData("gcadapter-detected", GCAdapter::IsDetected());
// For privacy reasons, limit this to type of the first controller.
// The ControllersNeedToBeCreated() check is enough to ensure GetController(0) won't return nullptr or throw exceptions.
if (!Pad::GetConfig()->ControllersNeedToBeCreated())
builder.AddData("controller-type", Pad::GetConfig()->GetController(0)->default_device.name);
builder.AddData("has-controller", Pad::GetConfig()->IsControllerControlledByGamepadDevice(0) || GCAdapter::IsDetected());
m_per_game_builder = builder;
}

14
Source/Core/InputCommon/InputConfig.cpp
View File

@ -117,3 +117,17 @@ bool InputConfig::ControllersNeedToBeCreated() const
{
return m_controllers.empty();
}
bool InputConfig::IsControllerControlledByGamepadDevice(int index) const
{
if (static_cast<size_t>(index) >= m_controllers.size())
return false;
const auto& controller = m_controllers.at(index).get()->default_device;
// Filter out anything which obviously not a gamepad
return !((controller.source == "Keyboard") // OSX Keyboard/Mouse
|| (controller.source == "XInput2") // Linux and BSD Keyboard/Mouse
|| (controller.source == "Android" && controller.name == "Touchscreen") // Android Touchscreen
|| (controller.source == "DInput" && controller.name == "Keyboard Mouse")); // Windows Keyboard/Mouse
}

1
Source/Core/InputCommon/InputConfig.h
View File

@ -31,6 +31,7 @@ public:
ControllerEmu* GetController(int index);
void ClearControllers();
bool ControllersNeedToBeCreated() const;
bool IsControllerControlledByGamepadDevice(int index) const;
std::string GetGUIName() const { return m_gui_name; }
std::string GetProfileName() const { return m_profile_name; }