From f2621dcb558b12a4430b6301b4af4a824d57eb6d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 22 Mar 2016 16:08:17 +0100 Subject: [PATCH] avoid android.* classes to allow for direct JUnit tests When running tests on the host machine, android.jar contains no code at all which is totally stupid. We can keep android.util.Log in there because it does not affect the logic at all. Then just set that android.jar to return generic values using: unitTests.returnDefaultValues = true --- F-Droid/build.gradle | 5 +++++ F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle index bb10eb128..aac624a6b 100644 --- a/F-Droid/build.gradle +++ b/F-Droid/build.gradle @@ -167,6 +167,11 @@ android { targetCompatibility JavaVersion.VERSION_1_7 } + testOptions { + // prevent tests from dying on android.util.Log calls + unitTests.returnDefaultValues = true + } + lintOptions { checkReleaseBuilds false abortOnError false diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java index bfe234d09..bebd55977 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java @@ -1,6 +1,5 @@ package org.fdroid.fdroid.net; -import android.text.TextUtils; import android.util.Log; import com.nostra13.universalimageloader.core.download.BaseImageDownloader; @@ -108,8 +107,8 @@ public class HttpDownloader extends Downloader { // workaround until NetCipher supports HTTPS SNI // https://gitlab.com/fdroid/fdroidclient/issues/431 if (connection instanceof HttpsURLConnection - && !TextUtils.equals(sourceUrl.getHost(), "f-droid.org") - && !TextUtils.equals(sourceUrl.getHost(), "guardianproject.info")) { + && "f-droid.org".equals(sourceUrl.getHost()) + && "guardianproject.info".equals(sourceUrl.getHost())) { ((HttpsURLConnection) connection).setSSLSocketFactory(HttpsURLConnection.getDefaultSSLSocketFactory()); }