Skip to content

Commit

Permalink
changed header and parameter structures to arraylist of string pair
Browse files Browse the repository at this point in the history
  • Loading branch information
Ravindu committed Aug 24, 2018
1 parent 3cacc9a commit 7c1edbe
Show file tree
Hide file tree
Showing 7 changed files with 175 additions and 163 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.1.4'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions velocity/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 27
versionCode 5
versionName "1.0.5"
versionCode 6
versionName "1.0.6"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand Down
200 changes: 100 additions & 100 deletions velocity/src/androidTest/java/com/rw/velocity/ExampleInstrumentedTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,106 +555,106 @@ public void onVelocityFailed(Velocity.Response error)
assertNotNull(serverResponse.image);
}

@Test
public void upload() throws Exception
{
final CountDownLatch latch = new CountDownLatch(1);
String url ="https://www.posttestserver.com/post.php";

String test = "hello world";
InputStream stream = null;
try
{
stream = new ByteArrayInputStream(test.getBytes("UTF-8"));
}
catch (UnsupportedEncodingException e)
{
e.printStackTrace();
}

Velocity.initialize(3);
Velocity.getSettings().setLoggingEnabled(true);
Velocity.upload(url)
.withPathParam("dir", "velocity")
.withPathParam("method", "post")
.withPathParam("enctype", "multipart/form-data")
.setUploadSource(stream)
.connect(new Velocity.ResponseListener()
{
@Override
public void onVelocitySuccess(Velocity.Response response)
{
serverResponse = response;
latch.countDown();
}

@Override
public void onVelocityFailed(Velocity.Response error)
{
serverResponse = error;
latch.countDown();
}
});

latch.await();

final CountDownLatch latch2 = new CountDownLatch(1);
NetLog.d("response: " + serverResponse.body);

int start = serverResponse.body.indexOf("http");
int finish = serverResponse.body.indexOf("No Post");
String sub = serverResponse.body.substring(start, finish);

NetLog.d("file info: " + sub);
Velocity.get(sub).connect(new Velocity.ResponseListener()
{
@Override
public void onVelocitySuccess(Velocity.Response response)
{
serverResponse = response;
latch2.countDown();
}

@Override
public void onVelocityFailed(Velocity.Response error)
{
NetLog.d("error");
latch2.countDown();
}
});

//Thread.sleep(1000);

latch2.await();

String uploaded = serverResponse.body.substring(serverResponse.body.indexOf("Uploaded File: http"));
uploaded = uploaded.substring(uploaded.indexOf("http"));

NetLog.d("Uploaded file: " + uploaded);

final CountDownLatch latch3 = new CountDownLatch(1);

Velocity.get(uploaded).connect(new Velocity.ResponseListener()
{
@Override
public void onVelocitySuccess(Velocity.Response response)
{
serverResponse = response;
latch3.countDown();
}

@Override
public void onVelocityFailed(Velocity.Response error)
{
NetLog.d("error");
latch3.countDown();
}
});
latch3.await();

NetLog.d("upload file content: " + serverResponse.body);
assertEquals(test, serverResponse.body);
}
// @Test
// public void upload() throws Exception
// {
// final CountDownLatch latch = new CountDownLatch(1);
// String url ="http://ptsv2.com/t/yta0s-1535102199/post";
//
// String test = "hello world";
// InputStream stream = null;
// try
// {
// stream = new ByteArrayInputStream(test.getBytes("UTF-8"));
// }
// catch (UnsupportedEncodingException e)
// {
// e.printStackTrace();
// }
//
// Velocity.initialize(3);
// Velocity.getSettings().setLoggingEnabled(true);
// Velocity.upload(url)
// .withPathParam("dir", "velocity")
// .withPathParam("method", "post")
// .withPathParam("enctype", "multipart/form-data")
// .setUploadSource(stream)
// .connect(new Velocity.ResponseListener()
// {
// @Override
// public void onVelocitySuccess(Velocity.Response response)
// {
// serverResponse = response;
// latch.countDown();
// }
//
// @Override
// public void onVelocityFailed(Velocity.Response error)
// {
// serverResponse = error;
// latch.countDown();
// }
// });
//
// latch.await();
//
// final CountDownLatch latch2 = new CountDownLatch(1);
// NetLog.d("response: " + serverResponse.body);
//
// int start = serverResponse.body.indexOf("http");
// int finish = serverResponse.body.indexOf("No Post");
// String sub = serverResponse.body.substring(start, finish);
//
// NetLog.d("file info: " + sub);
// Velocity.get(sub).connect(new Velocity.ResponseListener()
// {
// @Override
// public void onVelocitySuccess(Velocity.Response response)
// {
// serverResponse = response;
// latch2.countDown();
// }
//
// @Override
// public void onVelocityFailed(Velocity.Response error)
// {
// NetLog.d("error");
// latch2.countDown();
// }
// });
//
// //Thread.sleep(1000);
//
// latch2.await();
//
// String uploaded = serverResponse.body.substring(serverResponse.body.indexOf("Uploaded File: http"));
// uploaded = uploaded.substring(uploaded.indexOf("http"));
//
// NetLog.d("Uploaded file: " + uploaded);
//
// final CountDownLatch latch3 = new CountDownLatch(1);
//
// Velocity.get(uploaded).connect(new Velocity.ResponseListener()
// {
// @Override
// public void onVelocitySuccess(Velocity.Response response)
// {
// serverResponse = response;
// latch3.countDown();
// }
//
// @Override
// public void onVelocityFailed(Velocity.Response error)
// {
// NetLog.d("error");
// latch3.countDown();
// }
// });
// latch3.await();
//
// NetLog.d("upload file content: " + serverResponse.body);
// assertEquals(test, serverResponse.body);
// }


}
19 changes: 9 additions & 10 deletions velocity/src/main/java/com/rw/velocity/Request.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.SystemClock;
import android.util.Pair;

