mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix persistent two factor auth notification.

Browse Source 
The server app returns a 202 code when the request succeeded, which was
not taken into account.

Signed-off-by: Camila <hello@camila.codes>
This commit is contained in:
Camila 2022-09-21 17:22:01 +02:00 committed by Camila (Rebase PR Action)
parent f3513aaafe
commit 348c9ea915
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/ocsjob.h
View File

@ -26,6 +26,8 @@
#define OCS_SUCCESS_STATUS_CODE 100
// Apparantly the v2.php URLs can return that
#define OCS_SUCCESS_STATUS_CODE_V2 200
// Two factor auth notification returns Accepted 202
#define OCS_ACCEPTED_STATUS_CODE 202
// not modified when using ETag
#define OCS_NOT_MODIFIED_STATUS_CODE_V2 304

10
src/gui/tray/ActivityActionButton.qml
View File

@ -10,7 +10,7 @@ Item {
property string text: ""
property string toolTipText: ""
property bool bold: false
property bool primaryButton: false
property string imageSource: ""
property string imageSourceHover: ""
@ -18,12 +18,10 @@ Item {
property color textColor: Style.ncTextColor
property color textColorHovered: Style.ncSecondaryTextColor
property bool primaryButton: false
signal clicked()
Loader {
active: root.imageSource === "" && !primaryButton
active: !root.primaryButton
anchors.fill: parent
@ -40,7 +38,7 @@ Item {
}
Loader {
active: root.imageSource !== "" || primaryButton
active: root.primaryButton
anchors.fill: parent
@ -55,7 +53,7 @@ Item {
textColor: root.textColor
textColorHovered: root.textColorHovered
bold: root.bold
bold: root.primaryButton
imageSource: root.imageSource
imageSourceHover: root.imageSourceHover

5
src/gui/tray/ActivityItemActions.qml
View File

@ -46,10 +46,9 @@ RowLayout {
imageSource: model.modelData.imageSource ? model.modelData.imageSource + root.adjustedHeaderColor : ""
imageSourceHover: model.modelData.imageSourceHovered ? model.modelData.imageSourceHovered + UserModel.currentUser.headerTextColor : ""
textColor: imageSource !== "" || primary ? root.adjustedHeaderColor : Style.ncTextColor
textColorHovered: imageSource !== "" || primary ? UserModel.currentUser.headerTextColor : Style.ncTextColor
textColor: primary ? root.adjustedHeaderColor : Style.ncTextColor
textColorHovered: primary ? UserModel.currentUser.headerTextColor : Style.ncTextColor
bold: primary
primaryButton: primary
onClicked: !isTalkReplyButton ? root.triggerAction(model.index) : root.showReplyField()

6
src/gui/tray/usermodel.cpp
View File

@ -342,8 +342,10 @@ void User::slotNotificationRequestFinished(int statusCode)
{
int row = sender()->property("activityRow").toInt();
// the ocs API returns stat code 100 or 200 inside the xml if it succeeded.
if (statusCode != OCS_SUCCESS_STATUS_CODE && statusCode != OCS_SUCCESS_STATUS_CODE_V2) {
// the ocs API returns stat code 100 or 200 or 202 inside the xml if it succeeded.
if (statusCode != OCS_SUCCESS_STATUS_CODE
&& statusCode != OCS_SUCCESS_STATUS_CODE_V2
&& statusCode != OCS_ACCEPTED_STATUS_CODE) {
qCWarning(lcActivity) << "Notification Request to Server failed, leave notification visible.";
} else {
// to do use the model to rebuild the list or remove the item