diff options
22 files changed, 55 insertions, 58 deletions
diff --git a/main/.classpath b/main/.classpath index be82b10..ef4f094 100644 --- a/main/.classpath +++ b/main/.classpath @@ -10,9 +10,7 @@ <classpathentry kind="lib" path="libs/mapsforge-map-0.2.4.jar"/> <classpathentry kind="lib" path="libs/commons-codec-1.4.jar"/> <classpathentry kind="lib" path="libs/commons-logging-1.1.1.jar"/> - <classpathentry kind="lib" path="libs/httpclient-4.1.3.jar"/> - <classpathentry kind="lib" path="libs/httpcore-4.1.4.jar"/> - <classpathentry kind="lib" path="libs/httpmime-4.1.3.jar"/> + <classpathentry exported="true" kind="lib" path="libs/httpclientandroidlib-1.1.0.jar"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry kind="output" path="bin/classes"/> diff --git a/main/libs/httpclient-4.1.3.jar b/main/libs/httpclient-4.1.3.jar Binary files differdeleted file mode 100644 index dfa8793..0000000 --- a/main/libs/httpclient-4.1.3.jar +++ /dev/null diff --git a/main/libs/httpclientandroidlib-1.1.0.jar b/main/libs/httpclientandroidlib-1.1.0.jar Binary files differnew file mode 100644 index 0000000..baa9d8f --- /dev/null +++ b/main/libs/httpclientandroidlib-1.1.0.jar diff --git a/main/libs/httpcore-4.1.4.jar b/main/libs/httpcore-4.1.4.jar Binary files differdeleted file mode 100644 index 1606a2e..0000000 --- a/main/libs/httpcore-4.1.4.jar +++ /dev/null diff --git a/main/libs/httpmime-4.1.3.jar b/main/libs/httpmime-4.1.3.jar Binary files differdeleted file mode 100644 index ff2014f..0000000 --- a/main/libs/httpmime-4.1.3.jar +++ /dev/null diff --git a/main/proguard.cfg b/main/proguard.cfg index 7c2ad29..d0e7fc1 100644 --- a/main/proguard.cfg +++ b/main/proguard.cfg @@ -9,7 +9,7 @@ -dontwarn android.support.v4.** -dontwarn org.apache.log4j.** -dontwarn org.apache.commons.logging.** --dontwarn org.apache.http.impl.auth.NegotiateScheme +-dontwarn ch.boye.httpclientandroidlib.impl.auth.NegotiateScheme -dontwarn android.net.http.AndroidHttpClient -keep public class * extends android.app.Activity @@ -19,9 +19,9 @@ -keep public class * extends android.content.ContentProvider -keep public class cgeo.geocaching.* -keep class android.support.v4.os.** { *; } --keep class org.apache.http.conn.scheme.Scheme { *; } --keep class org.apache.http.params.HttpParams { *; } --keep class org.apache.http.client.HttpClient { *; } +-keep class ch.boye.httpclientandroidlib.conn.scheme.Scheme { *; } +-keep class ch.boye.httpclientandroidlib.params.HttpParams { *; } +-keep class ch.boye.httpclientandroidlib.client.HttpClient { *; } -keepclasseswithmembers class * { public <init>(android.content.Context, android.util.AttributeSet); diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java index bd5e0e1..ebbd12d 100644 --- a/main/src/cgeo/geocaching/SettingsActivity.java +++ b/main/src/cgeo/geocaching/SettingsActivity.java @@ -18,9 +18,9 @@ import cgeo.geocaching.utils.Log; import cgeo.geocaching.utils.LogTemplateProvider; import cgeo.geocaching.utils.LogTemplateProvider.LogTemplate; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.http.HttpResponse; import android.app.ProgressDialog; import android.content.Context; diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java index dee026d..1e013c5 100644 --- a/main/src/cgeo/geocaching/StaticMapsProvider.java +++ b/main/src/cgeo/geocaching/StaticMapsProvider.java @@ -7,9 +7,9 @@ import cgeo.geocaching.network.Network; import cgeo.geocaching.network.Parameters; import cgeo.geocaching.utils.Log; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; import android.app.Activity; import android.content.Context; diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java index fec9f63..9a14b84 100644 --- a/main/src/cgeo/geocaching/cgeocaches.java +++ b/main/src/cgeo/geocaching/cgeocaches.java @@ -44,9 +44,9 @@ import cgeo.geocaching.utils.GeoDirHandler; import cgeo.geocaching.utils.Log; import cgeo.geocaching.utils.RunnableWithArgument; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; import android.app.AlertDialog; import android.app.ProgressDialog; diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 7ceef8e..61eb6b8 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -30,10 +30,10 @@ import cgeo.geocaching.utils.BaseUtils; import cgeo.geocaching.utils.CancellableHandler; import cgeo.geocaching.utils.Log; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/main/src/cgeo/geocaching/connector/gc/Login.java b/main/src/cgeo/geocaching/connector/gc/Login.java index c342dee..3d90837 100644 --- a/main/src/cgeo/geocaching/connector/gc/Login.java +++ b/main/src/cgeo/geocaching/connector/gc/Login.java @@ -11,10 +11,10 @@ import cgeo.geocaching.network.Parameters; import cgeo.geocaching.utils.BaseUtils; import cgeo.geocaching.utils.Log; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.http.HttpResponse; import android.graphics.drawable.BitmapDrawable; diff --git a/main/src/cgeo/geocaching/connector/gc/Tile.java b/main/src/cgeo/geocaching/connector/gc/Tile.java index a34503d..62b77db 100644 --- a/main/src/cgeo/geocaching/connector/gc/Tile.java +++ b/main/src/cgeo/geocaching/connector/gc/Tile.java @@ -8,7 +8,7 @@ import cgeo.geocaching.network.Parameters; import cgeo.geocaching.utils.LeastRecentlyUsedMap; import cgeo.geocaching.utils.Log; -import org.apache.http.HttpResponse; +import ch.boye.httpclientandroidlib.HttpResponse; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java b/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java index 6edf5ea..7ed6073 100644 --- a/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java +++ b/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java @@ -12,8 +12,8 @@ import cgeo.geocaching.network.Parameters; import cgeo.geocaching.utils.CryptUtils; import cgeo.geocaching.utils.Log; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.HttpResponse; import java.util.Collection; import java.util.Collections; diff --git a/main/src/cgeo/geocaching/files/LocalStorage.java b/main/src/cgeo/geocaching/files/LocalStorage.java index 4c101a3..ec09168 100644 --- a/main/src/cgeo/geocaching/files/LocalStorage.java +++ b/main/src/cgeo/geocaching/files/LocalStorage.java @@ -3,9 +3,9 @@ package cgeo.geocaching.files; import cgeo.geocaching.utils.CryptUtils; import cgeo.geocaching.utils.Log; +import ch.boye.httpclientandroidlib.Header; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.lang3.StringUtils; -import org.apache.http.Header; -import org.apache.http.HttpResponse; import android.os.Environment; diff --git a/main/src/cgeo/geocaching/network/Cookies.java b/main/src/cgeo/geocaching/network/Cookies.java index 68310e6..bcfc893 100644 --- a/main/src/cgeo/geocaching/network/Cookies.java +++ b/main/src/cgeo/geocaching/network/Cookies.java @@ -1,10 +1,10 @@ package cgeo.geocaching.network; +import ch.boye.httpclientandroidlib.client.CookieStore; +import ch.boye.httpclientandroidlib.cookie.Cookie; +import ch.boye.httpclientandroidlib.impl.client.BasicCookieStore; +import ch.boye.httpclientandroidlib.impl.cookie.BasicClientCookie; import org.apache.commons.lang3.StringUtils; -import org.apache.http.client.CookieStore; -import org.apache.http.cookie.Cookie; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.cookie.BasicClientCookie; public abstract class Cookies { diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java index ef13a36..3648d80 100644 --- a/main/src/cgeo/geocaching/network/HtmlImage.java +++ b/main/src/cgeo/geocaching/network/HtmlImage.java @@ -8,8 +8,8 @@ import cgeo.geocaching.files.LocalStorage; import cgeo.geocaching.utils.ImageHelper; import cgeo.geocaching.utils.Log; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; import android.content.Context; import android.content.res.Resources; diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java index 2c84c9c..3823197 100644 --- a/main/src/cgeo/geocaching/network/Network.java +++ b/main/src/cgeo/geocaching/network/Network.java @@ -4,33 +4,33 @@ import cgeo.geocaching.files.LocalStorage; import cgeo.geocaching.utils.BaseUtils; import cgeo.geocaching.utils.Log; +import ch.boye.httpclientandroidlib.Header; +import ch.boye.httpclientandroidlib.HeaderElement; +import ch.boye.httpclientandroidlib.HttpEntity; +import ch.boye.httpclientandroidlib.HttpException; +import ch.boye.httpclientandroidlib.HttpRequest; +import ch.boye.httpclientandroidlib.HttpRequestInterceptor; +import ch.boye.httpclientandroidlib.HttpResponse; +import ch.boye.httpclientandroidlib.HttpResponseInterceptor; +import ch.boye.httpclientandroidlib.NameValuePair; +import ch.boye.httpclientandroidlib.client.HttpClient; +import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity; +import ch.boye.httpclientandroidlib.client.methods.HttpGet; +import ch.boye.httpclientandroidlib.client.methods.HttpPost; +import ch.boye.httpclientandroidlib.client.methods.HttpRequestBase; +import ch.boye.httpclientandroidlib.entity.HttpEntityWrapper; +import ch.boye.httpclientandroidlib.entity.mime.MultipartEntity; +import ch.boye.httpclientandroidlib.entity.mime.content.FileBody; +import ch.boye.httpclientandroidlib.entity.mime.content.StringBody; +import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient; +import ch.boye.httpclientandroidlib.params.BasicHttpParams; +import ch.boye.httpclientandroidlib.params.CoreConnectionPNames; +import ch.boye.httpclientandroidlib.params.CoreProtocolPNames; +import ch.boye.httpclientandroidlib.params.HttpParams; +import ch.boye.httpclientandroidlib.protocol.HTTP; +import ch.boye.httpclientandroidlib.protocol.HttpContext; +import ch.boye.httpclientandroidlib.util.EntityUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.http.Header; -import org.apache.http.HeaderElement; -import org.apache.http.HttpEntity; -import org.apache.http.HttpException; -import org.apache.http.HttpRequest; -import org.apache.http.HttpRequestInterceptor; -import org.apache.http.HttpResponse; -import org.apache.http.HttpResponseInterceptor; -import org.apache.http.NameValuePair; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.entity.HttpEntityWrapper; -import org.apache.http.entity.mime.MultipartEntity; -import org.apache.http.entity.mime.content.FileBody; -import org.apache.http.entity.mime.content.StringBody; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.CoreConnectionPNames; -import org.apache.http.params.CoreProtocolPNames; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HTTP; -import org.apache.http.protocol.HttpContext; -import org.apache.http.util.EntityUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/main/src/cgeo/geocaching/network/OAuth.java b/main/src/cgeo/geocaching/network/OAuth.java index 8cecb22..0b7a261 100644 --- a/main/src/cgeo/geocaching/network/OAuth.java +++ b/main/src/cgeo/geocaching/network/OAuth.java @@ -3,8 +3,8 @@ package cgeo.geocaching.network; import cgeo.geocaching.Settings; import cgeo.geocaching.utils.CryptUtils; +import ch.boye.httpclientandroidlib.NameValuePair; import org.apache.commons.lang3.StringUtils; -import org.apache.http.NameValuePair; import java.util.ArrayList; import java.util.Date; diff --git a/main/src/cgeo/geocaching/network/Parameters.java b/main/src/cgeo/geocaching/network/Parameters.java index 90965e4..e05ab95 100644 --- a/main/src/cgeo/geocaching/network/Parameters.java +++ b/main/src/cgeo/geocaching/network/Parameters.java @@ -1,9 +1,9 @@ package cgeo.geocaching.network; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.protocol.HTTP; +import ch.boye.httpclientandroidlib.NameValuePair; +import ch.boye.httpclientandroidlib.client.utils.URLEncodedUtils; +import ch.boye.httpclientandroidlib.message.BasicNameValuePair; +import ch.boye.httpclientandroidlib.protocol.HTTP; import java.security.InvalidParameterException; import java.util.ArrayList; diff --git a/main/src/cgeo/geocaching/twitter/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java index da109b6..c630cec 100644 --- a/main/src/cgeo/geocaching/twitter/Twitter.java +++ b/main/src/cgeo/geocaching/twitter/Twitter.java @@ -12,8 +12,7 @@ import cgeo.geocaching.network.OAuth; import cgeo.geocaching.network.Parameters; import cgeo.geocaching.utils.Log; -import org.apache.http.HttpResponse; - +import ch.boye.httpclientandroidlib.HttpResponse; public final class Twitter { public static final int MAX_TWEET_SIZE = 140; diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java index 86db2d2..26fa919 100644 --- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java +++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java @@ -8,10 +8,10 @@ import cgeo.geocaching.network.OAuth; import cgeo.geocaching.network.Parameters; import cgeo.geocaching.utils.Log; +import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity; +import ch.boye.httpclientandroidlib.util.EntityUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.util.EntityUtils; import android.app.ProgressDialog; import android.content.Intent; diff --git a/main/src/cgeo/geocaching/ui/DirectionImage.java b/main/src/cgeo/geocaching/ui/DirectionImage.java index b246718..675d73b 100644 --- a/main/src/cgeo/geocaching/ui/DirectionImage.java +++ b/main/src/cgeo/geocaching/ui/DirectionImage.java @@ -4,8 +4,8 @@ import cgeo.geocaching.files.LocalStorage; import cgeo.geocaching.network.Network; import cgeo.geocaching.network.Parameters; +import ch.boye.httpclientandroidlib.HttpResponse; import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; import java.io.File; @@ -27,4 +27,4 @@ public class DirectionImage { return LocalStorage.getStorageFile(geocode, "direction.png", false, createDirs); } -}
\ No newline at end of file +} |