Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved avatar URL to fully private settings

Browse source
This commit is contained in:
ksuprynowicz 2024-03-23 20:41:22 +01:00
parent 225578febe
commit 16530b2334
7 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/PermissionChecker.java
View file

@ -109,7 +109,7 @@ public class PermissionChecker extends Activity {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
try { try {
obj.put("firstRun",false); obj.put("firstRun",false);
obj.put("Avatar/fullAvatarURL", avatarPaths[which]); obj.put(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/Avatar/fullAvatarURL", avatarPaths[which]);
File directory = new File(pathForJson); File directory = new File(pathForJson);
if(!directory.exists()) directory.mkdirs(); if(!directory.exists()) directory.mkdirs();

5
interface/src/CrashRecoveryHandler.cpp
View file

@ -258,10 +258,11 @@ void CrashRecoveryHandler::handleCrash(CrashRecoveryHandler::Action action) {
// Display name and avatar // Display name and avatar
settings.beginGroup(AVATAR_GROUP); settings.beginGroup(AVATAR_GROUP);
displayName = settings.value(DISPLAY_NAME_KEY).toString(); displayName = settings.value(DISPLAY_NAME_KEY).toString();
fullAvatarURL = settings.value(FULL_AVATAR_URL_KEY).toUrl();
fullAvatarModelName = settings.value(FULL_AVATAR_MODEL_NAME_KEY).toString(); fullAvatarModelName = settings.value(FULL_AVATAR_MODEL_NAME_KEY).toString();
settings.endGroup(); settings.endGroup();
fullAvatarURL = settings.value(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/" + AVATAR_GROUP + "/" + FULL_AVATAR_URL_KEY).toUrl();
// Tutorial complete // Tutorial complete
tutorialComplete = settings.value(TUTORIAL_COMPLETE_FLAG_KEY).toBool(); tutorialComplete = settings.value(TUTORIAL_COMPLETE_FLAG_KEY).toBool();
} }
@ -284,6 +285,8 @@ void CrashRecoveryHandler::handleCrash(CrashRecoveryHandler::Action action) {
settings.setValue(FULL_AVATAR_MODEL_NAME_KEY, fullAvatarModelName); settings.setValue(FULL_AVATAR_MODEL_NAME_KEY, fullAvatarModelName);
settings.endGroup(); settings.endGroup();
settings.setValue(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/" + AVATAR_GROUP + "/" + FULL_AVATAR_URL_KEY, fullAvatarURL);
// Tutorial complete // Tutorial complete
settings.setValue(TUTORIAL_COMPLETE_FLAG_KEY, tutorialComplete); settings.setValue(TUTORIAL_COMPLETE_FLAG_KEY, tutorialComplete);
} }

2
interface/src/avatar/MyAvatar.cpp
View file

@ -227,7 +227,7 @@ MyAvatar::MyAvatar(QThread* thread) :
_yawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "yawSpeed", _yawSpeed), _yawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "yawSpeed", _yawSpeed),
_hmdYawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdYawSpeed", _hmdYawSpeed), _hmdYawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdYawSpeed", _hmdYawSpeed),
_pitchSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "pitchSpeed", _pitchSpeed), _pitchSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "pitchSpeed", _pitchSpeed),
_fullAvatarURLSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "fullAvatarURL", _fullAvatarURLSetting(QStringList() << SETTINGS_FULL_PRIVATE_GROUP_NAME << AVATAR_SETTINGS_GROUP_NAME << "fullAvatarURL",
AvatarData::defaultFullAvatarModelUrl()), AvatarData::defaultFullAvatarModelUrl()),
_fullAvatarModelNameSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "fullAvatarModelName", _fullAvatarModelName), _fullAvatarModelNameSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "fullAvatarModelName", _fullAvatarModelName),
_animGraphURLSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "animGraphURL", QUrl("")), _animGraphURLSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "animGraphURL", QUrl("")),

8
interface/src/scripting/SettingsScriptingInterface.cpp
View file

@ -25,6 +25,9 @@ QVariant SettingsScriptingInterface::getValue(const QString& setting) {
if (!value.isValid()) { if (!value.isValid()) {
value = ""; value = "";
} }
if (_restrictPrivateValues || setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
value = "";
}
return value; return value;
} }
@ -33,6 +36,9 @@ QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVar
if (!value.isValid()) { if (!value.isValid()) {
value = ""; value = "";
} }
if (_restrictPrivateValues || setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
value = "";
}
return value; return value;
} }
@ -40,7 +46,7 @@ void SettingsScriptingInterface::setValue(const QString& setting, const QVariant
if (getValue(setting) == value) { if (getValue(setting) == value) {
return; return;
} }
if (setting.startsWith("private/")) { if (setting.startsWith("private/") || setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
if (_restrictPrivateValues) { if (_restrictPrivateValues) {
qWarning() << "SettingsScriptingInterface::setValue -- restricted write: " << setting << value; qWarning() << "SettingsScriptingInterface::setValue -- restricted write: " << setting << value;
return; return;

2
libraries/shared/src/SettingHandle.cpp
View file

@ -18,6 +18,8 @@
Q_LOGGING_CATEGORY(settings_handle, "settings.handle") Q_LOGGING_CATEGORY(settings_handle, "settings.handle")
const QString SETTINGS_FULL_PRIVATE_GROUP_NAME = "fullPrivate";
const QString Settings::firstRun { "firstRun" }; const QString Settings::firstRun { "firstRun" };

9
libraries/shared/src/SettingHandle.h
View file

@ -31,6 +31,15 @@
Q_DECLARE_LOGGING_CATEGORY(settings_handle) Q_DECLARE_LOGGING_CATEGORY(settings_handle)
/**
* @brief Name of the fully private settings group
*
* Settings in this group will be protected from reading and writing from script engines.
*
*/
extern const QString SETTINGS_FULL_PRIVATE_GROUP_NAME;
/** /**
* @brief QSettings analog * @brief QSettings analog
* *

2
tools/nitpick/AppDataHighFidelity/Interface.json
View file

@ -43,7 +43,7 @@
"Avatar/dominantHand": "right", "Avatar/dominantHand": "right",
"Avatar/flyingHMD": false, "Avatar/flyingHMD": false,
"Avatar/fullAvatarModelName": "Default", "Avatar/fullAvatarModelName": "Default",
"Avatar/fullAvatarURL": "", "fullPrivate/Avatar/fullAvatarURL": "",
"Avatar/headPitch": 0, "Avatar/headPitch": 0,
"Avatar/pitchSpeed": 75, "Avatar/pitchSpeed": 75,
"Avatar/scale": 1, "Avatar/scale": 1,