* fix java.lang.NoClassDefFoundError for non-java8 runtimes (e.g. Android 7.1.1) (thanks to https://github.com/ChristopherGittner)

kullfar · kullfar · commit e10771853ab5 · 2021-05-11T15:38:13.000+03:00
diff --git a/changelog b/changelog
@@ -1,3 +1,7 @@
+[SNAPSHOT]
+ * fix java.lang.NoClassDefFoundError for non-java8 runtimes (e.g. Android 7.1.1)
+   (thanks to https://github.com/ChristopherGittner)
+
 [8.3.0]
  * add Instagram (https://www.instagram.com/) API (thanks to https://github.com/faent)
  * add getErrorMessage method to FacebookAccessTokenErrorResponse. Should be used instead of general getMessage method
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/base64/CommonsCodecBase64.java b/scribejava-core/src/main/java/com/github/scribejava/core/base64/CommonsCodecBase64.java
@@ -2,10 +2,18 @@
 
 public class CommonsCodecBase64 extends Base64 {
 
-    private static final org.apache.commons.codec.binary.Base64 BASE64_ENCODER
-            = new org.apache.commons.codec.binary.Base64();
-    private static final org.apache.commons.codec.binary.Base64 BASE64_URL_ENCODER_WITHOUT_PADDING
-            = new org.apache.commons.codec.binary.Base64(0, null, true);
+    private static final org.apache.commons.codec.binary.Base64 BASE64_ENCODER;
+    private static final org.apache.commons.codec.binary.Base64 BASE64_URL_ENCODER_WITHOUT_PADDING;
+
+    static {
+        if (isAvailable()) {
+            BASE64_ENCODER = new org.apache.commons.codec.binary.Base64();
+            BASE64_URL_ENCODER_WITHOUT_PADDING = new org.apache.commons.codec.binary.Base64(0, null, true);
+        } else {
+            BASE64_ENCODER = null;
+            BASE64_URL_ENCODER_WITHOUT_PADDING = null;
+        }
+    }
 
     @Override
     protected String internalEncode(byte[] bytes) {
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/base64/Java8Base64.java b/scribejava-core/src/main/java/com/github/scribejava/core/base64/Java8Base64.java
@@ -3,7 +3,7 @@
 public class Java8Base64 extends Base64 {
 
     private static final com.github.scribejava.java8.base64.Java8Base64 JAVA8_BASE64
-            = new com.github.scribejava.java8.base64.Java8Base64();
+            = isAvailable() ? new com.github.scribejava.java8.base64.Java8Base64() : null;
 
     @Override
     protected String internalEncode(byte[] bytes) {
