VPN-6892 fix reinstate message (#10318)

Author: mcleinman

src/addons/manager/addonmanager.cpp

@@ -419,14 +419,20 @@ QJSValue AddonManager::reduce(QJSValue callback, QJSValue initialValue) const {
 
 // Undismisses any dismissed messages and marks all messages as unread
 void AddonManager::reinstateMessages() const {
+  logger.debug() << "Reinstating all messages";
   SettingsHolder* settingsHolder = SettingsHolder::instance();
   Q_ASSERT(settingsHolder);
 
   // Group containing all the message settings.
   // It only needs to live for the scope of this function.
   SettingGroup* messageSettingGroup =
       SettingsManager::instance()->createSettingGroup(
-          ADDON_MESSAGE_SETTINGS_GROUP);
+          QString("%1/%2")
+              .arg(Constants::ADDONS_SETTINGS_GROUP)
+              .arg(ADDON_MESSAGE_SETTINGS_GROUP),
+          true,  // remove when reset
+          false  // sensitive setting
+      );
   messageSettingGroup->remove();
 }
 

src/ui/screens/getHelp/developerMenu/ViewDeveloperMenu.qml

@@ -230,6 +230,7 @@ MZViewBase {
             text: "Reinstate messages"
             onClicked: {
                 MZAddonManager.reinstateMessages()
+                restartRequired.isVisible = true
             }
         }