service/polkit: slightly simplify takeover logic

Author: Cu3PO42

src/services/polkit/agentimpl.cpp

@@ -60,15 +60,16 @@ PolkitAgentImpl* PolkitAgentImpl::tryGet(const PolkitAgent* agent) {
 	return nullptr;
 }
 
-PolkitAgentImpl* PolkitAgentImpl::tryTakeover(PolkitAgent* agent) {
-	if (instance == nullptr) return nullptr;
+PolkitAgentImpl* PolkitAgentImpl::tryTakeoverOrCreate(PolkitAgent* agent) {
+	if (auto* impl = tryGetOrCreate(agent); impl != nullptr) return impl;
 
 	auto* prevGen = EngineGeneration::findObjectGeneration(instance->qmlAgent);
 	auto* myGen = EngineGeneration::findObjectGeneration(agent);
 	if (prevGen == myGen) return nullptr;
 
 	qCDebug(logPolkit) << "taking over listener from previous generation";
 	instance->qmlAgent = agent;
+	instance->setPath(agent->path());
 
 	return instance;
 }

src/services/polkit/agentimpl.hpp

@@ -23,7 +23,7 @@ class PolkitAgentImpl
 
 	static PolkitAgentImpl* tryGetOrCreate(PolkitAgent* agent);
 	static PolkitAgentImpl* tryGet(const PolkitAgent* agent);
-	static PolkitAgentImpl* tryTakeover(PolkitAgent* agent);
+	static PolkitAgentImpl* tryTakeoverOrCreate(PolkitAgent* agent);
 	static void onEndOfQmlAgent(PolkitAgent* agent);
 
 	[[nodiscard]] QBindable<AuthFlow*> activeFlow();

src/services/polkit/qml.cpp

@@ -11,22 +11,14 @@ QS_LOGGING_CATEGORY(logPolkit, "quickshell.service.polkit");
 }
 
 namespace qs::service::polkit {
-PolkitAgent::PolkitAgent(QObject* parent): QObject(parent) {
-	// Try to takeover an existing PolkitAgentImpl from the previous QML engine generation.
-	// If none exists, we wait until componentComplete to create one so we have the correct path.
-	PolkitAgentImpl::tryTakeover(this);
-}
-
 PolkitAgent::~PolkitAgent() { PolkitAgentImpl::onEndOfQmlAgent(this); };
 
 void PolkitAgent::componentComplete() {
 	if (this->mPath.isEmpty()) this->mPath = "/org/quickshell/Polkit";
 
-	auto* impl = PolkitAgentImpl::tryGetOrCreate(this);
+	auto* impl = PolkitAgentImpl::tryTakeoverOrCreate(this);
 	if (impl == nullptr) return;
 
-	impl->setPath(this->mPath);
-
 	this->bFlow.setBinding([impl]() { return impl->activeFlow().value(); });
 	this->bIsActive.setBinding([impl]() { return impl->activeFlow().value() != nullptr; });
 	this->bIsRegistered.setBinding([impl]() { return impl->isRegistered().value(); });

src/services/polkit/qml.hpp

@@ -12,7 +12,6 @@
 #include "../../core/model.hpp"
 #include "../../core/reload.hpp"
 #include "../../core/retainable.hpp"
-
 #include "flow.hpp"
 
 // The reserved identifier is exactly the struct I mean.
@@ -56,7 +55,7 @@ class PolkitAgent
 	Q_PROPERTY(AuthFlow* flow READ default NOTIFY flowChanged BINDABLE flow);
 
 public:
-	explicit PolkitAgent(QObject* parent = nullptr);
+	explicit PolkitAgent(QObject* parent = nullptr): QObject(parent) {};
 	~PolkitAgent() override;
 
 	void classBegin() override {};