Changed first run processing of proxy information to simply delete the ProxyServer config file section

Author: delphidabbler

Src/FirstRun.FmV4ConfigDlg.pas

@@ -339,7 +339,6 @@ function TV4ConfigDlg.HeadingText(const PageIdx: Integer): string;
 procedure TV4ConfigDlg.ListChanges;
 resourcestring
   sHiliter = 'Syntax highlighter customisations have been lost.';
-  sProxyPwd = 'Your proxy server password needs to be re-entered.';
   sSourceFormat = 'Source code formatting preferences may have been lost.';
 var
   Changes: IStringList;
@@ -351,8 +350,6 @@ procedure TV4ConfigDlg.ListChanges;
     Changes := TIStringList.Create;
     if frcHiliter in fCfgChanges then
       Changes.Add(sHiliter);
-    if frcProxyPwd in fCfgChanges then
-      Changes.Add(sProxyPwd);
     if frcSourceFormat in fCfgChanges then
       Changes.Add(sSourceFormat);
     CreateBulletPage(

Src/FirstRun.UConfigFile.pas

@@ -85,17 +85,15 @@   TUserConfigFileUpdater = class(TConfigFileUpdater)
     procedure UpdateFromOriginal;
     ///  <summary>Deletes any highlighter preferences.</summary>
     procedure DeleteHighligherPrefs;
-    ///  <summary>Checks a proxy password is present in file.</summary>
-    function HasProxyPassword: Boolean;
-    ///  <summary>Deletes proxy password entry.</summary>
-    procedure DeleteProxyPassword;
     ///  <summary>Updates Prefs:CodeGen section from format prior to version 9
     ///  to version 9 and later format.</summary>
     procedure UpdateCodeGenEntries;
     ///  <summary>Deletes unused key that determines detail pane index.
     ///  </summary>
     procedure DeleteDetailsPaneIndex;
     {$ENDIF}
+    ///  <summary>Deletes proxy server section.</summary>
+    procedure DeleteProxyServerSection;
     ///  <summary>Deletes unused Prefs:News section.</summary>
     procedure DeleteNewsPrefs;
     ///  <summary>Effectively renames MainWindow section used prior to version
@@ -294,27 +292,18 @@ procedure TUserConfigFileUpdater.DeleteNewsPrefs;
   DeleteIniSection('Prefs:News', CfgFileName);
 end;
 
-{$IFNDEF PORTABLE}
-procedure TUserConfigFileUpdater.DeleteProxyPassword;
+procedure TUserConfigFileUpdater.DeleteProxyServerSection;
 begin
   if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
-  SetIniString('ProxyServer', 'Password', '', CfgFileName);
+  DeleteIniSection('ProxyServer', CfgFileName);
 end;
-{$ENDIF}
 
 class function TUserConfigFileUpdater.GetFileVersion: Integer;
 begin
   Result := FileVersion;
 end;
 
-{$IFNDEF PORTABLE}
-function TUserConfigFileUpdater.HasProxyPassword: Boolean;
-begin
-  Result := GetIniString('ProxyServer', 'Password', '', CfgFileName) <> '';
-end;
-{$ENDIF}
-
 procedure TUserConfigFileUpdater.RenameMainWindowSection;
 begin
   if not TFile.Exists(CfgFileName, False) then

Src/FirstRun.UMain.pas

@@ -27,7 +27,6 @@ interface
   ///  config files that result in data loss.</summary>
   TFirstRunCfgChanges = (
     frcHiliter,         // syntax highlighter customisation lost
-    frcProxyPwd,        // internet proxy password lost
     frcSourceFormat     // source code output formatting lost
   );
 
@@ -56,11 +55,6 @@   TFirstRun = class(TObject)
       ///  <summary>Object used to copy forward older versions of user database.
       ///  </summary>
       fDatabase: TUserDatabaseUpdater;
-    {$IFNDEF PORTABLE}
-    ///  <summary>Checks if config file uses earlier format for storing proxy
-    ///  server passwords.</summary>
-    function HasOldStyleProxyPwd: Boolean;
-    {}{$ENDIF}
   public
     ///  <summary>Constructs object and owned object.</summary>
     constructor Create;
@@ -183,13 +177,6 @@ destructor TFirstRun.Destroy;
   inherited;
 end;
 
-{$IFNDEF PORTABLE}
-function TFirstRun.HasOldStyleProxyPwd: Boolean;
-begin
-  Result := (fUserConfigFile.FileVer <= 6) and fUserConfigFile.HasProxyPassword;
-end;
-{$ENDIF}
-
 function TFirstRun.HaveOldUserCfgFile: Boolean;
 begin
   Result := TFile.Exists(fInstallInfo.PreviousUserConfigFileName, False);
@@ -222,14 +209,7 @@ procedure TFirstRun.UpdateUserCfgFile(out Changes: TFirstRunCfgChangeSet);
       fUserConfigFile.DeleteHighligherPrefs;
       Include(Changes, frcHiliter);
     end;
-    piV3:
-    begin
-      if HasOldStyleProxyPwd then
-      begin
-        fUserConfigFile.DeleteProxyPassword;
-        Include(Changes, frcProxyPwd);
-      end;
-    end;
+    piV3: ; // do nothing
   end;
   {$ENDIF}
 
@@ -259,7 +239,10 @@ procedure TFirstRun.UpdateUserCfgFile(out Changes: TFirstRunCfgChangeSet);
 
 
   if fUserConfigFile.FileVer < 16 then
+  begin
     fUserConfigFile.DeleteNewsPrefs;
+    fUserConfigFile.DeleteProxyServerSection;
+  end;
 
   if fCommonConfigFile.FileVer < 7 then
     fCommonConfigFile.DeleteRegistrationInfo;