Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Cancellation #7

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Add Cancellation #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bb2cac9
Update README.md
hosseinRezaei188 Apr 14, 2020
15eeecf
Update README.md
hosseinRezaei188 Apr 14, 2020
94ed2c9
Update README.md
hosseinRezaei188 Apr 15, 2020
29b8507
Remove HtmlEncode from message inside Send method to prevent changing…
Mar 27, 2021
1f2bb8c
Merge pull request #3 from amirriazi/master
hosseinRezaei188 Apr 3, 2021
bfc4559
Update README.md
hosseinRezaei188 Apr 4, 2021
44e23c9
Some change in project information
hosseinRezaei188 Apr 4, 2021
17b2e2e
update Newtonsoft pakage
Nov 28, 2022
186300c
Update README.md
hosseinRezaei188 Nov 28, 2022
8a5785b
update readme
Nov 28, 2022
66b37c7
fixed https as default scheme in base url
Apr 10, 2023
a62cb4c
check null parameter on sebd request
Apr 10, 2023
05c4671
Update README.md
hosseinRezaei188 Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Kavenegar.Core/Kavenegar.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.0.1-alpha2</Version>
<Version>1.0.6</Version>

<TargetFrameworks>netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;</TargetFrameworks>
<Description>A cross-platform library for the kavenegar sms provider; written in C#</Description>
<RootNamespace>Kavenegar.Core</RootNamespace>
<AssemblyTitle>Kavenegar.Core</AssemblyTitle>
<AssemblyName>Kavenegar.Core</AssemblyName>

<PackageId>Kavenegar.Core</PackageId>
<PackageTags>Kavenegar Core kavenegar.Core kavenegarCore</PackageTags>
<PackageIconUrl>https://secure.gravatar.com/avatar/0742fdb693a34ceb3f107cdfc0b3b24e?s=128</PackageIconUrl>
<PackageProjectUrl>https://github.com/mberneti/Kavenegar.Core</PackageProjectUrl>
<PackageId>KavenegarDotNetCore</PackageId>
<PackageTags>Kavenegar Core kavenegar.Core kavenegarCore Sms</PackageTags>
<PackageIconUrl></PackageIconUrl>
<PackageProjectUrl>https://github.com/kavenegar/Kavenegar.Core</PackageProjectUrl>

<OutputType>Library</OutputType>
<RestorePackages>true</RestorePackages>
<BuildPackage>true</BuildPackage>
<Authors>Mohammadreza Berneti ([email protected])</Authors>
<Authors>HadiEskandari Ardavan HosseinRezaei Mberneti MohammadAmirriazi</Authors>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/mberneti/kavenegar.Core</RepositoryUrl>
<RepositoryUrl>https://github.com/kavenegar/Kavenegar.Core</RepositoryUrl>
<Company>Kavenegar</Company>
<PackageIcon></PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions Kavenegar.Core/KavenegarApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class KavenegarApi
private int _returnCode = 200;
private string _returnMessage = "";
private const string Apipath = "{0}/{1}.{2}";
private const string BaseUrl = "http://api.kavenegar.com/v1";
private const string BaseUrl = "https://api.kavenegar.com/v1";
public KavenegarApi(string apikey)
{
_apikey = apikey;
Expand Down Expand Up @@ -126,8 +126,8 @@ private string GetApiPath(string _base, string method, string output)
private async Task<string> Execute(string path, Dictionary<string, object> _params)
{
var nvc = _params?.Select(x => new KeyValuePair<string, string>(x.Key, x.Value?.ToString()));

var postdata = new FormUrlEncodedContent(nvc);
var postdata = nvc != null ? new FormUrlEncodedContent(nvc):null;

var response = await _client.PostAsync(path, postdata);
var responseBody = await response.Content.ReadAsStringAsync();
Expand Down Expand Up @@ -192,7 +192,7 @@ public async Task<List<SendResult>> Send(string sender, List<string> receptor, s
{
{"sender", System.Net.WebUtility.HtmlEncode(sender)},
{"receptor", System.Net.WebUtility.HtmlEncode(StringHelper.Join(",", receptor.ToArray()))},
{"message", System.Net.WebUtility.HtmlEncode(message)},
{"message", message},
{"type", (int) type},
{"date", date == DateTime.MinValue ? 0 : DateHelper.DateTimeToUnixTimestamp(date)}
};
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ A cross-platform library for the Kavenegar sms web service; written in C#.
This package uses [kavenegar-csharp](https://github.com/KaveNegar/kavenegar-csharp) project under the hood.

## Installation
The package can be installed via [nuget](https://www.nuget.org/packages/Kavenegar.Core/1.0.1-alpha2):
The package can be installed via [nuget](https://www.nuget.org/packages/KavenegarDotNetCore/):

##### Package Manager
```
Install-Package Kavenegar.Core -Version 1.0.1-alpha2
Install-Package KavenegarDotNetCore -Version 1.0.7
```
##### .NET CLI
```
dotnet add package Kavenegar.Core --version 1.0.1-alpha2
dotnet add package KavenegarDotNetCore --version 1.0.7
```

## Usage
Expand Down