Skip to content

fix issue with "already added : Lokio/AsyncTimeout" #35

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix issue with "already added : Lokio/AsyncTimeout" #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 15 deletions src/Plugin.FileUploader.Android/CountingRequestBody.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

using Android.App;
using Android.Content;
using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using OkHttp;
using OkHttp.Okio;
using Square.OkHttp3;
using Square.OkIO;

namespace Plugin.FileUploader
{
Expand All @@ -36,14 +25,14 @@ public override long ContentLength()
return _body.ContentLength();
}

public override void WriteTo(OkHttp.Okio.IBufferedSink p0)
public override void WriteTo(IBufferedSink p0)
{

try
{
IBufferedSink bufferedSink;
countingSink = new CountingSink(this, p0);
bufferedSink = Okio.Buffer(countingSink);
bufferedSink = OkIO.Buffer(countingSink);

_body.WriteTo(bufferedSink);

Expand Down
26 changes: 14 additions & 12 deletions src/Plugin.FileUploader.Android/FileUploadManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Java.Util.Concurrent;
using Plugin.FileUploader.Abstractions;
using OkHttp;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Android.Webkit;
using System.Collections.ObjectModel;
using Square.OkHttp3;

namespace Plugin.FileUploader
{
Expand Down Expand Up @@ -189,19 +189,19 @@ public async Task<FileUploadResponse> UploadFileAsync(string url, FilePathItem[]
}


MultipartBuilder PrepareRequest(IDictionary<string, string> parameters = null,string boundary = null)
MultipartBody.Builder PrepareRequest(IDictionary<string, string> parameters = null, string boundary = null)
{
MultipartBuilder requestBodyBuilder = null;
MultipartBody.Builder requestBodyBuilder = null;

if(string.IsNullOrEmpty(boundary))
if (string.IsNullOrEmpty(boundary))
{
requestBodyBuilder = new MultipartBuilder()
.Type(MultipartBuilder.Form);
requestBodyBuilder = new MultipartBody.Builder()
.SetType(MultipartBody.Form);
}
else
{
requestBodyBuilder = new MultipartBuilder(boundary)
.Type(MultipartBuilder.Form);
requestBodyBuilder = new MultipartBody.Builder(boundary)
.SetType(MultipartBody.Form);
}

if (parameters != null)
Expand All @@ -216,7 +216,7 @@ MultipartBuilder PrepareRequest(IDictionary<string, string> parameters = null,st
}
return requestBodyBuilder;
}
FileUploadResponse MakeRequest(string url,string tag, MultipartBuilder requestBodyBuilder, IDictionary<string, string> headers = null)
FileUploadResponse MakeRequest(string url, string tag, MultipartBody.Builder requestBodyBuilder, IDictionary<string, string> headers = null)
{
//RequestBody requestBody = requestBodyBuilder.Build();
CountingRequestBody requestBody = new CountingRequestBody(requestBodyBuilder.Build(),tag,this);
Expand All @@ -238,9 +238,11 @@ FileUploadResponse MakeRequest(string url,string tag, MultipartBuilder requestB
.Post(requestBody)
.Build();

OkHttpClient client = new OkHttpClient();
client.SetConnectTimeout(ConnectUploadTimeout, UploadTimeoutUnit); // connect timeout
client.SetReadTimeout(SocketUploadTimeout, UploadTimeoutUnit); // socket timeout
OkHttpClient client = new OkHttpClient()
.NewBuilder()
.ReadTimeout(SocketUploadTimeout, UploadTimeoutUnit)
.ConnectTimeout(ConnectUploadTimeout, UploadTimeoutUnit)
.Build();

Response response = client.NewCall(request).Execute();
var responseString = response.Body().String();
Expand Down
16 changes: 10 additions & 6 deletions src/Plugin.FileUploader.Android/Plugin.FileUploader.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,24 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="OkHttp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="Square.OkIO">
<HintPath>..\packages\Square.OkIO.1.17.4\lib\monoandroid44\Square.OkIO.dll</HintPath>
</Reference>
<Reference Include="Java.Interop" />
<Reference Include="Square.OkHttp3">
<HintPath>..\packages\Square.OkHttp3.3.12.6\lib\monoandroid44\Square.OkHttp3.dll</HintPath>
</Reference>
<Reference Include="ModernHttpClient">
<HintPath>..\packages\modernhttpclient-updated.3.4.3\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CountingRequestBody.cs" />
Expand Down
4 changes: 3 additions & 1 deletion src/Plugin.FileUploader.Android/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="monoandroid71" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid71" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid71" />
<package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid71" />
<package id="modernhttpclient-updated" version="3.4.3" targetFramework="monoandroid80" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="monoandroid71" />
<package id="Square.OkHttp3" version="3.12.6" targetFramework="monoandroid80" />
<package id="Square.OkIO" version="1.17.4" targetFramework="monoandroid80" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid71" />
Expand Down