From b719e59fae281e04859cde18111d97bdf83bdc4a Mon Sep 17 00:00:00 2001 From: Mauricio Colli Date: Fri, 11 Aug 2017 14:29:11 -0300 Subject: [PATCH] Change json dependency The previous was conflicting with the built-in version of android, this should solve it as it has a different package name (with the advantage of being able to receive updates). --- build.gradle | 2 +- .../services/soundcloud/SoundcloudChannelExtractor.java | 2 +- .../soundcloud/SoundcloudChannelInfoItemExtractor.java | 2 +- .../services/soundcloud/SoundcloudParsingHelper.java | 4 ++-- .../services/soundcloud/SoundcloudPlaylistExtractor.java | 2 +- .../services/soundcloud/SoundcloudSearchEngine.java | 4 ++-- .../services/soundcloud/SoundcloudStreamExtractor.java | 2 +- .../soundcloud/SoundcloudStreamInfoItemExtractor.java | 2 +- .../services/soundcloud/SoundcloudSuggestionExtractor.java | 4 ++-- .../extractor/services/youtube/YoutubeChannelExtractor.java | 4 ++-- .../services/youtube/YoutubePlaylistExtractor.java | 4 ++-- .../extractor/services/youtube/YoutubeStreamExtractor.java | 2 +- .../services/youtube/YoutubeSuggestionExtractor.java | 6 ++++-- 13 files changed, 21 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index a399ca97d..1138e8e57 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ repositories { } dependencies { - implementation 'org.json:json:20160807' + implementation 'com.github.openjson:openjson:1.0.8' implementation 'org.jsoup:jsoup:1.9.2' implementation 'org.mozilla:rhino:1.7.7.1' diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java index 7c8e7be46..ea8f17093 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import org.json.JSONObject; +import com.github.openjson.JSONObject; import org.schabi.newpipe.extractor.Downloader; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.StreamingService; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java index f0855db5d..4e55d05e9 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import org.json.JSONObject; +import com.github.openjson.JSONObject; import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor; public class SoundcloudChannelInfoItemExtractor implements ChannelInfoItemExtractor { diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java index e78aad961..21b1686d0 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import org.json.JSONArray; -import org.json.JSONObject; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java index 2975438e0..7be086fa1 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import org.json.JSONObject; +import com.github.openjson.JSONObject; import org.schabi.newpipe.extractor.Downloader; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.StreamingService; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngine.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngine.java index 757ff51b8..2197b2551 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngine.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngine.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import org.json.JSONArray; -import org.json.JSONObject; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; import org.schabi.newpipe.extractor.Downloader; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.exceptions.ExtractionException; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java index f3fedb78a..ab7fe3247 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import org.json.JSONObject; +import com.github.openjson.JSONObject; import org.schabi.newpipe.extractor.Downloader; import org.schabi.newpipe.extractor.MediaFormat; import org.schabi.newpipe.extractor.NewPipe; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java index 732622252..4afdef76a 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import org.json.JSONObject; +import com.github.openjson.JSONObject; import org.schabi.newpipe.extractor.exceptions.ParsingException; import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor; import org.schabi.newpipe.extractor.stream.StreamType; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractor.java index 1dbee93ce..45354a4a9 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractor.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import org.json.JSONArray; -import org.json.JSONObject; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; import org.schabi.newpipe.extractor.Downloader; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.SuggestionExtractor; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java index 14cefd7f1..78b464be9 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.extractor.services.youtube; -import org.json.JSONException; -import org.json.JSONObject; +import com.github.openjson.JSONException; +import com.github.openjson.JSONObject; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java index d547c07b7..4bd65344a 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.extractor.services.youtube; -import org.json.JSONException; -import org.json.JSONObject; +import com.github.openjson.JSONException; +import com.github.openjson.JSONObject; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java index 8752ae72b..b62e77781 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.extractor.services.youtube; -import org.json.JSONObject; +import com.github.openjson.JSONObject; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java index eee92c402..6419bdd95 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java +++ b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.extractor.services.youtube; -import org.json.JSONArray; +import com.github.openjson.JSONArray; import org.schabi.newpipe.extractor.Downloader; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.SuggestionExtractor; @@ -54,7 +54,9 @@ public class YoutubeSuggestionExtractor extends SuggestionExtractor { String response = dl.download(url); try { JSONArray suggestionsArray = new JSONArray(response).getJSONArray(1); - for (Object suggestion : suggestionsArray) suggestions.add(suggestion.toString()); + for (int i = 0; i < suggestionsArray.length(); i++) { + suggestions.add(suggestionsArray.get(i).toString()); + } } catch (Exception e) { throw new ParsingException("Could not parse suggestions response.", e); }