mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-23 19:38:48 +03:00
Some defaults vary per platform
Although this was set up for Android, it applies certain changes to iOS as well, in case nheko ever is ported to iOS.
This commit is contained in:
parent
f8392b8e45
commit
5610529bac
2 changed files with 21 additions and 9 deletions
|
@ -13,6 +13,7 @@
|
|||
#include <QLabel>
|
||||
#include <QLineEdit>
|
||||
#include <QMessageBox>
|
||||
#include <QOperatingSystemVersion>
|
||||
#include <QPainter>
|
||||
#include <QProcessEnvironment>
|
||||
#include <QPushButton>
|
||||
|
@ -37,6 +38,15 @@
|
|||
|
||||
#include "config/nheko.h"
|
||||
|
||||
namespace UserSettingsDefault {
|
||||
constexpr auto os = QOperatingSystemVersion::currentType();
|
||||
constexpr bool mobileOS =
|
||||
(os == QOperatingSystemVersion::Android || os == QOperatingSystemVersion::IOS);
|
||||
constexpr bool mobileMode = mobileOS;
|
||||
// TODO: this should always be false; this is a temporary hack to get Android working
|
||||
constexpr bool disableCertificateValidation = mobileOS ? true : false;
|
||||
}
|
||||
|
||||
QSharedPointer<UserSettings> UserSettings::instance_;
|
||||
|
||||
UserSettings::UserSettings()
|
||||
|
@ -90,7 +100,7 @@ UserSettings::load(std::optional<QString> profile)
|
|||
decryptSidebar_ = settings.value("user/decrypt_sidebar", true).toBool();
|
||||
privacyScreen_ = settings.value("user/privacy_screen", false).toBool();
|
||||
privacyScreenTimeout_ = settings.value("user/privacy_screen_timeout", 0).toInt();
|
||||
mobileMode_ = settings.value("user/mobile_mode", false).toBool();
|
||||
mobileMode_ = settings.value("user/mobile_mode", UserSettingsDefault::mobileMode).toBool();
|
||||
emojiFont_ = settings.value("user/emoji_font_family", "default").toString();
|
||||
baseFontSize_ = settings.value("user/font_size", QFont().pointSizeF()).toDouble();
|
||||
auto tempPresence = settings.value("user/presence", "").toString().toStdString();
|
||||
|
@ -128,8 +138,10 @@ UserSettings::load(std::optional<QString> profile)
|
|||
settings.value(prefix + "user/only_share_keys_with_verified_users", false).toBool();
|
||||
useOnlineKeyBackup_ = settings.value(prefix + "user/online_key_backup", false).toBool();
|
||||
|
||||
disableCertificateValidation_ =
|
||||
settings.value("disable_certificate_validation", false).toBool();
|
||||
disableCertificateValidation_ = settings
|
||||
.value("disable_certificate_validation",
|
||||
UserSettingsDefault::disableCertificateValidation)
|
||||
.toBool();
|
||||
|
||||
applyTheme();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue