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

Fix partial value saving in passport.

This commit is contained in:
John Preston 2018-04-10 23:34:43 +04:00
parent ccb57a6d69
commit 9142313a6b
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/passport/passport_form_controller.cpp
View File

@ -798,12 +798,16 @@ void FormController::saveValueEdit(
const auto nonconst = findValue(value); const auto nonconst = findValue(value);
if (!editValueChanged(nonconst, data)) { if (!editValueChanged(nonconst, data)) {
base::take(nonconst->filesInEdit); nonconst->saveRequestId = -1;
base::take(nonconst->selfieInEdit); crl::on_main(this, [=] {
base::take(nonconst->data.encryptedSecretInEdit); base::take(nonconst->filesInEdit);
base::take(nonconst->data.hashInEdit); base::take(nonconst->selfieInEdit);
base::take(nonconst->data.parsedInEdit); base::take(nonconst->data.encryptedSecretInEdit);
_valueSaveFinished.fire_copy(nonconst); base::take(nonconst->data.hashInEdit);
base::take(nonconst->data.parsedInEdit);
nonconst->saveRequestId = 0;
_valueSaveFinished.fire_copy(nonconst);
});
return; return;
} }
nonconst->data.parsedInEdit = std::move(data); nonconst->data.parsedInEdit = std::move(data);

6
Telegram/SourceFiles/passport/passport_panel_controller.cpp
View File

@ -542,13 +542,11 @@ void PanelController::requestScopeFilesType(int index) {
Expects(index >= 0 && index < _scopes.size()); Expects(index >= 0 && index < _scopes.size());
const auto type = _scopes[index].type; const auto type = _scopes[index].type;
const auto box = std::make_shared<QPointer<BoxContent>>(); _scopeFilesTypeBox = [&] {
*box = [&] {
if (type == Scope::Type::Identity) { if (type == Scope::Type::Identity) {
return show(RequestIdentityType( return show(RequestIdentityType(
[=](int filesIndex) { [=](int filesIndex) {
editWithUpload(index, filesIndex); editWithUpload(index, filesIndex);
(*box)->closeBox();
}, },
ranges::view::all( ranges::view::all(
_scopes[index].files _scopes[index].files
@ -570,7 +568,6 @@ void PanelController::requestScopeFilesType(int index) {
return show(RequestAddressType( return show(RequestAddressType(
[=](int filesIndex) { [=](int filesIndex) {
editWithUpload(index, filesIndex); editWithUpload(index, filesIndex);
(*box)->closeBox();
}, },
ranges::view::all( ranges::view::all(
_scopes[index].files _scopes[index].files
@ -602,6 +599,7 @@ void PanelController::editWithUpload(int index, int filesIndex) {
EditScans::ChooseScan( EditScans::ChooseScan(
base::lambda_guarded(_panel.get(), base::lambda_guarded(_panel.get(),
[=](QByteArray &&content) { [=](QByteArray &&content) {
base::take(_scopeFilesTypeBox);
editScope(index, filesIndex); editScope(index, filesIndex);
uploadScan(std::move(content)); uploadScan(std::move(content));
})); }));

1
Telegram/SourceFiles/passport/passport_panel_controller.h
View File

@ -111,6 +111,7 @@ private:
BoxPointer _confirmForgetChangesBox; BoxPointer _confirmForgetChangesBox;
Scope *_editScope = nullptr; Scope *_editScope = nullptr;
int _editScopeFilesIndex = -1; int _editScopeFilesIndex = -1;
BoxPointer _scopeFilesTypeBox;
std::map<not_null<const Value*>, BoxPointer> _verificationBoxes; std::map<not_null<const Value*>, BoxPointer> _verificationBoxes;
rpl::lifetime _lifetime; rpl::lifetime _lifetime;