Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: exec pkexec failed cause the Polkit dbus is not startup when just login

Browse Source
This commit is contained in:
listenerri 2019-03-28 10:02:17 +08:00
parent a2c64414d2
commit d1642d1f62
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/overlay-warning/overlay-warning-plugin.cpp
View File

@ -24,18 +24,27 @@
#include <QIcon>
#include <QStorageInfo>
#include <QDBusConnectionInterface>
#include <QTimer>
#include <ddialog.h>
#define PLUGIN_STATE_KEY "enable"
#define OverlayFileSystemType "overlay"
#define AuthAgentDbusService "com.deepin.Polkit1AuthAgent"
DWIDGET_USE_NAMESPACE
int WaitingAuthAgentTimes = 0;
OverlayWarningPlugin::OverlayWarningPlugin(QObject *parent)
: QObject(parent)
, m_pluginLoaded(false)
, m_showDisableOverlayDialogTimer(new QTimer(this))
{
m_showDisableOverlayDialogTimer->setInterval(6000);
connect(m_showDisableOverlayDialogTimer, &QTimer::timeout, this, &OverlayWarningPlugin::showCloseOverlayDialogPre);
}
const QString OverlayWarningPlugin::pluginName() const
@ -96,7 +105,7 @@ const QString OverlayWarningPlugin::itemCommand(const QString &itemKey)
{
Q_UNUSED(itemKey);
showCloseOverlayDialog();
m_showDisableOverlayDialogTimer->start(300);
return QString();
}
@ -146,7 +155,7 @@ void OverlayWarningPlugin::loadPlugin()
m_proxyInter->itemAdded(this, pluginName());
displayModeChanged(displayMode());
QTimer::singleShot(3000, this, &OverlayWarningPlugin::showCloseOverlayDialog);
QTimer::singleShot(0, m_showDisableOverlayDialogTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
}
bool OverlayWarningPlugin::isOverlayRoot()
@ -163,13 +172,35 @@ bool OverlayWarningPlugin::isOverlayRoot()
return QString(QStorageInfo::root().fileSystemType()) == OverlayFileSystemType;
}
void OverlayWarningPlugin::showCloseOverlayDialogPre()
{
Q_ASSERT(sender() == m_showDisableOverlayDialogTimer);
if (QDBusConnection::sessionBus().interface()->isServiceRegistered(AuthAgentDbusService)) {
m_showDisableOverlayDialogTimer->stop();
WaitingAuthAgentTimes = 0;
showCloseOverlayDialog();
return;
}
WaitingAuthAgentTimes++;
qDebug() << "Waiting for AuthAgent service" << WaitingAuthAgentTimes << "times";
if (WaitingAuthAgentTimes > 10) {
qDebug() << "AuthAgent service timeout...";
m_showDisableOverlayDialogTimer->stop();
return;
}
}
// Do not call this method directly
// It should be called by delay timer
// In order to check the Polkit dbus service is running
void OverlayWarningPlugin::showCloseOverlayDialog()
{
qDebug() << "start disable overlayroot process";
const int result = QProcess::execute("/usr/bin/pkexec overlayroot-disable");
if (result == 0) {
QProcess::startDetached("reboot");
} else {
qDebug() << "close overlayroot failed, the return code is" << result;
qDebug() << "disable overlayroot failed, the return code is" << result;
}
}

2
plugins/overlay-warning/overlay-warning-plugin.h
View File

@ -65,12 +65,14 @@ private:
bool isOverlayRoot();
private slots:
void showCloseOverlayDialogPre();
void showCloseOverlayDialog();
private:
bool m_pluginLoaded;
PluginWidget *m_warningWidget;
QTimer *m_showDisableOverlayDialogTimer;
};
#endif // SHUTDOWNPLUGIN_H