Merge branch 'feature/remove-user-info' into develop

Author: delphidabbler

Docs/Privacy.txt

@@ -16,13 +16,10 @@ portable edition.
 Common.config
 --------------------------------------------------------------------------------
 
-Common.config is located in the %ProgramData%\DelphiDabbler\CodeSnip.4 folder
-for the standard edition or in the AppData sub folder of the install directory
-for the portable edition.
+Common.config is located in the in the %ProgramData%\DelphiDabbler\CodeSnip.4
+folder for the standard edition. It is not used by the portable edition.
 
-The data that is stored in Common.config includes a unique 32 digit hexadecimal
-key based on attributes of your computer. The data that is used to create the
-hexadecimal key cannot be recovered from the key.
+Only version information is stored in <code>Common.config</code>.
 
 
 User.config
@@ -33,10 +30,7 @@ folder for the standard edition or in the AppData sub folder of the install
 directory for the portable edition.
 
 The file stores several user-specific application data settings such as your
-preferences. The only personal information is any user name or email address you
-provided if you ever entered such information in a dialogue box. This is used
-only to automatically enter the data in dialogue boxes where needed, to save you
-re-typing it.
+preferences. None of this information is personally identifiable.
 
 
 Spyware

Src/CodeSnip.dpr

@@ -354,7 +354,6 @@ uses
   UUserDBBackup in 'UUserDBBackup.pas',
   UUserDBMgr in 'UUserDBMgr.pas',
   UUserDBMove in 'UUserDBMove.pas',
-  UUserDetails in 'UUserDetails.pas',
   UUtils in 'UUtils.pas',
   UVersionInfo in 'UVersionInfo.pas',
   UView in 'UView.pas',

Src/CodeSnip.dproj

@@ -551,7 +551,6 @@
 			<DCCReference Include="UUserDBBackup.pas"/>
 			<DCCReference Include="UUserDBMgr.pas"/>
 			<DCCReference Include="UUserDBMove.pas"/>
-			<DCCReference Include="UUserDetails.pas"/>
 			<DCCReference Include="UUtils.pas"/>
 			<DCCReference Include="UVersionInfo.pas"/>
 			<DCCReference Include="UView.pas"/>

Src/FirstRun.UConfigFile.pas

@@ -102,6 +102,8 @@   TUserConfigFileUpdater = class(TConfigFileUpdater)
     procedure DeleteUpdatingPrefs;
     ///  <summary>Deletes unused UpdateChecks section.</summary>
     procedure DeleteUpdateChecks;
+    ///  <summary>Deletes unused UserInfo section.</summary>
+    procedure DeleteUserInfo;
     ///  <summary>Effectively renames MainWindow section used prior to version
     ///  11 as WindowState:MainForm.</summary>
     procedure RenameMainWindowSection;
@@ -330,6 +332,13 @@ procedure TUserConfigFileUpdater.DeleteUpdatingPrefs;
   DeleteIniSection('Prefs:Updating', CfgFileName);
 end;
 
+procedure TUserConfigFileUpdater.DeleteUserInfo;
+begin
+  if not TFile.Exists(CfgFileName, False) then
+    CreateNewFile;
+  DeleteIniSection('UserInfo', CfgFileName);
+end;
+
 class function TUserConfigFileUpdater.GetFileVersion: Integer;
 begin
   Result := FileVersion;

Src/FirstRun.UMain.pas

@@ -242,6 +242,7 @@ procedure TFirstRun.UpdateUserCfgFile(out Changes: TFirstRunCfgChangeSet);
     fUserConfigFile.DeleteProxyServerSection;
     fUserConfigFile.DeleteUpdatingPrefs;
     fUserConfigFile.DeleteUpdateChecks;
+    fUserConfigFile.DeleteUserInfo;
   end;
 
   {$IFNDEF PORTABLE}

Src/FmCodeExportDlg.pas

@@ -230,9 +230,7 @@ procedure TCodeExportDlg.WriteOutputFile;
 var
   OutData: TEncodedData;  // receives export file content
 begin
