From 3dee28974ebf92f078dada44d189c31cc2e1abb7 Mon Sep 17 00:00:00 2001
From: Konrad Materka <materka@gmail.com>
Date: Sat, 6 Mar 2021 16:51:07 +0100
Subject: [PATCH] [applets/systemtray] Add workaround for Dropbox

System Tray forgets Dropbox hidden state after logout+login

The SNI Id should be consistent between sessions, but Dropbox does not
follow the SNI specification - it adds PID as a suffix of Id.

As this is very popular application and it was not fixed upstream for
many years it is reasonable to add workaround in SystemTray.

BUG: 378910
FIXED-IN: 5.22.0
---
 applets/systemtray/systemtraymodel.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/applets/systemtray/systemtraymodel.cpp b/applets/systemtray/systemtraymodel.cpp
index 8da4f2a18..ff069696d 100644
--- a/applets/systemtray/systemtraymodel.cpp
+++ b/applets/systemtray/systemtraymodel.cpp
@@ -291,6 +291,16 @@ static QVariant extractIcon(const Plasma::DataEngine::Data &sniData, const QStri
     }
 }
 
+static QString extractItemId(const Plasma::DataEngine::Data &sniData) {
+    const QString itemId = sniData.value(QStringLiteral("Id")).toString();
+    // Bug 378910: workaround for Dropbox not following the SNI specification
+    if (itemId.startsWith(QLatin1String("dropbox-client-"))) {
+        return QLatin1String("dropbox-client-PID");
+    } else {
+        return itemId;
+    }
+}
+
 QVariant StatusNotifierModel::data(const QModelIndex &index, int role) const
 {
     if (!checkIndex(index, CheckIndexOption::IndexIsValid)) {
@@ -300,6 +310,7 @@ QVariant StatusNotifierModel::data(const QModelIndex &index, int role) const
     StatusNotifierModel::Item item = m_items[index.row()];
     Plasma::DataContainer *dataContainer = m_dataEngine->containerForSource(item.source);
     const Plasma::DataEngine::Data &sniData = dataContainer->data();
+    const QString itemId = extractItemId(sniData);
 
     if (role <= Qt::UserRole) {
         switch (role) {
@@ -317,7 +328,7 @@ QVariant StatusNotifierModel::data(const QModelIndex &index, int role) const
         case BaseRole::ItemType:
             return QStringLiteral("StatusNotifier");
         case BaseRole::ItemId:
-            return sniData.value(QStringLiteral("Id"));
+            return itemId;
         case BaseRole::CanRender:
             return true;
         case BaseRole::Category: {
@@ -327,7 +338,7 @@ QVariant StatusNotifierModel::data(const QModelIndex &index, int role) const
         case BaseRole::Status:
             return extractStatus(sniData);
         case BaseRole::EffectiveStatus:
-            return calculateEffectiveStatus(true, extractStatus(sniData), sniData.value(QStringLiteral("Id")).toString());
+            return calculateEffectiveStatus(true, extractStatus(sniData), itemId);
         default:
             return QVariant();
         }
@@ -353,7 +364,7 @@ QVariant StatusNotifierModel::data(const QModelIndex &index, int role) const
     case Role::IconThemePath:
         return sniData.value(QStringLiteral("IconThemePath"));
     case Role::Id:
-        return sniData.value(QStringLiteral("Id"));
+        return itemId;
     case Role::ItemIsMenu:
         return sniData.value(QStringLiteral("ItemIsMenu"));
     case Role::OverlayIconName: