Skip to content

Use Charsets rather than StandardCharsets #2807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luna712 wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −4
Open

Use Charsets rather than StandardCharsets #2807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.M3u8Helper
import java.net.URI
import java.nio.charset.StandardCharsets
import javax.crypto.Cipher
import javax.crypto.spec.GCMParameterSpec
import javax.crypto.spec.SecretKeySpec
Expand Down Expand Up @@ -94,7 +93,7 @@ open class ByseSX : ExtractorApi() {
cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)

val plainBytes = cipher.doFinal(cipherBytes)
var jsonStr = String(plainBytes, StandardCharsets.UTF_8)
var jsonStr = String(plainBytes, Charsets.UTF_8)

if (jsonStr.startsWith("\uFEFF")) jsonStr = jsonStr.substring(1)

Expand Down
3 changes: 1 addition & 2 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import com.lagradost.cloudstream3.utils.AppUtils.parseJson
import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.M3u8Helper
import java.nio.charset.StandardCharsets
import java.security.MessageDigest
import javax.crypto.Cipher
import javax.crypto.spec.IvParameterSpec
Expand Down Expand Up @@ -171,7 +170,7 @@ open class Rabbitstream : ExtractorApi() {
IvParameterSpec(decryptionKey.copyOfRange(32, decryptionKey.size))
)
val decryptedData = aesCBC?.doFinal(encrypted) ?: throw ErrorLoadingException("Cipher not found")
return String(decryptedData, StandardCharsets.UTF_8)
return String(decryptedData, Charsets.UTF_8)
}

data class Tracks(
Expand Down