switch to official nanohttpd releases

closes #248

app/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     compile 'commons-io:commons-io:2.5'
     compile 'commons-net:commons-net:3.5'
     compile 'org.jmdns:jmdns:3.5.3'
+    compile 'org.nanohttpd:nanohttpd:2.3.1'
     compile 'ch.acra:acra:4.9.1'
     compile 'io.reactivex:rxjava:1.1.0'
     compile 'io.reactivex:rxandroid:0.23.0'
@@ -66,10 +67,6 @@ if (!hasProperty('sourceDeps')) {
         compile 'com.madgag.spongycastle:prov:1.54.0.0'
         compile 'com.madgag.spongycastle:core:1.54.0.0'
 
-        // Fork for F-Droid, including support for https. Not merged into upstream
-        // yet (seems to be a little unsupported as of late), so not using mavenCentral/jcenter.
-        compile files('libs/binaryDeps/nanohttpd-2.1.0.jar')
-
         // Upstream doesn't have a binary on mavenCentral, and it is an SVN repo on
         // Google Code.  We include this code directly in this repo, and have made
         // modifications that should be pushed to anyone who wants to maintain it.
@@ -135,7 +132,6 @@ if (!hasProperty('sourceDeps')) {
     logger.info "Setting up *source* dependencies for F-Droid (because you passed in the -PsourceDeps argument to gradle while building)."
 
     dependencies {
-        compile project(':extern:nanohttpd:core')
         compile project(':extern:zipsigner')
     }
 
@@ -145,7 +141,6 @@ if (!hasProperty('sourceDeps')) {
         description = "Copies .jar and .aar files from subproject dependencies in extern/ to app/libs. Requires the sourceDeps property to be set (\"gradle -PsourceDeps binaryDeps\")"
 
         from('../extern/') {
-            include 'nanohttpd/core/build/libs/nanohttpd-2.1.0.jar'
             include 'zipsigner/build/libs/zipsigner.jar'
         }
 

app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java

@@ -5,12 +5,13 @@ import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
-
+import fi.iki.elonen.NanoHTTPD;
 import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.localrepo.LocalRepoKeyStore;
 import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
 
+import javax.net.ssl.SSLServerSocketFactory;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
@@ -26,10 +27,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.net.ssl.SSLServerSocketFactory;
-
-import fi.iki.elonen.NanoHTTPD;
-
 public class LocalHTTPD extends NanoHTTPD {
     private static final String TAG = "LocalHTTPD";
 
@@ -93,10 +90,10 @@ public class LocalHTTPD extends NanoHTTPD {
                 session.parseBody(new HashMap<String, String>());
             } catch (IOException e) {
                 Log.e(TAG, "An error occured while parsing the POST body", e);
-                return new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT,
+                return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT,
                         "Internal server error, check logcat on server for details.");
             } catch (ResponseException re) {
-                return new Response(re.getStatus(), MIME_PLAINTEXT, re.getMessage());
+                return newFixedLengthResponse(re.getStatus(), MIME_PLAINTEXT, re.getMessage());
             }
 
             return handlePost(session);
@@ -111,13 +108,13 @@ public class LocalHTTPD extends NanoHTTPD {
                 if (!session.getParms().containsKey("repo")) {
                     Log.e(TAG, "Malformed /request-swap request to local repo HTTP server."
                             + " Should have posted a 'repo' parameter.");
-                    return new Response(Response.Status.BAD_REQUEST, MIME_PLAINTEXT,
+                    return newFixedLengthResponse(Response.Status.BAD_REQUEST, MIME_PLAINTEXT,
                             "Requires 'repo' parameter to be posted.");
                 }
                 requestSwap(session.getParms().get("repo"));
-                return new Response(Response.Status.OK, MIME_PLAINTEXT, "Swap request received.");
+                return newFixedLengthResponse(Response.Status.OK, MIME_PLAINTEXT, "Swap request received.");
         }
-        return new Response("");
+        return newFixedLengthResponse("");
     }
 
     private Response handleGet(IHTTPSession session) {
@@ -155,7 +152,7 @@ public class LocalHTTPD extends NanoHTTPD {
             SSLServerSocketFactory factory = NanoHTTPD.makeSSLSocketFactory(
                     localRepoKeyStore.getKeyStore(),
                     localRepoKeyStore.getKeyManagers());
-            makeSecure(factory);
+            makeSecure(factory, null);
         } catch (LocalRepoKeyStore.InitException | IOException e) {
             Log.e(TAG, "Could not enable HTTPS", e);
         }
@@ -209,7 +206,7 @@ public class LocalHTTPD extends NanoHTTPD {
             }
         }
 
-        Response response = serveFile(headers, f, getMimeTypeForFile(uri));
+        Response response = serveFile(headers, f, getAndroidMimeTypeForFile(uri));
         return response != null ? response :
                 createResponse(Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT,
                         "Error 404, file not found.");
@@ -298,19 +295,19 @@ public class LocalHTTPD extends NanoHTTPD {
 
     // Announce that the file server accepts partial content requests
     private Response createResponse(Response.Status status, String mimeType, InputStream message) {
-        Response res = new Response(status, mimeType, message);
+        Response res = newChunkedResponse(status, mimeType, message);
         res.addHeader("Accept-Ranges", "bytes");
         return res;
     }
 
     // Announce that the file server accepts partial content requests
     private Response createResponse(Response.Status status, String mimeType, String message) {
-        Response res = new Response(status, mimeType, message);
+        Response res = newFixedLengthResponse(status, mimeType, message);
         res.addHeader("Accept-Ranges", "bytes");
         return res;
     }
 
-    private static String getMimeTypeForFile(String uri) {
+    private static String getAndroidMimeTypeForFile(String uri) {
         String type = null;
         String extension = MimeTypeMap.getFileExtensionFromUrl(uri);
         if (extension != null) {

extern/nanohttpd/LICENSE.md

@@ -1,12 +0,0 @@
-Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of the NanoHttpd organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

extern/nanohttpd/core/build.gradle

@@ -1,14 +0,0 @@
-apply plugin: 'java'
-
-version = '2.1.0'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-jar {
-    baseName = 'nanohttpd'
-}
-
-repositories {
-    mavenCentral()
-}