Issue 1106 - Enable Acceptable Ads by default for new installs and updates from versions < 1.2

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
@@ skipping 836 matching lines @@
   int ieVersion = CPluginClient::GetInstance()->GetIEVersion();
   // Create status pane
   if (bBHO && ieVersion > 6 && !CreateStatusBarPane())
   {
     return false;
   }
   
   s_criticalSectionLocal.Lock();
   int versionCompRes = CPluginClient::GetInstance()->CompareVersions(CPluginClient::GetInstance()->GetPref(L"currentVersion", L"0.0"), L"1.2");
 
+  bool isFirstRun = CPluginClient::GetInstance()->IsFirstRun();
+  CPluginClient::GetInstance()->SetPref(L"currentVersion", std::wstring(IEPLUGIN_VERSION));
   // This is the first time ABP was installed
   // Or ABP was updated from the version that did not support Acceptable Ads (<1.2)
-  if (CPluginClient::GetInstance()->IsFirstRun() || versionCompRes < 0)
+  if (isFirstRun || versionCompRes < 0)
   {   
-    CPluginClient::GetInstance()->SetPref(L"currentVersion", std::wstring(IEPLUGIN_VERSION));

[Felix Dahlke, 2014/08/01 13:07:57]

I think we should also update currentVersion when it was 1.2 or older, i.e.
after this block I guess.

+    if (!isFirstRun)
+    {
+      CPluginClient::GetInstance()->SetPref(L"displayUpdatePage", true);
+    }
 
     // IE6 can't be accessed from another thread, execute in current thread
     if (ieVersion < 7)

[Felix Dahlke, 2014/08/01 13:07:57]

Should we really run these first run actions again when someone is updating to a
version that supports acceptable ads? Showing the first run page is all we need
to do. Oh, and we need to show it with a different title: "Adblock Plus has been
updated" instead of "Adblock Plus has been installed".

     {
       FirstRunThread();
     }
     else
     {
       CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThread, NULL, NULL, NULL);
     }
-    if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled()))
+    if (((m_hPaneWnd == NULL) || !IsStatusBarEnabled()) && isFirstRun)
     {
       ShowStatusBar();
     }
 
     // Enable acceptable ads by default
     std::wstring aaUrl = CPluginClient::GetInstance()->GetPref(L"subscriptions_exceptionsurl", L"");
     CPluginClient::GetInstance()->AddSubscription(aaUrl);
   }
   s_criticalSectionLocal.Unlock();
   return true;
@@ skipping 1123 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }