Skip to content

Commit 0b66055

Browse files
committed
Merge pull request #1 from Automattic/feature/add-ability-to-make-synch-calls
Use Volley native listeners instead our implementation
2 parents 8480e3d + 8a876d2 commit 0b66055

File tree

3 files changed

+23
-31
lines changed

3 files changed

+23
-31
lines changed

src/com/wordpress/rest/Oauth.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package com.wordpress.rest;
22

3-
import android.util.Log;
4-
5-
import com.android.volley.Response;
6-
import com.android.volley.ParseError;
7-
import com.android.volley.toolbox.HttpHeaderParser;
8-
import com.android.volley.NetworkResponse;
3+
import java.io.UnsupportedEncodingException;
4+
import java.util.HashMap;
5+
import java.util.Map;
96

10-
import org.json.JSONObject;
117
import org.json.JSONException;
8+
import org.json.JSONObject;
129

13-
import java.io.UnsupportedEncodingException;
14-
15-
import java.util.Map;
16-
import java.util.HashMap;
10+
import com.android.volley.NetworkResponse;
11+
import com.android.volley.ParseError;
12+
import com.android.volley.Response;
13+
import com.android.volley.toolbox.HttpHeaderParser;
1714

1815
public class Oauth {
1916

src/com/wordpress/rest/RestClient.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package com.wordpress.rest;
22

3-
import android.util.Log;
4-
import android.content.Context;
3+
import java.io.UnsupportedEncodingException;
4+
import java.net.URLEncoder;
5+
import java.util.Map;
56

7+
import org.json.JSONObject;
8+
9+
import com.android.volley.Request.Method;
610
import com.android.volley.RequestQueue;
7-
import com.android.volley.toolbox.JsonRequest;
8-
import com.android.volley.Response.Listener;
911
import com.android.volley.Response.ErrorListener;
10-
import com.android.volley.toolbox.Volley;
11-
import com.android.volley.Request.Method;
12-
13-
import java.util.Map;
14-
import java.net.URLEncoder;
15-
import java.io.UnsupportedEncodingException;
12+
import com.android.volley.Response.Listener;
1613

1714
public class RestClient {
1815

@@ -33,18 +30,16 @@ public RestClient(RequestQueue queue, String token){
3330
mAccessToken = token;
3431
}
3532

36-
public RestRequest get(String path, RestRequest.Listener listener,
37-
RestRequest.ErrorListener errorListener){
33+
public RestRequest get(String path, Listener<JSONObject> listener, ErrorListener errorListener){
3834
return makeRequest(Method.GET, getAbsoluteURL(path), null, listener, errorListener);
3935
}
4036

41-
public RestRequest post(String path, Map<String,String> body, RestRequest.Listener listener,
42-
RestRequest.ErrorListener errorListener){
37+
public RestRequest post(String path, Map<String,String> body, Listener<JSONObject> listener, ErrorListener errorListener){
4338
return makeRequest(Method.POST, getAbsoluteURL(path), body, listener, errorListener);
4439
}
4540

4641
public RestRequest makeRequest(int method, String url, Map<String, String> params,
47-
RestRequest.Listener listener, RestRequest.ErrorListener errorListener ){
42+
Listener<JSONObject> listener, ErrorListener errorListener ){
4843
RestRequest request = new RestRequest(method, url, params, listener, errorListener);
4944
request.setUserAgent(mUserAgent);
5045
request.setAccessToken(mAccessToken);

src/com/wordpress/rest/RestRequest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public class RestRequest extends Request<JSONObject> {
2020
public static final String REST_AUTHORIZATION_HEADER="Authorization";
2121
public static final String REST_AUTHORIZATION_FORMAT="Bearer %s";
2222

23-
public interface Listener extends Response.Listener<JSONObject> {}
24-
public interface ErrorListener extends Response.ErrorListener {}
23+
public interface Listener extends Response.Listener<JSONObject> {} //This is just a shortcut for Response.Listener<JSONObject>
24+
public interface ErrorListener extends Response.ErrorListener {} //This is just a shortcut for Response.ErrorListener
2525

26-
private final Listener mListener;
26+
private final com.android.volley.Response.Listener<JSONObject> mListener;
2727
private final Map<String,String> mParams;
2828
private final Map<String,String> mHeaders = new HashMap<String,String>(2);
29-
public RestRequest(int method, String url, Map<String, String> params, Listener listener,
30-
ErrorListener errorListener){
29+
public RestRequest(int method, String url, Map<String, String> params, com.android.volley.Response.Listener<JSONObject> listener,
30+
com.android.volley.Response.ErrorListener errorListener){
3131
super(method, url, errorListener);
3232
mParams = params;
3333
mListener = listener;

0 commit comments

Comments
 (0)