Skip to content

Commit 1021b59

Browse files
author
Karl Rieb
committed
Rename clientUserAgentIdentifier to sdkUserAgentIdentifier and fix compilation issues with OkHttpRequestor.
1 parent 6e79776 commit 1021b59

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎examples/android/src/main/java/com/dropbox/core/examples/android/DropboxClientFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static void init(String accessToken) {
2020
DbxRequestConfig requestConfig = new DbxRequestConfig(
2121
"examples-v2-demo",
2222
userLocale,
23-
OkHttpRequestor.Instance);
23+
OkHttpRequestor.INSTANCE);
2424

2525
sDbxClient = new DbxClientV2(requestConfig, accessToken, DbxHost.Default);
2626
}

‎src/com/dropbox/core/DbxRequestUtil.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -104,31 +104,31 @@ public static List<HttpRequestor.Header> addSelectUserHeader(/*@Nullable*/List<H
104104

105105
public static List<HttpRequestor.Header> addUserAgentHeader(/*@Nullable*/List<HttpRequestor.Header> headers,
106106
DbxRequestConfig requestConfig,
107-
String clientUserAgentIdentifier)
107+
String sdkUserAgentIdentifier)
108108
{
109109
if (headers == null) headers = new ArrayList<HttpRequestor.Header>();
110-
headers.add(buildUserAgentHeader(requestConfig, clientUserAgentIdentifier));
110+
headers.add(buildUserAgentHeader(requestConfig, sdkUserAgentIdentifier));
111111
return headers;
112112
}
113113

114-
public static HttpRequestor.Header buildUserAgentHeader(DbxRequestConfig requestConfig, String clientUserAgentIdentifier)
114+
public static HttpRequestor.Header buildUserAgentHeader(DbxRequestConfig requestConfig, String sdkUserAgentIdentifier)
115115
{
116-
return new HttpRequestor.Header("User-Agent", requestConfig.clientIdentifier + " " + clientUserAgentIdentifier + "/" + DbxSdkVersion.Version);
116+
return new HttpRequestor.Header("User-Agent", requestConfig.clientIdentifier + " " + sdkUserAgentIdentifier + "/" + DbxSdkVersion.Version);
117117
}
118118