-  OutData := TCodeExporter.ExportSnippets(
-    TUserInfo.CreateNul, frmSnippets.SelectedSnippets
-  );
+  OutData := TCodeExporter.ExportSnippets(frmSnippets.SelectedSnippets);
   TFileIO.WriteAllBytes(StrTrim(edFile.Text), OutData.Data);
 end;
 

Src/FmCodeImportDlg.dfm

@@ -1,19 +1,23 @@
 inherited CodeImportDlg: TCodeImportDlg
   Caption = 'Import Wizard'
   ExplicitWidth = 565
-  ExplicitHeight = 433
+  ExplicitHeight = 436
   PixelsPerInch = 96
   TextHeight = 13
   inherited pnlBody: TPanel
     Height = 321
     ExplicitHeight = 321
     inherited pcWizard: TPageControl
       Height = 288
-      ActivePage = tsUpdate
+      ActivePage = tsFile
       ExplicitHeight = 288
       object tsInfo: TTabSheet
         Caption = 'tsInfo'
         TabVisible = False
+        ExplicitLeft = 0
+        ExplicitTop = 0
+        ExplicitWidth = 0
+        ExplicitHeight = 0
         object lblIntro: TLabel
           Left = 0
           Top = 8
@@ -33,15 +37,15 @@ inherited CodeImportDlg: TCodeImportDlg
         object lblFile: TLabel
           Left = 0
           Top = 8
-          Width = 220
+          Width = 230
           Height = 13
           Caption = 'Open import &file: (click button to browse for file)'
           FocusControl = edFile
         end
         object lblLoadFile: TLabel
           Left = 0
           Top = 72
-          Width = 172
+          Width = 179
           Height = 13
           Caption = 'Click the Next button to read the file.'
         end
@@ -67,76 +71,22 @@ inherited CodeImportDlg: TCodeImportDlg
           TabOrder = 1
         end
       end
-      object tsUserInfo: TTabSheet
-        Caption = 'tsUserInfo'
-        ImageIndex = 2
-        TabVisible = False
-        object lblName: TLabel
-          Left = 0
-          Top = 8
-          Width = 31
-          Height = 13
-          Caption = 'Name:'
-        end
-        object lblEmail: TLabel
-          Left = 0
-          Top = 45
-          Width = 28
-          Height = 13
-          Caption = 'Email:'
-        end
-        object lblComments: TLabel
-          Left = 0
-          Top = 85
-          Width = 52
-          Height = 13
-          Caption = 'Comments:'
-        end
-        object edComments: TMemo
-          Left = 72
-          Top = 82
-          Width = 297
-          Height = 154
-          ParentColor = True
-          ReadOnly = True
-          ScrollBars = ssVertical
-          TabOrder = 2
-        end
-        object edName: TEdit
-          Left = 72
-          Top = 3
-          Width = 297
-          Height = 21
-          ParentColor = True
-          ReadOnly = True
-          TabOrder = 0
-        end
-        object edEmail: TEdit
-          Left = 72
-          Top = 42
-          Width = 297
-          Height = 21
-          ParentColor = True
-          ReadOnly = True
-          TabOrder = 1
-        end
-      end
       object tsUpdate: TTabSheet
         Caption = 'tsUpdate'
         ImageIndex = 3
         TabVisible = False
         object lblImportList: TLabel
           Left = 0
           Top = 53
-          Width = 86
+          Width = 91
           Height = 13
           Caption = 'Imported &snippets:'
           FocusControl = lvImports
         end
         object lblSelectedSnippet: TLabel
           Left = 0
           Top = 217
-          Width = 82
+          Width = 83
           Height = 13
           Caption = 'S&elected snippet:'
           FocusControl = edRename
@@ -203,6 +153,10 @@ inherited CodeImportDlg: TCodeImportDlg
         Caption = 'tsFinish'
         ImageIndex = 5
         TabVisible = False
+        ExplicitLeft = 0
+        ExplicitTop = 0
+        ExplicitWidth = 0
+        ExplicitHeight = 0
         object lblFinish: TLabel
           Left = 0
           Top = 8