RestSharp Update
This commit is contained in:
@@ -42,8 +42,8 @@
|
||||
</Reference>
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\PrototypChat\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
|
||||
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
|
||||
<HintPath>..\PrototypChat\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
|
||||
@@ -183,6 +183,8 @@ namespace ChatController.HauptKlassen
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void LoadMoreMessagesAsync(Contact contact, ChatMessage previousMessage, Action<List<ChatMessage>> callback)
|
||||
{
|
||||
LoadMoreMessagesFromServerAsync(contact.GroupId, _NextPage, () =>
|
||||
@@ -856,12 +858,26 @@ namespace ChatController.HauptKlassen
|
||||
});
|
||||
}
|
||||
|
||||
public void ReloadGroupsAsync(Action<ChatGruppenDaten> callback)
|
||||
public async Task ReloadGroupsAsync(Action<ChatGruppenDaten> callback)
|
||||
{
|
||||
var url = ChatDaten.ServerUrl + Constants.GetChatGroupsUrl;
|
||||
|
||||
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
|
||||
|
||||
// ToDo: Durch HttpClient ersetzen
|
||||
|
||||
using(var httpClient = new HttpClient())
|
||||
{
|
||||
httpClient.DefaultRequestHeaders.Add(Constants.Token, ChatDaten.AuthToken);
|
||||
httpClient.DefaultRequestHeaders.Add(Constants.CustomerId, ChatDaten.Kundennummer);
|
||||
|
||||
var test = await httpClient.GetStringAsync(url);
|
||||
|
||||
var gruppen = JsonConvert.DeserializeObject<ChatGruppenDaten>(test);
|
||||
}
|
||||
|
||||
|
||||
|
||||
var client = new RestClient(url);
|
||||
var request = new RestRequest();
|
||||
|
||||
|
||||
@@ -3,8 +3,10 @@ using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Net.Security;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using System.Windows;
|
||||
using ChatController.Core;
|
||||
|
||||
@@ -4,6 +4,7 @@ using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Threading;
|
||||
using ChatController.Annotations;
|
||||
@@ -33,7 +34,7 @@ namespace ChatController
|
||||
}
|
||||
|
||||
_Benutzername = value;
|
||||
OnPropertyChanged(nameof(UserName));
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +57,7 @@ namespace ChatController
|
||||
}
|
||||
|
||||
_ChatCode = value;
|
||||
OnPropertyChanged(nameof(ChatCode));
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +73,7 @@ namespace ChatController
|
||||
}
|
||||
|
||||
_Kundennummer = value;
|
||||
OnPropertyChanged(nameof(Tenant));
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,7 +202,7 @@ namespace ChatController
|
||||
|
||||
#if DEBUG
|
||||
//var debugFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "debug-info.txt");
|
||||
if(Tenant == "1122334455" && Directory.Exists(@"C:\Users\Lyndon Jetten"))
|
||||
if(Tenant == "1122334455" && Directory.Exists(@"C:\Users\Lyndon"))
|
||||
{
|
||||
ChatCode = "HprNe -1MwMB";
|
||||
UserName = "MikeGahn";
|
||||
@@ -209,7 +210,7 @@ namespace ChatController
|
||||
return;
|
||||
}
|
||||
|
||||
var debugFile = @"C:\Users\Lyndon Jetten\Desktop\debug-info.txt";
|
||||
var debugFile = @"C:\Users\Lyndon\Documents\ownchat-desktop-debug-info.txt";
|
||||
if (File.Exists(debugFile))
|
||||
{
|
||||
using(var streamReader2 = new StreamReader(debugFile, true))
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="RestSharp" version="105.2.3" targetFramework="net45" requireReinstallation="true" />
|
||||
<package id="RestSharp" version="106.15.0" targetFramework="net452" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user