119119
/**
120120
* Convenience function for making HTTP GET requests.
121121
*/
122122
public static HttpRequestor.Response startGet(DbxRequestConfig requestConfig,
123123
String accessToken,
124-
String clientUserAgentIdentifier,
124+
String sdkUserAgentIdentifier,
125125
String host,
126126
String path,
127127
/*@Nullable*/String/*@Nullable*/[] params,
128128
/*@Nullable*/List<HttpRequestor.Header> headers)
129129
throws DbxException.NetworkIO
130130
{
131-
headers = addUserAgentHeader(headers, requestConfig, clientUserAgentIdentifier);
131+
headers = addUserAgentHeader(headers, requestConfig, sdkUserAgentIdentifier);
132132
headers = addAuthHeader(headers, accessToken);
133133

134134
String url = buildUrlWithParams(requestConfig.userLocale, host, path, params);
@@ -145,13 +145,13 @@ public static HttpRequestor.Response startGet(DbxRequestConfig requestConfig,
145145
*/
146146
public static HttpRequestor.Uploader startPut(DbxRequestConfig requestConfig,
147147
String accessToken,
148-
String clientUserAgentIdentifier,
148+
String sdkUserAgentIdentifier,
149149
String host, String path,
150150
/*@Nullable*/String/*@Nullable*/[] params,
151151
/*@Nullable*/List<HttpRequestor.Header> headers)
152152
throws DbxException.NetworkIO
153153
{
154-
headers = addUserAgentHeader(headers, requestConfig, clientUserAgentIdentifier);
154+
headers = addUserAgentHeader(headers, requestConfig, sdkUserAgentIdentifier);
155155
headers = addAuthHeader(headers, accessToken);
156156

157157
String url = buildUrlWithParams(requestConfig.userLocale, host, path, params);
@@ -167,7 +167,7 @@ public static HttpRequestor.Uploader startPut(DbxRequestConfig requestConfig,
167167
* Convenience function for making HTTP POST requests.
168168
*/
169169
public static HttpRequestor.Response startPostNoAuth(DbxRequestConfig requestConfig,
170-
String clientUserAgentIdentifier,
170+
String sdkUserAgentIdentifier,
171171
String host,
172172
String path,
173173
/*@Nullable*/String/*@Nullable*/[] params,
@@ -179,15 +179,15 @@ public static HttpRequestor.Response startPostNoAuth(DbxRequestConfig requestCon
179179
if (headers == null) headers = new ArrayList<HttpRequestor.Header>();
180180
headers.add(new HttpRequestor.Header("Content-Type", "application/x-www-form-urlencoded; charset=utf-8"));
181181

182-
return startPostRaw(requestConfig, clientUserAgentIdentifier, host, path, encodedParams, headers);
182+
return startPostRaw(requestConfig, sdkUserAgentIdentifier, host, path, encodedParams, headers);
183183
}
184184

185185

186186
/**
187187
* Convenience function for making HTTP POST requests. Like startPostNoAuth but takes byte[] instead of params.
188188
*/
189189
public static HttpRequestor.Response startPostRaw(DbxRequestConfig requestConfig,
190-
String clientUserAgentIdentifier,
190+
String sdkUserAgentIdentifier,
191191
String host,
192192
String path,
193193
byte[] body,
@@ -196,7 +196,7 @@ public static HttpRequestor.Response startPostRaw(DbxRequestConfig requestConfig
196196
{
197197
String uri = buildUri(host, path);
198198

199-
headers = addUserAgentHeader(headers, requestConfig, clientUserAgentIdentifier);
199+
headers = addUserAgentHeader(headers, requestConfig, sdkUserAgentIdentifier);
200200
headers.add(new HttpRequestor.Header("Content-Length", Integer.toString(body.length)));
201201

202202
try {
@@ -359,15 +359,15 @@ public static abstract class ResponseHandler<T>
359359

360360
public static <T> T doGet(DbxRequestConfig requestConfig,
361361
String accessToken,
362-
String clientUserAgentIdentifier,
362+
String sdkUserAgentIdentifier,
363363
String host,
364364
String path,
365365
/*@Nullable*/String/*@Nullable*/[] params,
366366
/*@Nullable*/List<HttpRequestor.Header> headers,
367367
ResponseHandler<T> handler)
368368
throws DbxException
369369
{
370-
HttpRequestor.Response response = startGet(requestConfig, accessToken, clientUserAgentIdentifier, host, path, params, headers);
370+
HttpRequestor.Response response = startGet(requestConfig, accessToken, sdkUserAgentIdentifier, host, path, params, headers);
371371
try {
372372
return handler.handle(response);
373373
}
@@ -384,7 +384,7 @@ public static <T> T doGet(DbxRequestConfig requestConfig,
384384

385385
public static <T> T doPost(DbxRequestConfig requestConfig,
386386
String accessToken,
387-
String clientUserAgentIdentifier,
387+
String sdkUserAgentIdentifier,
388388
String host,
389389
String path,
390390
/*@Nullable*/String/*@Nullable*/[] params,
@@ -393,19 +393,19 @@ public static <T> T doPost(DbxRequestConfig requestConfig,
393393
throws DbxException
394394
{
395395
headers = addAuthHeader(headers, accessToken);
396-
return doPostNoAuth(requestConfig, clientUserAgentIdentifier, host, path, params, headers, handler);
396+
return doPostNoAuth(requestConfig, sdkUserAgentIdentifier, host, path, params, headers, handler);
397397
}
398398

399399
public static <T> T doPostNoAuth(DbxRequestConfig requestConfig,
400-
String clientUserAgentIdentifier,
400+
String sdkUserAgentIdentifier,
401401
String host,
402402
String path,
403403
/*@Nullable*/String/*@Nullable*/[] params,
404404
/*@Nullable*/List<HttpRequestor.Header> headers,
405405
ResponseHandler<T> handler)
406406
throws DbxException
407407
{
408-
HttpRequestor.Response response = startPostNoAuth(requestConfig, clientUserAgentIdentifier, host, path, params, headers);
408+
HttpRequestor.Response response = startPostNoAuth(requestConfig, sdkUserAgentIdentifier, host, path, params, headers);
409409
return finishResponse(response, handler);
410410
}
411411

‎test/com/dropbox/core/v1/DbxClientV1Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private void init()
5959
if (okHttp == null || okHttp.equals("false")) {
6060
requestConfig = new DbxRequestConfig("sdk-test", null);
6161
} else if (okHttp.equals("true")) {
62-
requestConfig = new DbxRequestConfig("sdk-test", null, OkHttpRequestor.Instance);
62+
requestConfig = new DbxRequestConfig("sdk-test", null, OkHttpRequestor.INSTANCE);
6363
} else {
6464
throw new RuntimeException("Invalid value for System property \"okHttp\"." +
6565
" Expecting \"true\" or \"false\", got " + jq(okHttp) + ".");

0 commit comments

Comments
 (0)