pull/586/head
FongMi 2 years ago
parent 64f446cc9c
commit 4c02d34bc1
  1. 7
      app/src/main/java/com/fongmi/android/tv/bean/ClearKey.java
  2. 6
      catvod/src/main/java/com/github/catvod/utils/Util.java

@ -1,5 +1,7 @@
package com.fongmi.android.tv.bean;
import android.util.Base64;
import androidx.annotation.NonNull;
import com.fongmi.android.tv.App;
@ -31,10 +33,11 @@ public class ClearKey {
}
private void addKeys(String line) {
int flags = Base64.URL_SAFE | Base64.NO_PADDING | Base64.NO_WRAP;
for (String s : line.split(",")) {
String[] a = s.split(":");
String kid = Util.base64(Util.hex2byte(a[0].trim())).replace("=", "");
String k = Util.base64(Util.hex2byte(a[1].trim())).replace("=", "");
String kid = Util.base64(Util.hex2byte(a[0].trim()), flags).replace("=", "");
String k = Util.base64(Util.hex2byte(a[1].trim()), flags).replace("=", "");
keys.add(new Keys(kid, k));
}
}

@ -31,7 +31,11 @@ public class Util {
}
public static String base64(byte[] bytes) {
return Base64.encodeToString(bytes, Base64.URL_SAFE | Base64.NO_PADDING | Base64.NO_WRAP);
return base64(bytes, Base64.DEFAULT);
}
public static String base64(byte[] bytes, int flags) {
return Base64.encodeToString(bytes, flags);
}
public static String basic(String userInfo) {

Loading…
Cancel
Save