Merge pull request #57 from mirisbowring/Fix-#51

Implement Custom User-Agent to prevent firewall banning

Author: eikek

app/src/main/java/org/docspell/docspellshare/http/HttpRequest.java

@@ -35,6 +35,7 @@ public final class HttpRequest {
                   ConnectionSpec.CLEARTEXT))
           .readTimeout(5, TimeUnit.MINUTES)
           .writeTimeout(5, TimeUnit.MINUTES)
+          .addInterceptor(new UserAgentInterceptor())
           .socketFactory(new RestrictedSocketFactory(CHUNK_SIZE))
           .followRedirects(true)
           .followSslRedirects(true)
@@ -48,15 +49,15 @@ private HttpRequest(String url, List<DataPart> data) {
     this.data = data;
   }
 
-  public int execute(ProgressListener progressListener) throws IOException {
+  public Response execute(ProgressListener progressListener) throws IOException {
     MultipartBody.Builder body = new MultipartBody.Builder().setType(MultipartBody.FORM);
     for (DataPart dp : data) {
       body.addFormDataPart("file", dp.getName(), createPartBody(dp, progressListener));
     }
 
     Request req = new Request.Builder().url(url).post(body.build()).build();
     Response response = client.newCall(req).execute();
-    return response.code();
+    return response;
   }
 
   public static Builder newBuilder() {

app/src/main/java/org/docspell/docspellshare/http/UploadManager.java

@@ -7,6 +7,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
+import okhttp3.Response;
+
 public final class UploadManager {
 
   private static final UploadManager INSTANCE = new UploadManager();
@@ -46,8 +48,13 @@ static class UploadWorker implements Runnable {
     public void run() {
       Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
       try {
-        int code = request.execute(listener);
-        listener.onFinish(code);
+        Response resp = null;
+        try {
+          resp = request.execute(listener);
+          listener.onFinish(resp.code());
+        } finally {
+          resp.close();
+        }
       } catch (IOException e) {
         Log.e("upload", "Error uploading!", e);
         listener.onException(e);

app/src/main/java/org/docspell/docspellshare/http/UserAgentInterceptor.java

@@ -0,0 +1,45 @@
+package org.docspell.docspellshare.http;
+
+import android.os.Build;
+
+import org.docspell.docspellshare.BuildConfig;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * Adds a custom {@code User-Agent} header to OkHttp requests.
+ */
+public class UserAgentInterceptor implements Interceptor {
+
+    public final String userAgent;
+
+    public UserAgentInterceptor(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public UserAgentInterceptor() {
+        this(String.format(Locale.US,
+                "%s/%s (Android %s; %s; %s %s; %s)",
+                "Docspellshare",
+                BuildConfig.VERSION_NAME,
+                Build.VERSION.RELEASE,
+                Build.MODEL,
+                Build.BRAND,
+                Build.DEVICE,
+                Locale.getDefault().getLanguage()));
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request userAgentRequest = chain.request()
+                .newBuilder()
+                .header("User-Agent", userAgent)
+                .build();
+        return chain.proceed(userAgentRequest);
+    }
+}