nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-27 06:41:15 +00:00
Code Releases Activity

Merge branch 'FlashSystems-master'

Browse source
This commit is contained in:
Felix Ableitner 2015-07-15 03:01:37 +02:00
commit fcf6506527
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/nutomic/syncthingandroid/syncthing/GetTask.java
View file

@ -55,14 +55,15 @@ public class GetTask extends AsyncTask<String, Void, String> {
String fullUri = params[0] + params[1]; String fullUri = params[0] + params[1];
Log.v(TAG, "Calling Rest API at " + fullUri); Log.v(TAG, "Calling Rest API at " + fullUri);
if (params.length == 5) {
LinkedList<NameValuePair> urlParams = new LinkedList<>();
urlParams.add(new BasicNameValuePair(params[3], params[4]));
fullUri += "?" + URLEncodedUtils.format(urlParams, HTTP.UTF_8);
}
// Retry at most 10 times before failing // Retry at most 10 times before failing
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
HttpClient httpclient = Https.createHttpsClient(mHttpsCertPath); HttpClient httpclient = Https.createHttpsClient(mHttpsCertPath);
if (params.length == 5) {
LinkedList<NameValuePair> urlParams = new LinkedList<>();
urlParams.add(new BasicNameValuePair(params[3], params[4]));
fullUri += "?" + URLEncodedUtils.format(urlParams, HTTP.UTF_8);
}
HttpGet get = new HttpGet(fullUri); HttpGet get = new HttpGet(fullUri);
get.addHeader(new BasicHeader(RestApi.HEADER_API_KEY, params[2])); get.addHeader(new BasicHeader(RestApi.HEADER_API_KEY, params[2]));