Merge branch 'dev' into yt-webm-opus

Author: kapodamy

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

@@ -66,12 +66,6 @@ public class DecryptException extends ParsingException {
         }
     }
 
-    public class GemaException extends ContentNotAvailableException {
-        GemaException(String message) {
-            super(message);
-        }
-    }
-
     public class SubtitlesException extends ContentNotAvailableException {
         SubtitlesException(String message, Throwable cause) {
             super(message, cause);
@@ -584,12 +578,6 @@ public String getErrorMessage() {
             String errorMessage = errorElement.text();
             if (errorMessage == null || errorMessage.isEmpty()) {
                 errorReason = null;
-            } else if (errorMessage.contains("GEMA")) {
-                // Gema sometimes blocks youtube music content in germany:
-                // https://www.gema.de/en/
-                // Detailed description:
-                // https://en.wikipedia.org/wiki/GEMA_%28German_organization%29
-                errorReason = new StringBuilder("GEMA");
             } else {
                 errorReason = new StringBuilder(errorMessage);
                 errorReason.append("  ");
@@ -670,8 +658,6 @@ private JsonObject getPlayerConfig(String pageContent) throws ParsingException {
         } catch (Parser.RegexException e) {
             String errorReason = getErrorMessage();
             switch (errorReason) {
-                case "GEMA":
-                    throw new GemaException(errorReason);
                 case "":
                     throw new ContentNotAvailableException("Content not available: player config empty", e);
                 default:

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

@@ -270,7 +270,7 @@ public List<Frameset> getFrames() throws IOException, ExtractionException {
     }
 
     /**
-     * Should analyse the webpage's document and extracts any error message there might be. (e.g. GEMA block)
+     * Should analyse the webpage's document and extracts any error message there might be.
      *
      * @return Error message; null if there is no error message.
      */