sochix/TLSharp
1
0
Fork 0
mirror of https://github.com/sochix/TLSharp.git synced 2025-12-06 08:02:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into pr/250

Browse source 
# Conflicts:
#	TLSharp.Core/TLSharp.Core.csproj
This commit is contained in:
Ilya P 2016-10-23 11:06:00 +03:00
parent 7d436e3954 6c54164726
commit f40034ad09
6 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -33,7 +33,7 @@ Library _almost_ ready for production usage. We need contributors to make 1.0.0
To use TLSharp follow next steps: To use TLSharp follow next steps:
1. Clone TLSharp from GitHub 1. Clone TLSharp from GitHub
1. Compile source with VS2015 1. Compile source with VS2015 or MonoDevelop
1. Add reference to ```TLSharp.Core.dll``` to your awesome project. 1. Add reference to ```TLSharp.Core.dll``` to your awesome project.
# Dependencies # Dependencies
@ -194,6 +194,7 @@ List of donators:
# Contributors # Contributors
* [Afshin Arani](http://aarani.ir) - TLGenerator, and a lot of other usefull things * [Afshin Arani](http://aarani.ir) - TLGenerator, and a lot of other usefull things
* [Knocte](https://github.com/knocte)
# License # License

15
TLSharp.Core/Network/MtProtoSender.cs
View file

@ -279,9 +279,7 @@ namespace TLSharp.Core.Network
{ {
var resultString = Regex.Match(errorMessage, @"\d+").Value; var resultString = Regex.Match(errorMessage, @"\d+").Value;
var dcIdx = int.Parse(resultString); var dcIdx = int.Parse(resultString);
var exception = new InvalidOperationException($"Your phone number registered to {dcIdx} dc. Please update settings. See https://github.com/sochix/TLSharp#i-get-an-error-migrate_x for details."); throw new MigrationNeededException(dcIdx);
exception.Data.Add("dcId", dcIdx);
throw exception;
} }
else else
{ {
@ -484,4 +482,15 @@ namespace TLSharp.Core.Network
return new MemoryStream(new byte[len], 0, len, true, true); return new MemoryStream(new byte[len], 0, len, true, true);
} }
} }
internal class MigrationNeededException : Exception
{
internal int DC { get; private set; }
internal MigrationNeededException(int dc)
: base ("$Your phone number is registered to a different dc: {dc}. Please migrate.")
{
DC = dc;
}
}
} }

2
TLSharp.Core/TLSharp.Core.csproj
View file

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TLSharp.Core</RootNamespace> <RootNamespace>TLSharp.Core</RootNamespace>
<AssemblyName>TLSharp.Core</AssemblyName> <AssemblyName>TLSharp.Core</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

11
TLSharp.Core/TelegramClient.cs
View file

@ -110,16 +110,9 @@ namespace TLSharp.Core
completed = true; completed = true;
} }
catch (InvalidOperationException ex) catch (MigrationNeededException ex)
{ {
if (ex.Message.StartsWith("Your phone number registered to") && ex.Data["dcId"] != null) await ReconnectToDcAsync(ex.DC);
{
await ReconnectToDcAsync((int)ex.Data["dcId"]);
}
else
{
throw;
}
} }
} }

2
TeleSharp.Generator/TeleSharp.Generator.csproj
View file

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TeleSharp.Generator</RootNamespace> <RootNamespace>TeleSharp.Generator</RootNamespace>
<AssemblyName>TeleSharp.Generator</AssemblyName> <AssemblyName>TeleSharp.Generator</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup> </PropertyGroup>

2
TeleSharp.TL/TeleSharp.TL.csproj
View file

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TeleSharp.TL</RootNamespace> <RootNamespace>TeleSharp.TL</RootNamespace>
<AssemblyName>TeleSharp.TL</AssemblyName> <AssemblyName>TeleSharp.TL</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">