service/polkit: use property update groups and keep supplementary message on session restart

Author: Cu3PO42

src/services/polkit/flow.cpp

@@ -52,8 +52,12 @@ void AuthFlow::cancelFromAgent() {
 
 	qCDebug(logPolkitState) << "cancelling authentication request from agent";
 
+	// Session cancel can immediately call the cancel handler, which also
+	// performs property updates.
+	Qt::beginPropertyUpdateGroup();
 	this->bIsCancelled = true;
 	this->currentSession->cancel();
+	Qt::endPropertyUpdateGroup();
 
 	emit this->authenticationRequestCancelled();
 
@@ -67,18 +71,24 @@ void AuthFlow::submit(const QString& value) {
 
 	this->currentSession->respond(value);
 
+	Qt::beginPropertyUpdateGroup();
 	this->bIsResponseRequired = false;
 	this->bInputPrompt = QString();
 	this->bResponseVisible = false;
+	Qt::endPropertyUpdateGroup();
 }
 
 void AuthFlow::cancelAuthenticationRequest() {
 	if (!this->currentSession) return;
 
 	qCDebug(logPolkitState) << "cancelling authentication request by user request";
 
+	// Session cancel can immediately call the cancel handler, which also
+	// performs property updates.
+	Qt::beginPropertyUpdateGroup();
 	this->bIsCancelled = true;
 	this->currentSession->cancel();
+	Qt::endPropertyUpdateGroup();
 
 	this->mRequest->cancel("Authentication request cancelled by user.");
 }
@@ -101,48 +111,50 @@ void AuthFlow::setupSession() {
 	this->currentSession->initiate();
 }
 
-void AuthFlow::clearState() {
-	this->bIsResponseRequired = false;
-	this->bInputPrompt = QString {};
-	this->bResponseVisible = false;
-	this->bSupplementaryMessage = QString {};
-	this->bSupplementaryIsError = false;
-}
-
 void AuthFlow::request(const QString& message, bool echo) {
+	Qt::beginPropertyUpdateGroup();
 	this->bIsResponseRequired = true;
 	this->bInputPrompt = message;
 	this->bResponseVisible = echo;
+	Qt::endPropertyUpdateGroup();
 }
 
 void AuthFlow::completed(bool gainedAuthorization) {
 	qCDebug(logPolkitState) << "authentication session completed, gainedAuthorization ="
 	                        << gainedAuthorization << ", isCancelled =" << this->bIsCancelled.value();
 
 	if (gainedAuthorization) {
+		Qt::beginPropertyUpdateGroup();
 		this->bIsCompleted = true;
 		this->bIsSuccessful = true;
+		Qt::endPropertyUpdateGroup();
+
 		this->mRequest->complete();
 
 		emit this->authenticationSucceeded();
 	} else if (this->bIsCancelled.value()) {
+		Qt::beginPropertyUpdateGroup();
 		this->bIsCompleted = true;
 		this->bIsSuccessful = false;
+		Qt::endPropertyUpdateGroup();
 	} else {
 		emit this->authenticationFailed();
 
-		this->clearState();
 		this->setupSession();
 	}
 }
 
 void AuthFlow::showError(const QString& message) {
+	Qt::beginPropertyUpdateGroup();
 	this->bSupplementaryMessage = message;
 	this->bSupplementaryIsError = true;
+	Qt::endPropertyUpdateGroup();
 }
 
 void AuthFlow::showInfo(const QString& message) {
+	Qt::beginPropertyUpdateGroup();
 	this->bSupplementaryMessage = message;
 	this->bSupplementaryIsError = false;
+	Qt::endPropertyUpdateGroup();
 }
 } // namespace qs::service::polkit

src/services/polkit/flow.hpp

@@ -153,8 +153,6 @@ private slots:
 private:
 	/// Start a session for the currently selected identity and the current request.
 	void setupSession();
-	/// Clear all state variables.
-	void clearState();
 
 	Session* currentSession = nullptr;
 	AuthRequest* mRequest = nullptr;