import java.io.BufferedInputStream;
import java.io.BufferedReader;
Expand Down Expand Up @@ -110,8 +111,8 @@ void setupRequestHeaders()

if (!mBuilder.headers.isEmpty())
{
for (String key : mBuilder.headers.keySet())
mConnection.setRequestProperty(key, mBuilder.headers.get(key));
for (Pair<String, String> p : mBuilder.headers)
mConnection.setRequestProperty(p.first, p.second);
}
}

Expand All @@ -137,15 +138,13 @@ void setupRequestBody() throws IOException
if(mBuilder.contentType != null && mBuilder.contentType.equalsIgnoreCase(Velocity.ContentType.FORM_DATA_MULTIPART.toString()))
{
DataOutputStream dos = new DataOutputStream(mConnection.getOutputStream());
for(String param : mBuilder.params.keySet())
for(Pair<String, String> p : mBuilder.params)
{
String val = mBuilder.params.get(param);

dos.writeBytes(Velocity.Settings.TWOHYPHENS + Velocity.Settings.BOUNDARY + Velocity.Settings.LINEEND);
dos.writeBytes("Content-Disposition: form-data; name=\"" + param + "\"" + Velocity.Settings.LINEEND);
dos.writeBytes("Content-Disposition: form-data; name=\"" + p.first + "\"" + Velocity.Settings.LINEEND);
dos.writeBytes("Content-Type: text/plain" + Velocity.Settings.LINEEND);
dos.writeBytes(Velocity.Settings.LINEEND);
dos.writeBytes(val);
dos.writeBytes(p.second);
dos.writeBytes(Velocity.Settings.LINEEND);
}

Expand All @@ -171,16 +170,16 @@ private String getFormattedParams() throws UnsupportedEncodingException
StringBuilder params = new StringBuilder();
boolean first = true;

for (String key : mBuilder.params.keySet())
for (Pair<String, String> p : mBuilder.params)
{
if (first)
first = false;
else
params.append("&");

params.append(URLEncoder.encode(key, "UTF-8"));
params.append(URLEncoder.encode(p.first, "UTF-8"));
params.append("=");
params.append(URLEncoder.encode(mBuilder.params.get(key), "UTF-8"));
params.append(URLEncoder.encode(p.second, "UTF-8"));
}

return params.toString();
Expand Down
Loading

0 comments on commit 7c1edbe

Please sign in to comment.