Merge branch 'develop' into develop

UnigramDev · Nov 15, 2017 · 88cf733 · 88cf733
2 parents 3533a4d + b5fb78a
commit 88cf733
Show file tree

Hide file tree

Showing 51 changed files with 3,082 additions and 2,322 deletions.
diff --git a/Unigram/Unigram.Core/Unigram.Core.csproj b/Unigram/Unigram.Core/Unigram.Core.csproj
@@ -176,7 +176,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Unigram.Api\Telegram.Api.csproj">
       <Project>{b1979f0b-11e6-4759-a54d-853b13139aa0}</Project>
-      <Name>Unigram.Api</Name>
+      <Name>Telegram.Api</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Unigram/Unigram.Tasks/Unigram.Tasks.csproj b/Unigram/Unigram.Tasks/Unigram.Tasks.csproj
@@ -124,7 +124,7 @@
     </ProjectReference>
     <ProjectReference Include="..\Unigram.Api\Telegram.Api.csproj">
       <Project>{b1979f0b-11e6-4759-a54d-853b13139aa0}</Project>
-      <Name>Unigram.Api</Name>
+      <Name>Telegram.Api</Name>
     </ProjectReference>
     <ProjectReference Include="..\Unigram.Core\Unigram.Core.csproj">
       <Project>{580d2885-8129-499e-9ffd-39ff1b586f18}</Project>

diff --git a/Unigram/Unigram.sln b/Unigram/Unigram.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2008
+VisualStudioVersion = 15.0.27102.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unigram", "Unigram\Unigram.csproj", "{2235E8EE-374A-4E49-8050-9B701467775D}"
 	ProjectSection(ProjectDependencies) = postProject

diff --git a/Unigram/Unigram/Common/AdminLogHelper.cs b/Unigram/Unigram/Common/AdminLogHelper.cs
diff --git a/Unigram/Unigram/Common/MessageHelper.cs b/Unigram/Unigram/Common/MessageHelper.cs
@@ -1325,7 +1325,7 @@ public static async void NavigateToUsername(IMTProtoService protoService, string
                     //                return;
                     //            }
                     //        }
-                    //        MessageBox.Show(string.Format(AppResources.CantFindContactWithUsername, username), AppResources.Error, 0);
+                    //        MessageBox.Show(string.Format(Strings.Resources.CantFindContactWithUsername, username), Strings.Resources.Error, 0);
                     //    });
                     //}, delegate (TLRPCError error)
                     //{
@@ -1337,7 +1337,7 @@ public static async void NavigateToUsername(IMTProtoService protoService, string
                     //        }
                     //        if (error.CodeEquals(ErrorCode.BAD_REQUEST) && error.TypeEquals(ErrorType.USERNAME_NOT_OCCUPIED))
                     //        {
-                    //            MessageBox.Show(string.Format(AppResources.CantFindContactWithUsername, username), AppResources.Error, 0);
+                    //            MessageBox.Show(string.Format(Strings.Resources.CantFindContactWithUsername, username), Strings.Resources.Error, 0);
                     //            return;
                     //        }
                     //        Telegram.Api.Helpers.Execute.ShowDebugMessage(string.Format("contacts.resolveUsername {0} error {1}", username, error));
@@ -1400,17 +1400,17 @@ public static async void NavigateToInviteLink(string link)
                             }
                             if (import.Error.TypeEquals(TLErrorType.INVITE_HASH_EMPTY) || import.Error.TypeEquals(TLErrorType.INVITE_HASH_INVALID) || import.Error.TypeEquals(TLErrorType.INVITE_HASH_EXPIRED))
                             {
-                                //MessageBox.Show(AppResources.GroupNotExistsError, AppResources.Error, 0);
+                                //MessageBox.Show(Strings.Resources.GroupNotExistsError, Strings.Resources.Error, 0);
                                 return;
                             }
                             else if (import.Error.TypeEquals(TLErrorType.USERS_TOO_MUCH))
                             {
-                                //MessageBox.Show(AppResources.UsersTooMuch, AppResources.Error, 0);
+                                //MessageBox.Show(Strings.Resources.UsersTooMuch, Strings.Resources.Error, 0);
                                 return;
                             }
                             else if (import.Error.TypeEquals(TLErrorType.BOTS_TOO_MUCH))
                             {
-                                //MessageBox.Show(AppResources.BotsTooMuch, AppResources.Error, 0);
+                                //MessageBox.Show(Strings.Resources.BotsTooMuch, Strings.Resources.Error, 0);
                                 return;
                             }
                             else if (import.Error.TypeEquals(TLErrorType.USER_ALREADY_PARTICIPANT))
@@ -1433,7 +1433,7 @@ public static async void NavigateToInviteLink(string link)
                 }
                 if (response.Error.TypeEquals(TLErrorType.INVITE_HASH_EMPTY) || response.Error.TypeEquals(TLErrorType.INVITE_HASH_INVALID) || response.Error.TypeEquals(TLErrorType.INVITE_HASH_EXPIRED))
                 {
-                    //MessageBox.Show(AppResources.GroupNotExistsError, AppResources.Error, 0);
+                    //MessageBox.Show(Strings.Resources.GroupNotExistsError, Strings.Resources.Error, 0);
                     await TLMessageDialog.ShowAsync("This invite link is broken or has expired.", "Warning", "OK");
                     return;
                 }