Issue 1103 - Migrate Simple Adblock users

src/plugin/PluginUserSettings.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "PluginStdAfx.h"
 #include "PluginUserSettings.h"
-#include <algorithm>
+#include "AdblockPlusClient.h"
 #include "PluginSettings.h"
-#include "PluginClient.h"
 #include "../shared/Dictionary.h"
 #include <unordered_map>
 
 namespace
 {
   enum UserSettingsMethods
   {
     dispatchID_GetMessage = 0,
     dispatchID_GetLanguageCount,
     dispatchID_GetLanguageByIndex,
     dispatchID_GetLanguageTitleByIndex,
     dispatchID_SetLanguage,
     dispatchID_GetLanguage,
     dispatchID_GetWhitelistDomains,
     dispatchID_AddWhitelistDomain,
     dispatchID_RemoveWhitelistDomain,
     dispatchID_GetAppLocale,
     dispatchID_GetDocumentationLink,
     dispatchID_IsAcceptableAdsEnabled,
     dispatchID_SetAcceptableAdsEnabled,
     dispatchID_IsUpdate,
-    dispatchID_IsFromSimpleAdblock
+    dispatchID_GetConversion
   };
 
   /**
    * Auxiliary for static initialization
    */
   std::unordered_map<std::wstring, DISPID> InitMethodIndex()
   {
     std::unordered_map<std::wstring, DISPID> m;
     // try-block for safety during static initialization
     try
     {
       m.emplace(L"GetMessage", dispatchID_GetMessage);
       m.emplace(L"GetLanguageCount", dispatchID_GetLanguageCount);
       m.emplace(L"GetLanguageByIndex", dispatchID_GetLanguageByIndex);
       m.emplace(L"GetLanguageTitleByIndex", dispatchID_GetLanguageTitleByIndex);
       m.emplace(L"SetLanguage", dispatchID_SetLanguage);
       m.emplace(L"GetLanguage", dispatchID_GetLanguage);
       m.emplace(L"GetWhitelistDomains", dispatchID_GetWhitelistDomains);
       m.emplace(L"AddWhitelistDomain", dispatchID_AddWhitelistDomain);
       m.emplace(L"RemoveWhitelistDomain", dispatchID_RemoveWhitelistDomain);
       m.emplace(L"GetAppLocale", dispatchID_GetAppLocale);
       m.emplace(L"GetDocumentationLink", dispatchID_GetDocumentationLink);
       m.emplace(L"IsAcceptableAdsEnabled", dispatchID_IsAcceptableAdsEnabled);
       m.emplace(L"SetAcceptableAdsEnabled", dispatchID_SetAcceptableAdsEnabled);
       m.emplace(L"IsUpdate", dispatchID_IsUpdate);
-      m.emplace(L"IsFromSimpleAdblock", dispatchID_IsFromSimpleAdblock);

[Eric, 2015/03/27 12:51:45]

I would prefer an API here that's a bit more general. Instead of something
that's only about Simple Adblock, we could use a function that takes argument
"simpleadblock"?

+      m.emplace(L"GetConversion", dispatchID_GetConversion);
     }
     catch(...)
     {
     }
     return m;
   }
 
   /**
    * Static map from method names to dispatch identifiers.
    */
@@ skipping 356 matching lines @@
         {
           return DISP_E_BADPARAMCOUNT;
         }
         if (pVarResult)
         {
           pVarResult->vt = VT_BOOL;
           pVarResult->boolVal = CPluginClient::GetInstance()->GetPref(L"displayUpdatePage", false) ? VARIANT_TRUE : VARIANT_FALSE;
         }
       }
       break;
-    case dispatchID_IsFromSimpleAdblock:
-      {
-        if (pDispparams->cArgs != 0)
-        {
-          return DISP_E_BADPARAMCOUNT;
-        }
-        if (pVarResult)
-        {
-          pVarResult->vt = VT_BOOL;
-          pVarResult->boolVal = CPluginClient::GetInstance()->GetPref(L"isFromSimpleAdblock", false) ? VARIANT_TRUE : VARIANT_FALSE;

[Eric, 2015/03/27 12:51:45]

The preference could be called "upgradingFrom".

+    case dispatchID_GetConversion:
+      {
+        if (pDispparams->cArgs != 0)
+        {
+          return DISP_E_BADPARAMCOUNT;
+        }
+        if (pVarResult)
+        {
+          pVarResult->vt = VT_BSTR;
+          pVarResult->bstrVal = CComBSTR(CPluginClient::GetInstance()->GetConvertedFrom().c_str());
         }
       }
       break;
     default:
       return DISP_E_MEMBERNOTFOUND;
       break;
     }
   }
   catch (...)
   {
     return E_FAIL;
   }
   return S_OK;
 }