diff options
| author | TacoTheDank <SkytkRSfan3895@gmail.com> | 2020-07-13 00:49:35 -0400 |
|---|---|---|
| committer | TacoTheDank <SkytkRSfan3895@gmail.com> | 2020-07-13 00:49:35 -0400 |
| commit | 24656936c70bc73443119b4e1bb492feeac6dd85 (patch) | |
| tree | cf810ab31c9fa4bd16e57ce74e252e0ab092c9a5 /core | |
| parent | 078f97e609c2471dfe66c654810dc507ca656109 (diff) | |
| download | AntennaPod-24656936c70bc73443119b4e1bb492feeac6dd85.zip | |
Fix a bunch of deprecations
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java | 4 | ||||
| -rw-r--r-- | core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java b/core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java index 704113c57..62c8ce5f3 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java @@ -21,7 +21,6 @@ import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; import okhttp3.ResponseBody; -import org.apache.commons.io.Charsets; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -34,6 +33,7 @@ import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; @@ -505,7 +505,7 @@ public class GpodnetService implements ISyncService { RequestBody requestBody = RequestBody.create(TEXT, ""); Request request = new Request.Builder().url(url).post(requestBody).build(); try { - String credential = Credentials.basic(username, password, Charsets.UTF_8); + String credential = Credentials.basic(username, password, Charset.forName("UTF-8")); Request authRequest = request.newBuilder().header("Authorization", credential).build(); Response response = httpClient.newCall(authRequest).execute(); checkStatusCode(response); diff --git a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java index 45c86cb83..e933ce034 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; public class VolumeAdaptionSettingTest { |