~aleteoryx/muditaos

87bd36c84617c7c9b431d9853d9cd3e6f2aa8b90 — Marcin Zieliński 3 years ago 52f05b3
[MOS-649] Rename confusing method

Rename confusing method
M module-apps/application-settings/presenter/network/SimPINSettingsPresenter.cpp => module-apps/application-settings/presenter/network/SimPINSettingsPresenter.cpp +2 -2
@@ 26,7 26,7 @@ void SimPINSettingsPresenter::togglePinState()
    }
}

bool SimPINSettingsPresenter::getPinState() const noexcept
bool SimPINSettingsPresenter::isPinEnabled() const noexcept
{
    return isPinOn;
}


@@ 48,7 48,7 @@ void SimPINSettingsPresenter::onBeforeShow(gui::ShowMode mode, gui::SwitchData *
    if (const auto pinSettingsLockStateData = dynamic_cast<gui::PINSettingsLockStateData *>(data);
        pinSettingsLockStateData != nullptr) {
        view->setNavbarCenterActive(true);
        pinLockStateChanged = getPinState() == pinSettingsLockStateData->getSimCardPinLockState() ? false : true;
        pinLockStateChanged = isPinEnabled() == pinSettingsLockStateData->getSimCardPinLockState() ? false : true;
        if (pinLockStateChanged) {
            const auto currentPinState = pinSettingsLockStateData->getSimCardPinLockState();
            setCurrentPinState(currentPinState);

M module-apps/application-settings/presenter/network/SimPINSettingsPresenter.hpp => module-apps/application-settings/presenter/network/SimPINSettingsPresenter.hpp +2 -2
@@ 24,7 24,7 @@ class SimPINSettingsWindowContract
        virtual ~Presenter() noexcept                                        = default;
        virtual void setCurrentPinState(bool state) noexcept                 = 0;
        virtual void togglePinState()                                        = 0;
        virtual bool getPinState() const noexcept                            = 0;
        virtual bool isPinEnabled() const noexcept                           = 0;
        virtual void requestLockState() const                                = 0;
        virtual void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) = 0;
    };


@@ 36,7 36,7 @@ class SimPINSettingsPresenter : public SimPINSettingsWindowContract::Presenter
    explicit SimPINSettingsPresenter(app::ApplicationCommon *application);
    void setCurrentPinState(bool state) noexcept override;
    void togglePinState() override;
    bool getPinState() const noexcept override;
    bool isPinEnabled() const noexcept override;
    void requestLockState() const override;
    void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;


M module-apps/application-settings/windows/network/SimPINSettingsWindow.cpp => module-apps/application-settings/windows/network/SimPINSettingsWindow.cpp +4 -4
@@ 28,7 28,7 @@ namespace gui

        optionList.emplace_back(std::make_unique<option::OptionSettings>(
            utils::translate("app_settings_network_pin"),
            [=](Item & /*item*/) {
            [=](Item &) {
                presenter->togglePinState();
                return true;
            },


@@ 42,12 42,12 @@ namespace gui
                return true;
            },
            nullptr,
            presenter->getPinState() ? option::SettingRightItem::On : option::SettingRightItem::Off));
            presenter->isPinEnabled() ? option::SettingRightItem::On : option::SettingRightItem::Off));

        if (presenter->getPinState()) {
        if (presenter->isPinEnabled()) {
            optionList.emplace_back(std::make_unique<option::OptionSettings>(
                utils::translate("app_settings_network_pin_change_code"),
                [=](Item & /*item*/) {
                [=](Item &) {
                    application->getSimLockSubject().changeSimPin();
                    return true;
                },