procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix two crashes in groups edit.

This commit is contained in:
John Preston 2019-03-25 11:56:45 +04:00
parent 8c6e72b21a
commit d7a67a6a1c
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
View File

@ -176,6 +176,7 @@ private:
object_ptr<Ui::RpWidget> createManageGroupButtons(); object_ptr<Ui::RpWidget> createManageGroupButtons();
object_ptr<Ui::RpWidget> createStickersEdit(); object_ptr<Ui::RpWidget> createStickersEdit();
bool canEditInformation() const;
void refreshHistoryVisibility(bool instant); void refreshHistoryVisibility(bool instant);
void showEditPeerTypeBox(std::optional<LangKey> error = std::nullopt); void showEditPeerTypeBox(std::optional<LangKey> error = std::nullopt);
void fillPrivacyTypeButton(); void fillPrivacyTypeButton();
@ -283,15 +284,7 @@ void Controller::setFocus() {
object_ptr<Ui::RpWidget> Controller::createPhotoAndTitleEdit() { object_ptr<Ui::RpWidget> Controller::createPhotoAndTitleEdit() {
Expects(_wrap != nullptr); Expects(_wrap != nullptr);
const auto canEdit = [&] { if (!canEditInformation()) {
if (const auto channel = _peer->asChannel()) {
return channel->canEditInformation();
} else if (const auto chat = _peer->asChat()) {
return chat->canEditInformation();
}
return false;
}();
if (!canEdit) {
return nullptr; return nullptr;
} }
@ -369,6 +362,10 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
object_ptr<Ui::RpWidget> Controller::createDescriptionEdit() { object_ptr<Ui::RpWidget> Controller::createDescriptionEdit() {
Expects(_wrap != nullptr); Expects(_wrap != nullptr);
if (!canEditInformation()) {
return nullptr;
}
auto result = object_ptr<Ui::PaddingWrap<Ui::InputField>>( auto result = object_ptr<Ui::PaddingWrap<Ui::InputField>>(
_wrap, _wrap,
object_ptr<Ui::InputField>( object_ptr<Ui::InputField>(
@ -447,6 +444,15 @@ object_ptr<Ui::RpWidget> Controller::createStickersEdit() {
return std::move(result); return std::move(result);
} }
bool Controller::canEditInformation() const {
if (const auto channel = _peer->asChannel()) {
return channel->canEditInformation();
} else if (const auto chat = _peer->asChat()) {
return chat->canEditInformation();
}
return false;
}
void Controller::refreshHistoryVisibility(bool instant = false) { void Controller::refreshHistoryVisibility(bool instant = false) {
if (!_controls.historyVisibilityWrap) { if (!_controls.historyVisibilityWrap) {
return; return;
@ -795,7 +801,9 @@ std::optional<Controller::Saving> Controller::validate() const {
} }
bool Controller::validateUsername(Saving &to) const { bool Controller::validateUsername(Saving &to) const {
if (_privacySavedValue != Privacy::Public) { if (!_privacySavedValue) {
return true;
} else if (_privacySavedValue != Privacy::Public) {
to.username = QString(); to.username = QString();
return true; return true;
} }