Merge pull request #100 from antonholmberg/resolve-gradle-check-errors

Resolve gradle check issues

Author: antonholmberg

CHANGELOG.md

@@ -1,12 +1,14 @@
 Change Log
 ==========
 
+## Version 2.2.1
+- Resolve gradle check errors
+
 ## Version 2.2.0
 - Requesting token now uses PKCE when:
     - There is an installed Spotify app that supports PKCE.
     - When web fallback is used.
 
-
 ## Version 2.1.2
 * Propagate tracking parameters when opening the native login flow
 

auth-lib/build.gradle

@@ -23,7 +23,7 @@ apply plugin: 'com.android.library'
 
 project.group = 'com.spotify.android'
 project.archivesBaseName = 'auth'
-project.version = '2.2.0'
+project.version = '2.2.1'
 
 android {
     compileSdk 33
@@ -87,6 +87,9 @@ android {
     unitTestVariants.configureEach {
         it.mergedFlavor.manifestPlaceholders += manifestPlaceholdersForTests
     }
+    testVariants.configureEach {
+        it.mergedFlavor.manifestPlaceholders += manifestPlaceholdersForTests
+    }
 }
 
 dependencies {

auth-lib/src/main/java/com/spotify/sdk/android/auth/PKCEInformationFactory.java

@@ -25,7 +25,6 @@
 
 import androidx.annotation.NonNull;
 
-import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -57,9 +56,14 @@ private static String generateCodeVerifier() {
 
     @NonNull
     private static String generateCodeChallenge(@NonNull String codeVerifier) throws NoSuchAlgorithmException {
-        MessageDigest digest = MessageDigest.getInstance("SHA-256");
-        byte[] hash = digest.digest(codeVerifier.getBytes(StandardCharsets.US_ASCII));
-        return Base64.encodeToString(hash, Base64.URL_SAFE | Base64.NO_PADDING | Base64.NO_WRAP);
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            byte[] hash = digest.digest(codeVerifier.getBytes("US-ASCII"));
+            return Base64.encodeToString(hash, Base64.URL_SAFE | Base64.NO_PADDING | Base64.NO_WRAP);
+        } catch (final java.io.UnsupportedEncodingException e) {
+            // US-ASCII is guaranteed to be supported on all platforms
+            throw new RuntimeException("US-ASCII encoding not supported", e);
+        }
     }
 }
 

auth-lib/src/main/java/com/spotify/sdk/android/auth/TokenExchangeRequest.java

@@ -31,7 +31,6 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 
 /**
  * A utility class for exchanging an authorization code for an access token using PKCE verifier.
@@ -102,7 +101,12 @@ public TokenExchangeResponse execute() {
             final String requestBody = buildRequestBody();
 
             try (final OutputStream outputStream = connection.getOutputStream()) {
-                outputStream.write(requestBody.getBytes(StandardCharsets.UTF_8));
+                try {
+                    outputStream.write(requestBody.getBytes("UTF-8"));
+                } catch (final java.io.UnsupportedEncodingException e) {
+                    // UTF-8 is guaranteed to be supported on all platforms
+                    throw new RuntimeException("UTF-8 encoding not supported", e);
+                }
                 outputStream.flush();
             }
 
@@ -138,7 +142,7 @@ private String buildRequestBody() {
     private String readResponse(@NonNull final HttpURLConnection connection, final boolean isError) throws IOException {
         try (final BufferedReader reader = new BufferedReader(new InputStreamReader(
                 isError ? connection.getErrorStream() : connection.getInputStream(),
-                StandardCharsets.UTF_8))) {
+                "UTF-8"))) {
 
             final StringBuilder response = new StringBuilder();
             String line;