Merge remote-tracking branch 'upstream/master'

Author: yausername

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -568,9 +568,9 @@ public String getErrorMessage() {
     private final static String DECYRYPTION_SIGNATURE_FUNCTION_REGEX =
             "(\\w+)\\s*=\\s*function\\((\\w+)\\)\\{\\s*\\2=\\s*\\2\\.split\\(\"\"\\)\\s*;";
     private final static String DECRYPTION_AKAMAIZED_STRING_REGEX =
-            "yt\\.akamaized\\.net/\\)\\s*\\|\\|\\s*.*?\\s*c\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)\\(";
+            "yt\\.akamaized\\.net/\\)\\s*\\|\\|\\s*.*?\\s*c\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*(:encodeURIComponent\\s*\\()([a-zA-Z0-9$]+)\\(";
     private final static String DECRYPTION_AKAMAIZED_SHORT_STRING_REGEX =
-            "\\bc\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)\\(";
+            "\\bc\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*(:encodeURIComponent\\s*\\()([a-zA-Z0-9$]+)\\(";
 
     private volatile String decryptionCode = "";
 

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java

@@ -270,8 +270,8 @@ private static StreamInfo extractOptionalData(StreamInfo streamInfo, StreamExtra
     }
 
     private StreamType streamType;
-    private String thumbnailUrl;
-    private String uploadDate;
+    private String thumbnailUrl = "";
+    private String uploadDate = "";
     private long duration = -1;
     private int ageLimit = -1;
     private String description;
@@ -280,26 +280,26 @@ private static StreamInfo extractOptionalData(StreamInfo streamInfo, StreamExtra
     private long likeCount = -1;
     private long dislikeCount = -1;
 
-    private String uploaderName;
-    private String uploaderUrl;
-    private String uploaderAvatarUrl;
+    private String uploaderName = "";
+    private String uploaderUrl = "";
+    private String uploaderAvatarUrl = "";
 
-    private List<VideoStream> videoStreams;
-    private List<AudioStream> audioStreams;
-    private List<VideoStream> videoOnlyStreams;
+    private List<VideoStream> videoStreams = new ArrayList<>();
+    private List<AudioStream> audioStreams = new ArrayList<>();
+    private List<VideoStream> videoOnlyStreams = new ArrayList<>();
 
-    private String dashMpdUrl;
-    private List<VideoStream> segmentedVideoStreams;
-    private List<AudioStream> segmentedAudioStreams;
-    private List<VideoStream> segmentedVideoOnlyStreams;
+    private String dashMpdUrl = "";
+    private List<VideoStream> segmentedVideoStreams = new ArrayList<>();
+    private List<AudioStream> segmentedAudioStreams = new ArrayList<>();
+    private List<VideoStream> segmentedVideoOnlyStreams = new ArrayList<>();
 
 
-    private String hlsUrl;
+    private String hlsUrl = "";
     private StreamInfoItem nextVideo;
-    private List<InfoItem> relatedStreams;
+    private List<InfoItem> relatedStreams = new ArrayList<>();
 
     private long startPosition = 0;
-    private List<SubtitlesStream> subtitles;
+    private List<SubtitlesStream> subtitles = new ArrayList<>();
 
     /**
      * Get the stream type

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDASHTest.java

@@ -43,6 +43,9 @@
  */
 public class YoutubeStreamExtractorDefaultTest {
 
+    /**
+     * Test for {@link StreamExtractor}
+     */
     public static class AdeleHello {
         private static YoutubeStreamExtractor extractor;
 

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java

@@ -13,6 +13,9 @@
 import static junit.framework.TestCase.assertTrue;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 
+/**
+ * Test for {@link YoutubeSearchExtractor}
+ */
 public class YoutubeSearchCountTest {
     public static class YoutubeChannelViewCountTest extends YoutubeSearchExtractorBaseTest {
         @BeforeClass
@@ -28,7 +31,7 @@ public static void setUpClass() throws Exception {
         public void testViewCount() {
             ChannelInfoItem ci = (ChannelInfoItem) itemsPage.getItems().get(0);
             assertTrue("Count does not fit: " + Long.toString(ci.getSubscriberCount()),
-                    69043316 < ci.getSubscriberCount() && ci.getSubscriberCount() < 73043316);
+                    69043316 < ci.getSubscriberCount() && ci.getSubscriberCount() < 103043316);
         }
     }
 }

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchCountTest.java

@@ -62,7 +62,9 @@ public void testGetSecondPageUrl() throws Exception {
 
     @Test
     public void testResultList_FirstElement() {
-        InfoItem firstInfoItem = itemsPage.getItems().get(1);
+        InfoItem firstInfoItem = itemsPage.getItems().get(0);
+        if(! (firstInfoItem instanceof ChannelInfoItem))
+            firstInfoItem = itemsPage.getItems().get(1);
 
         // The channel should be the first item
         assertTrue(firstInfoItem instanceof ChannelInfoItem);

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorDefaultTest.java

@@ -1,5 +1,6 @@
+#Fri Jan 18 11:51:40 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip