Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
mobile Datovka
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Datovka projects
mobile Datovka
Commits
754b4199
Commit
754b4199
authored
Nov 15, 2018
by
Karel Slaný
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always store box identifier in TaskDownloadAccountInfo::downloadAccountInfo().
parent
b9873a89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
src/net/isds_wrapper.cpp
src/net/isds_wrapper.cpp
+5
-5
src/worker/task_download_account_info.cpp
src/worker/task_download_account_info.cpp
+4
-3
No files found.
src/net/isds_wrapper.cpp
View file @
754b4199
...
...
@@ -339,7 +339,7 @@ QString IsdsWrapper::getAccountDbId(const QString &userName)
return
QString
();
}
QString
errTxt
=
tr
(
"Wrong username"
);
QString
errTxt
(
tr
(
"Wrong username"
)
);
if
(
userName
.
isEmpty
())
{
Dialogues
::
errorMessage
(
Dialogues
::
CRITICAL
,
tr
(
"Error"
),
errTxt
,
tr
(
"Internal error"
));
...
...
@@ -357,7 +357,7 @@ QString IsdsWrapper::getAccountDbId(const QString &userName)
m_isdsSession
.
isdsCtxMap
[
userName
],
&
m_netLayer
,
false
);
task
->
setAutoDelete
(
false
);
GlobInstcs
::
workPoolPtr
->
runSingle
(
task
);
QString
dbId
=
task
->
m_dbID
;
QString
dbId
(
task
->
m_dbID
)
;
delete
task
;
task
=
Q_NULLPTR
;
return
dbId
;
...
...
@@ -1162,9 +1162,9 @@ void IsdsWrapper::doLoginAction(const QString &isdsAction,
emit
unsuccessedLoginToIsdsSig
(
userName
);
}
else
if
(
isdsAction
==
"changeUserName"
)
{
Dialogues
::
errorMessage
(
Dialogues
::
CRITICAL
,
tr
(
"User
name change: %1"
).
arg
(
userName
),
tr
(
"User
name could not be changed because an error occurred "
"while trying to log in with new user name '%1'."
)
.
arg
(
userName
),
tr
(
"Username change: %1"
).
arg
(
userName
),
tr
(
"User
name could not be changed because an error occurred while trying to log in with new user name '%1'."
)
.
arg
(
userName
),
tr
(
"ISDS returns:"
)
+
" "
+
m_isdsSession
.
isdsCtxMap
[
userName
].
last_isds_msg
+
"
\n\n
"
+
tr
(
"Check your login data and try again."
));
emit
unsuccessedLoginToIsdsSig
(
userName
);
...
...
src/worker/task_download_account_info.cpp
View file @
754b4199
...
...
@@ -35,7 +35,7 @@
TaskDownloadAccountInfo
::
TaskDownloadAccountInfo
(
IsdsSession
::
IsdsContext
&
ctx
,
NetLayer
*
netLayer
,
bool
storeToDb
)
:
m_result
(
DL_ERR
),
m_dbID
(
QString
()
),
m_dbID
(),
m_ctx
(
ctx
),
m_netLayer
(
netLayer
),
m_storeToDb
(
storeToDb
)
...
...
@@ -44,7 +44,7 @@ TaskDownloadAccountInfo::TaskDownloadAccountInfo(IsdsSession::IsdsContext &ctx,
void
TaskDownloadAccountInfo
::
run
(
void
)
{
if
(
Q_
NULLPTR
==
m_netLayer
)
{
if
(
Q_
UNLIKELY
(
Q_NULLPTR
==
m_netLayer
)
)
{
Q_ASSERT
(
0
);
return
;
}
...
...
@@ -102,8 +102,9 @@ enum TaskDownloadAccountInfo::Result TaskDownloadAccountInfo::downloadAccountInf
return
DL_XML_ERROR
;
}
dbID
=
dbOwnerInfo
.
dbID
();
if
(
!
storeToDb
)
{
dbID
=
dbOwnerInfo
.
dbID
();
return
DL_SUCCESS
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment