♻️ Refactoring

- Updated conditional defines for switching between Indy and NetHTTP
- Updated readme documentation
- FreeAndNil removed from Api classes.

Author: p-samuel

README.md

@@ -89,13 +89,15 @@ Support to notifications that contains ```broadcast``` actions has not been impl
 Ntfy for Delphi uses a few libraries in the messages subscription and publishing mechanism. There is no need to install. The respective credit adviced.
 
 * [NxHorizon](https://github.com/dalijap/nx-horizon) by Dalija Prasnikar. 
-* [Indy10](https://github.com/IndySockets/Indy) by IndySockets.
 * [JsonToDelphiClass](https://github.com/PKGeorgiev) by Petar Georgiev.
-* NetHTTP (On development 🛠)
+* [NetHTTP](https://docwiki.embarcadero.com/RADStudio/Rio/en/Using_an_HTTP_Client) native components.
+* [Indy10](https://github.com/IndySockets/Indy) by IndySockets. (optional)
+
+## ♻ Switching between NetHTTP and Indy
+
+The library's default behavior is to use NetHTTP for managing the HTTP communications. However, if you are like to use Indy over NetHTTP, you can go to `Project > Options > Building > Delphi Compiler > Conditional Defines` and add `NTFY_HTTP_INDY` in the conditional defines list.
+
 
 ## 🌱 Consider Contributing
 
 Ntfy for Delphi it's an open source project under the MIT license. Feel free to use or contribute! 
-
-## ⚠ Observations
-For the moment this library uses OpenSSL and is necessary to have it in the executable's folder. Support for NetHTTP is on work.

samples/console/publisher/README.md

@@ -3,7 +3,7 @@
 </div>
 
 ## ⚠ Observations
-Provide a topic for publishing messages. You also must have SSL libraries for running this project.
+Provide a topic for publishing messages.
 
 ``` pascal
   Ntfy.Notification(

samples/console/subscriber/README.md

@@ -71,7 +71,4 @@ end;
   Ntfy.Filter(TNotifyFilter.MESSAGECONTENT, 'some text');
   Ntfy.Filter(TNotifyFilter.TAGS, 'some text');
   Ntfy.Filter(TNotifyFilter.PRIORITY, IntToStr(Ord(TNotifyPriority.MAX)));      
-```
-
-## ⚠ Observations
-You must have SSL libraries in order to run this project.
+```

samples/vcl/publisher/README.md

@@ -20,7 +20,4 @@ cd delphi-notify\tests
 docker compose create
 docker cp .\server.yml ntfy:/etc/ntfy
 docker compose up
-```
-
-## ⚠ Observations
-You must have SSL libraries in order to run this project.
+```

samples/vcl/subscriber/README.md

@@ -54,7 +54,4 @@ cd delphi-notify\tests
 docker compose create
 docker cp .\server.yml ntfy:/etc/ntfy
 docker compose up
-```
-
-## ⚠ Observations
-You must have SSL libraries in order to run this project.
+```

src/Notify.Api.Factory.pas

@@ -22,7 +22,7 @@ implementation
 
 function TNotifyApiFactory.Api: INotifyApi;
 begin
-  {$IFDEF INDY}
+  {$IFDEF NTFY_HTTP_INDY}
   Result := TNotifyApiIndy.New
   {$ELSE}
   Result := TNotifyApiNetHTTP.New;

src/Notify.Api.Indy.pas

@@ -214,11 +214,11 @@ destructor TNotifyApiIndy.Destroy;
   try
     Destroythread;
   finally
-    FreeAndNil(FResponse);
-    FreeAndNil(FIdHTTP);
-    FreeAndNil(FIOHandlerSSL);
-    FreeAndNil(FURLParametersList);
-    FreeAndNil(FBodyStream);
+    FResponse.Free;
+    FIdHTTP.Free;
+    FIOHandlerSSL.Free;
+    FURLParametersList.Free;
+    FBodyStream.Free;
   end;
   inherited;
 end;

src/Notify.Api.NetHTTP.pas

@@ -205,11 +205,11 @@ destructor TNotifyApiNetHTTP.Destroy;
   try
     Destroythread;
   finally
-    FreeAndNil(FResponse);
-    FreeAndNil(FNetClient);
-    FreeAndNil(FNetHTTPRequest);
-    FreeAndNil(FURLParametersList);
-    FreeAndNil(FBodyStream);
+    FResponse.Free;
+    FNetClient.Free;
+    FNetHTTPRequest.Free;
+    FURLParametersList.Free;
+    FBodyStream.Free;
   end;
   inherited;
 end;

src/Notify.Core.pas

@@ -138,7 +138,7 @@ function TNotifyCore.DisableFireBase(const AValue: Boolean): INotifyCore;
 
 procedure TNotifyCore.DoLoadLibrary;
 begin
-  {$IF DEFINED(INDY)}
+  {$IF DEFINED(NTFY_HTTP_INDY)}
   try
     {$IFDEF WIN32 or WIN64}
     LoadLibraries('libeay32.dll');

tests/NtfyForDelphiTests.dproj

@@ -59,7 +59,7 @@
         <DCC_K>false</DCC_K>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
         <DCC_UnitSearchPath>$(BDS)\Source\DUnit\src;..\src\;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-        <DCC_Define>CONSOLE_TESTRUNNER;INDY;$(DCC_Define)</DCC_Define>
+        <DCC_Define>CONSOLE_TESTRUNNER;$(DCC_Define)</DCC_Define>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <SanitizedProjectName>NtfyForDelphiTests</SanitizedProjectName>

tests/README.md

@@ -35,7 +35,4 @@ docker compose up
   RegisterTest('Send icons', TTestIcons.Suite);
   RegisterTest('Send url attachments', TTestURLAttachments.Suite);
 ```
-<br/>
-
-## ⚠ Observations
-You must have SSL libraries in order to run this project. 
+<br/>