Temporarily use patched version of HttpClient-Android 4.3.5 to avoid Basic Authorization bug

10 years ago · bfbd4569ed
parent a52e3507e7
commit bfbd4569ed
5 changed files with 150 additions and 5 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -12,9 +12,9 @@ android {

    buildTypes {
        debug {
-            minifyEnabled false
-            //minifyEnabled true
-            //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            //minifyEnabled false
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
        }
        release {
            minifyEnabled true
@ -30,6 +30,10 @@ android {
    }
 }

+configurations.all {
+    exclude module: 'commons-logging'       // undocumented part of Android
+}
+
 dependencies {
    // Apache Commons
    compile 'commons-lang:commons-lang:2.6'
@ -54,7 +58,9 @@ dependencies {
    compile 'dnsjava:dnsjava:2.1.6'

    // HttpClient 4.3, Android flavour for WebDAV operations
-    compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
+    // we have to use our patched version of 4.3.5 to avoid https://issues.apache.org/jira/browse/HTTPCLIENT-1566
+    compile files('lib/httpclient-android-4.3.5.davdroid1.jar')
+    // compile 'org.apache.httpcomponents:httpclient-android:4.3.5'

    // SimpleXML for parsing and generating WebDAV messages
    compile('org.simpleframework:simple-xml:2.7.1') {
--- a/app/lib/httpclient-android-4.3.5.davdroid1.jar
+++ b/app/lib/httpclient-android-4.3.5.davdroid1.jar
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@ -18,12 +18,14 @@
 -dontwarn freemarker.**				# freemarker templating library (for creating hCards) not used
 -dontwarn org.jsoup.**				# jsoup library (for hCard parsing) not used
 -dontwarn sun.misc.Perf
+-keep class ezvcard.property.** { *; }		# keep all VCard properties (created at runtime)

 # ical4j: ignore unused dynamic libraries
 -dontwarn groovy.**				# Groovy-based ContentBuilder not used
 -dontwarn org.codehaus.groovy.**
 -dontwarn org.apache.commons.logging.**		# Commons logging is not available
 -dontwarn net.fortuna.ical4j.model.**		# ignore warnings from Groovy dependency
+-keep class net.fortuna.ical4j.model.** { *; }	# keep all model classes (properties/factories, created at runtime)

 # dnsjava
 -dontwarn sun.net.spi.nameservice.**		# not available on Android
--- a/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java
@ -42,7 +42,7 @@ public class WebDavResourceTest extends InstrumentationTestCase {

 	@Override
 	protected void setUp() throws Exception {
-		httpClient = DavHttpClient.create(true, true);
+		httpClient = DavHttpClient.create();
 				
 		assetMgr = getInstrumentation().getContext().getResources().getAssets();
 		
--- a/app/target/manifest-merger-release-report.txt
+++ b/app/target/manifest-merger-release-report.txt
@ -0,0 +1,137 @@
+-- Merging decision tree log ---
+manifest
+ADDED from AndroidManifest.xml:2:1
+	package
+		ADDED from AndroidManifest.xml:3:5
+		INJECTED from AndroidManifest.xml:0:0
+		INJECTED from AndroidManifest.xml:0:0
+	android:versionName
+		ADDED from AndroidManifest.xml:5:5
+	android:versionCode
+		ADDED from AndroidManifest.xml:4:5
+		INJECTED from AndroidManifest.xml:0:0
+		INJECTED from AndroidManifest.xml:0:0
+	xmlns:android
+		ADDED from AndroidManifest.xml:2:11
+	android:installLocation
+		ADDED from AndroidManifest.xml:5:33
+uses-sdk
+ADDED from AndroidManifest.xml:7:5
+	android:targetSdkVersion
+		ADDED from AndroidManifest.xml:9:9
+		INJECTED from AndroidManifest.xml:0:0
+		INJECTED from AndroidManifest.xml:0:0
+	android:minSdkVersion
+		ADDED from AndroidManifest.xml:8:9
+		INJECTED from AndroidManifest.xml:0:0
+		INJECTED from AndroidManifest.xml:0:0
+uses-permission#android.permission.INTERNET
+ADDED from AndroidManifest.xml:11:5
+	android:name
+		ADDED from AndroidManifest.xml:11:22
+uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
+ADDED from AndroidManifest.xml:12:5
+	android:name
+		ADDED from AndroidManifest.xml:12:22
+uses-permission#android.permission.READ_CONTACTS
+ADDED from AndroidManifest.xml:13:5
+	android:name
+		ADDED from AndroidManifest.xml:13:22
+uses-permission#android.permission.WRITE_CONTACTS
+ADDED from AndroidManifest.xml:14:5
+	android:name
+		ADDED from AndroidManifest.xml:14:22
+uses-permission#android.permission.READ_CALENDAR
+ADDED from AndroidManifest.xml:15:5
+	android:name
+		ADDED from AndroidManifest.xml:15:22
+uses-permission#android.permission.WRITE_CALENDAR
+ADDED from AndroidManifest.xml:16:5
+	android:name
+		ADDED from AndroidManifest.xml:16:22
+uses-permission#android.permission.WRITE_SYNC_SETTINGS
+ADDED from AndroidManifest.xml:17:5
+	android:name
+		ADDED from AndroidManifest.xml:17:22
+application
+ADDED from AndroidManifest.xml:19:5
+	android:process
+		ADDED from AndroidManifest.xml:24:9
+	android:label
+		ADDED from AndroidManifest.xml:22:9
+	android:allowBackup
+		ADDED from AndroidManifest.xml:20:9
+	android:icon
+		ADDED from AndroidManifest.xml:21:9
+	android:theme
+		ADDED from AndroidManifest.xml:23:9
+service#at.bitfire.davdroid.syncadapter.AccountAuthenticatorService
+ADDED from AndroidManifest.xml:25:9
+	android:exported
+		ADDED from AndroidManifest.xml:27:13
+	android:name
+		ADDED from AndroidManifest.xml:26:13
+intent-filter#android.accounts.AccountAuthenticator
+ADDED from AndroidManifest.xml:28:13
+action#android.accounts.AccountAuthenticator
+ADDED from AndroidManifest.xml:29:17
+	android:name
+		ADDED from AndroidManifest.xml:29:25
+meta-data#android.accounts.AccountAuthenticator
+ADDED from AndroidManifest.xml:32:13
+	android:resource
+		ADDED from AndroidManifest.xml:34:17
+	android:name
+		ADDED from AndroidManifest.xml:33:17
+service#at.bitfire.davdroid.syncadapter.ContactsSyncAdapterService
+ADDED from AndroidManifest.xml:36:9
+	android:exported
+		ADDED from AndroidManifest.xml:38:13
+	android:name
+		ADDED from AndroidManifest.xml:37:13
+intent-filter#android.content.SyncAdapter
+ADDED from AndroidManifest.xml:39:13
+action#android.content.SyncAdapter
+ADDED from AndroidManifest.xml:40:17
+	android:name
+		ADDED from AndroidManifest.xml:40:25
+meta-data#android.content.SyncAdapter
+ADDED from AndroidManifest.xml:43:13
+	android:resource
+		ADDED from AndroidManifest.xml:45:17
+	android:name
+		ADDED from AndroidManifest.xml:44:17
+meta-data#android.provider.CONTACTS_STRUCTURE
+ADDED from AndroidManifest.xml:46:13
+	android:resource
+		ADDED from AndroidManifest.xml:48:17
+	android:name
+		ADDED from AndroidManifest.xml:47:17
+service#at.bitfire.davdroid.syncadapter.CalendarsSyncAdapterService
+ADDED from AndroidManifest.xml:50:9
+	android:exported
+		ADDED from AndroidManifest.xml:52:13
+	android:name
+		ADDED from AndroidManifest.xml:51:13
+activity#at.bitfire.davdroid.MainActivity
+ADDED from AndroidManifest.xml:62:9
+	android:label
+		ADDED from AndroidManifest.xml:64:13
+	android:name
+		ADDED from AndroidManifest.xml:63:13
+intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
+ADDED from AndroidManifest.xml:65:13
+action#android.intent.action.MAIN
+ADDED from AndroidManifest.xml:66:17
+	android:name
+		ADDED from AndroidManifest.xml:66:25
+category#android.intent.category.LAUNCHER
+ADDED from AndroidManifest.xml:67:17
+	android:name
+		ADDED from AndroidManifest.xml:67:27
+activity#at.bitfire.davdroid.syncadapter.AddAccountActivity
+ADDED from AndroidManifest.xml:70:9
+	android:excludeFromRecents
+		ADDED from AndroidManifest.xml:72:13
+	android:name
+		ADDED from AndroidManifest.xml:71:13