mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 12:02:16 +02:00
Code

Upgrade HttpClient from stock Android to Apache 4.4.1

Browse Source
This commit is contained in:
timrae 2015-09-27 14:20:10 +09:00
parent f1a97a0ae5
commit 8e65953f26
10 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AnkiDroid/build.gradle
View File

@ -30,9 +30,6 @@ android {
abortOnError false
disable 'TypographyEllipsis'
}
// TODO: Replace deprecated Apache HTTP library with more modern alternative
// https://github.com/ankidroid/Anki-Android/issues/3626
useLibrary 'org.apache.http.legacy'
}
dependencies {
@ -46,5 +43,6 @@ dependencies {
compile 'ch.acra:acra:4.6.2'
compile 'com.jakewharton.timber:timber:2.5.1'
compile 'com.google.code.gson:gson:2.3'
compile "cz.msebera.android:httpclient:4.4.1.1"
compile project(":api")
}

16
AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.java
View File

@ -21,14 +21,14 @@ package com.ichi2.anki.web;
import android.content.Context;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.HttpContext;
import cz.msebera.android.httpclient.HttpResponse;
import cz.msebera.android.httpclient.client.HttpClient;
import cz.msebera.android.httpclient.client.methods.HttpGet;
import cz.msebera.android.httpclient.impl.client.DefaultHttpClient;
import cz.msebera.android.httpclient.params.HttpConnectionParams;
import cz.msebera.android.httpclient.params.HttpParams;
import cz.msebera.android.httpclient.protocol.BasicHttpContext;
import cz.msebera.android.httpclient.protocol.HttpContext;
import java.io.BufferedReader;
import java.io.File;

4
AnkiDroid/src/main/java/com/ichi2/async/Connection.java
View File

@ -40,8 +40,8 @@ import com.ichi2.libanki.sync.RemoteMediaServer;
import com.ichi2.libanki.sync.RemoteServer;
import com.ichi2.libanki.sync.Syncer;
import org.apache.http.HttpResponse;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import cz.msebera.android.httpclient.HttpResponse;
import cz.msebera.android.httpclient.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.json.JSONException;
import org.json.JSONObject;

3
AnkiDroid/src/main/java/com/ichi2/libanki/sync/FullSyncer.java
View File

@ -21,7 +21,6 @@ import android.database.sqlite.SQLiteDatabaseCorruptException;
import com.ichi2.anki.AnkiDatabaseManager;
import com.ichi2.anki.AnkiDb;
import com.ichi2.anki.AnkiDroidApp;
import com.ichi2.anki.R;
import com.ichi2.anki.exception.UnknownHttpResponseException;
import com.ichi2.async.Connection;
@ -30,7 +29,7 @@ import com.ichi2.libanki.Consts;
import com.ichi2.libanki.Utils;
import com.ichi2.utils.VersionUtils;
import org.apache.http.HttpResponse;
import cz.msebera.android.httpclient.HttpResponse;
import java.io.File;
import java.io.FileInputStream;

36
AnkiDroid/src/main/java/com/ichi2/libanki/sync/HttpSyncer.java
View File

@ -28,24 +28,24 @@ import com.ichi2.libanki.Utils;
import com.ichi2.utils.VersionUtils;
import org.apache.commons.httpclient.contrib.ssl.EasySSLSocketFactory;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.params.ConnManagerPNames;
import org.apache.http.conn.params.ConnPerRouteBean;
import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.entity.AbstractHttpEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import cz.msebera.android.httpclient.HttpEntity;
import cz.msebera.android.httpclient.HttpResponse;
import cz.msebera.android.httpclient.HttpVersion;
import cz.msebera.android.httpclient.client.HttpClient;
import cz.msebera.android.httpclient.client.methods.HttpPost;
import cz.msebera.android.httpclient.conn.params.ConnManagerPNames;
import cz.msebera.android.httpclient.conn.params.ConnPerRouteBean;
import cz.msebera.android.httpclient.conn.scheme.PlainSocketFactory;
import cz.msebera.android.httpclient.conn.scheme.Scheme;
import cz.msebera.android.httpclient.conn.scheme.SchemeRegistry;
import cz.msebera.android.httpclient.entity.AbstractHttpEntity;
import cz.msebera.android.httpclient.impl.client.DefaultHttpClient;
import cz.msebera.android.httpclient.impl.conn.tsccm.ThreadSafeClientConnManager;
import cz.msebera.android.httpclient.params.BasicHttpParams;
import cz.msebera.android.httpclient.params.CoreProtocolPNames;
import cz.msebera.android.httpclient.params.HttpConnectionParams;
import cz.msebera.android.httpclient.params.HttpParams;
import cz.msebera.android.httpclient.params.HttpProtocolParams;
import org.json.JSONException;
import org.json.JSONObject;

2
AnkiDroid/src/main/java/com/ichi2/libanki/sync/RemoteMediaServer.java
View File

@ -28,7 +28,7 @@ import com.ichi2.libanki.Consts;
import com.ichi2.libanki.Utils;
import com.ichi2.utils.VersionUtils;
import org.apache.http.HttpResponse;
import cz.msebera.android.httpclient.HttpResponse;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

2
AnkiDroid/src/main/java/com/ichi2/libanki/sync/RemoteServer.java
View File

@ -24,7 +24,7 @@ import com.ichi2.libanki.Consts;
import com.ichi2.libanki.Utils;
import com.ichi2.utils.VersionUtils;
import org.apache.http.HttpResponse;
import cz.msebera.android.httpclient.HttpResponse;
import org.json.JSONException;
import org.json.JSONObject;

2
AnkiDroid/src/main/java/com/ichi2/libanki/sync/Syncer.java
View File

@ -30,7 +30,7 @@ import com.ichi2.libanki.Consts;
import com.ichi2.libanki.Utils;
import com.ichi2.utils.ConvUtils;
import org.apache.http.HttpResponse;
import cz.msebera.android.httpclient.HttpResponse;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

16
AnkiDroid/src/main/java/com/ichi2/utils/HttpUtility.java
View File

@ -3,15 +3,13 @@ package com.ichi2.utils;
import com.ichi2.anki.AnkiDroidApp;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import cz.msebera.android.httpclient.HttpResponse;
import cz.msebera.android.httpclient.NameValuePair;
import cz.msebera.android.httpclient.client.ClientProtocolException;
import cz.msebera.android.httpclient.client.HttpClient;
import cz.msebera.android.httpclient.client.entity.UrlEncodedFormEntity;
import cz.msebera.android.httpclient.client.methods.HttpPost;
import cz.msebera.android.httpclient.impl.client.DefaultHttpClient;
import java.io.IOException;
import java.util.List;

10
AnkiDroid/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasySSLSocketFactory.java
View File

@ -1,11 +1,11 @@
package org.apache.commons.httpclient.contrib.ssl;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.conn.scheme.LayeredSocketFactory;
import org.apache.http.conn.scheme.SocketFactory;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import cz.msebera.android.httpclient.conn.ConnectTimeoutException;
import cz.msebera.android.httpclient.conn.scheme.LayeredSocketFactory;
import cz.msebera.android.httpclient.conn.scheme.SocketFactory;
import cz.msebera.android.httpclient.params.HttpConnectionParams;
import cz.msebera.android.httpclient.params.HttpParams;
import java.io.IOException;
import java.net.InetAddress;