Upgrade to latest versions

5 files changed, 10 insertions, 71 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
index d2a13f768..a24e3a485 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
@@ -10,8 +10,6 @@ import com.squareup.okhttp.RequestBody;
 import com.squareup.okhttp.Response;
 import com.squareup.okhttp.ResponseBody;
 
-import org.apache.http.HttpStatus;
-import org.apache.http.client.ClientProtocolException;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -19,6 +17,7 @@ import org.json.JSONObject;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -602,10 +601,7 @@ public class GpodnetService {
             checkStatusCode(response);
             body = response.body();
             result = getStringFromResponseBody(body);
-        } catch (ClientProtocolException e) {
-            e.printStackTrace();
-            throw new GpodnetServiceException(e);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
             throw new GpodnetServiceException(e);
         } finally {
@@ -652,12 +648,12 @@ public class GpodnetService {
     private void checkStatusCode(@NonNull Response response)
             throws GpodnetServiceException {
         int responseCode = response.code();
-        if (responseCode != HttpStatus.SC_OK) {
-            if (responseCode == HttpStatus.SC_UNAUTHORIZED) {
+        if (responseCode != HttpURLConnection.HTTP_OK) {
+            if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) {
                 throw new GpodnetServiceAuthenticationException("Wrong username or password");
             } else {
-                throw new GpodnetServiceBadStatusCodeException(
-                        "Bad response code: " + responseCode, responseCode);
+                throw new GpodnetServiceBadStatusCodeException("Bad response code: "
+                        + responseCode, responseCode);
             }
         }
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/APRedirectHandler.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/APRedirectHandler.java
deleted file mode 100644
index 3efcf4da8..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/APRedirectHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package de.danoeh.antennapod.core.service.download;
-
-import android.util.Log;
-import de.danoeh.antennapod.core.BuildConfig;
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.impl.client.DefaultRedirectHandler;
-import org.apache.http.protocol.HttpContext;
-
-import java.net.URI;
-
-public class APRedirectHandler extends DefaultRedirectHandler {
-	// Identifier for logger
-	private static final String TAG = "APRedirectHandler";
-	// Header field, which has to be potentially fixed
-	private static final String LOC = "Location";
-	// Regular expressions for character strings, which should not appear in URLs
-	private static final String CHi[] = { "\\{", "\\}", "\\|", "\\\\", "\\^", "~",   "\\[", "\\]", "\\`"};
-	private static final String CHo[] = { "%7B", "%7D", "%7C", "%5C",  "%5E", "%7E", "%5B", "%5D", "%60"};
-
-	/**
-	 * Workaround for broken URLs in redirection.
-	 * Proper solution involves LaxRedirectStrategy() which is not available in
-	 * current API yet.
-	 */
-	@Override
-	public URI getLocationURI(HttpResponse response, HttpContext context)
-			throws org.apache.http.ProtocolException {
-
-		Header h[] = response.getHeaders(LOC);
-		if (h.length>0) {
-			String s = h[0].getValue();
-
-			// Fix broken URL
-			for(int i=0; i<CHi.length;i++)
-				s = s.replaceAll(CHi[i], CHo[i]);
-
-			// If anything had to be fixed, then replace the header
-			if (!s.equals(h[0].getValue()))
-			{
-				if (BuildConfig.DEBUG)
-					Log.d(TAG, "Original URL: " + h[0].getValue());
-				
-				response.setHeader(LOC, s);
-
-				if (BuildConfig.DEBUG)
-					Log.d(TAG, "Fixed URL:    " + s);
-			}
-		}
-
-		// call DefaultRedirectHandler with fixed URL
-		return super.getLocationURI(response, context);
-	}
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index 9768bd5de..29c44207d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -22,7 +22,6 @@ import android.util.Log;
 import android.webkit.URLUtil;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.http.HttpStatus;
 import org.xml.sax.SAXException;
 
 import java.io.File;
@@ -187,7 +186,7 @@ public class DownloadService extends Service {
                             if (status.getReason() == DownloadError.ERROR_UNAUTHORIZED) {
                                 postAuthenticationNotification(downloader.getDownloadRequest());
                             } else if (status.getReason() == DownloadError.ERROR_HTTP_DATA_ERROR
-                                    && Integer.valueOf(status.getReasonDetailed()) == HttpStatus.SC_REQUESTED_RANGE_NOT_SATISFIABLE) {
+                                    && Integer.valueOf(status.getReasonDetailed()) == 416) {
 
                                 Log.d(TAG, "Requested invalid range, restarting download from the beginning");
                                 FileUtils.deleteQuietly(new File(downloader.getDownloadRequest().getDestination()));
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
index 9f54db477..25ab2f6fd 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
@@ -11,7 +11,6 @@ import com.squareup.okhttp.ResponseBody;
 import com.squareup.okhttp.internal.http.HttpDate;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpStatus;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -171,7 +170,7 @@ public class HttpDownloader extends Downloader {
 
             String contentRangeHeader = (fileExists) ? response.header("Content-Range") : null;
 
-            if (fileExists && response.code() == HttpStatus.SC_PARTIAL_CONTENT
+            if (fileExists && response.code() == HttpURLConnection.HTTP_PARTIAL
                     && !TextUtils.isEmpty(contentRangeHeader)) {
                 String start = contentRangeHeader.substring("bytes ".length(),
                         contentRangeHeader.indexOf("-"));
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java
index 446061ea6..fcd96826b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java
@@ -5,7 +5,6 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.util.FloatMath;
 import android.util.Log;
 
 public class ShakeListener implements SensorEventListener
@@ -50,8 +49,8 @@ public class ShakeListener implements SensorEventListener
         float gY = event.values[1] / SensorManager.GRAVITY_EARTH;
         float gZ = event.values[2] / SensorManager.GRAVITY_EARTH;
 
-        float gForce = FloatMath.sqrt(gX*gX + gY*gY + gZ*gZ);
-        if (gForce > 2.25f) {
+        double gForce = Math.sqrt(gX*gX + gY*gY + gZ*gZ);
+        if (gForce > 2.25) {
             Log.d(TAG, "Detected shake " + gForce);
             mSleepTimer.onShake();
         }