searchfilters: use base64 methods from okio to support <= Android Oreo

Author: evermind-zz

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/search/filter/YoutubeProtoBufferSearchParameterAccessor.java

@@ -15,11 +15,13 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Base64;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import okio.ByteString;
+
 
 /**
  * This class interacts with the auto generated proto buffer java files
@@ -31,8 +33,6 @@
  */
 public final class YoutubeProtoBufferSearchParameterAccessor {
 
-    private static final String UTF_8 = "UTF-8";
-
     /**
      * the base64 urlencoded sp string
      */
@@ -94,8 +94,8 @@ public String encodeSp(@Nullable final SortOrder sort,
         final SearchRequest searchRequest = searchRequestBuilder.build();
 
         final byte[] protoBufEncoded = searchRequest.encode();
-        final String protoBufEncodedBase64 = Base64.getEncoder()
-                .encodeToString(protoBufEncoded);
+        final ByteString bs = new ByteString(protoBufEncoded);
+        final String protoBufEncodedBase64 = bs.base64();
         final String urlEncodedBase64EncodedSearchParameter
                 = Utils.encodeUrlUtf8(protoBufEncodedBase64);
 
@@ -111,13 +111,13 @@ public String encodeSp(@Nullable final SortOrder sort,
      * @return {@link SearchRequest} with decoded search parameter
      * @throws IOException
      */
-    @SuppressWarnings("NewApi")
     public SearchRequest decodeSp(@Nonnull final String urlEncodedBase64EncodedSearchParameter)
             throws IOException {
-        final String urlDecodedBase64EncodedSearchParameter
-                = Utils.decodeUrlUtf8(urlEncodedBase64EncodedSearchParameter);
-        final byte[] decodedSearchParameter
-                = Base64.getDecoder().decode(urlDecodedBase64EncodedSearchParameter);
+        final String urlDecodedBase64EncodedSearchParameter =
+                Utils.decodeUrlUtf8(urlEncodedBase64EncodedSearchParameter);
+        final byte[] decodedSearchParameter = Objects.requireNonNull(
+                        ByteString.decodeBase64(urlDecodedBase64EncodedSearchParameter))
+                .toByteArray();
 
         return new SearchRequest.Builder().build().adapter().decode(decodedSearchParameter);
     }