rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: better attempt to get anilist username

Browse source
This commit is contained in:
rebelonion 2024-02-15 12:53:06 -06:00
parent a73c4cd678
commit fb99429dd7
1 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

42
app/src/main/java/ani/dantotsu/connections/comments/CommentsAPI.kt
View file

@ -142,20 +142,20 @@ object CommentsAPI {
.add("username", user.username) .add("username", user.username)
.add("profile_picture_url", Anilist.avatar ?: "") .add("profile_picture_url", Anilist.avatar ?: "")
.build() .build()
val request = requestBuilder() val request = requestBuilder()
val json = request.post(url, requestBody = body) val json = request.post(url, requestBody = body)
if (!json.text.startsWith("{")) return if (!json.text.startsWith("{")) return
val parsed = try { val parsed = try {
Json.decodeFromString<AuthResponse>(json.text) Json.decodeFromString<AuthResponse>(json.text)
} catch (e: Exception) { } catch (e: Exception) {
snackString("Failed to login to comments API: ${e.printStackTrace()}") snackString("Failed to login to comments API: ${e.printStackTrace()}")
return return
} }
authToken = parsed.authToken authToken = parsed.authToken
userId = parsed.user.id userId = parsed.user.id
isBanned = parsed.user.isBanned ?: false isBanned = parsed.user.isBanned ?: false
isAdmin = parsed.user.isAdmin ?: false isAdmin = parsed.user.isAdmin ?: false
isMod = parsed.user.isMod ?: false isMod = parsed.user.isMod ?: false
} }
private fun headerBuilder(): Map<String, String> { private fun headerBuilder(): Map<String, String> {
@ -188,10 +188,17 @@ object CommentsAPI {
@SuppressLint("GetInstance") @SuppressLint("GetInstance")
private fun generateUserId(): String? { private fun generateUserId(): String? {
val anilistId = PrefManager.getVal(PrefName.AnilistUserId, null as String?) ?: return null val anilistId = PrefManager.getVal(PrefName.AnilistUserId, null as String?)
?: if (Anilist.userid != null) {
PrefManager.setVal(PrefName.AnilistUserId, Anilist.userid.toString())
Anilist.userid.toString()
} else {
return null
}
val userIdEncryptKey = BuildConfig.USER_ID_ENCRYPT_KEY val userIdEncryptKey = BuildConfig.USER_ID_ENCRYPT_KEY
val keySpec = SecretKeySpec(userIdEncryptKey.toByteArray(), KeyProperties.KEY_ALGORITHM_AES) val keySpec = SecretKeySpec(userIdEncryptKey.toByteArray(), KeyProperties.KEY_ALGORITHM_AES)
val cipher = Cipher.getInstance("${KeyProperties.KEY_ALGORITHM_AES}/ECB/${KeyProperties.ENCRYPTION_PADDING_PKCS7}") val cipher =
Cipher.getInstance("${KeyProperties.KEY_ALGORITHM_AES}/ECB/${KeyProperties.ENCRYPTION_PADDING_PKCS7}")
cipher.init(Cipher.ENCRYPT_MODE, keySpec) cipher.init(Cipher.ENCRYPT_MODE, keySpec)
val encrypted = cipher.doFinal(anilistId.toByteArray()) val encrypted = cipher.doFinal(anilistId.toByteArray())
return encrypted.joinToString("") { "%02x".format(it) } return encrypted.joinToString("") { "%02x".format(it) }
@ -290,7 +297,8 @@ data class ReturnedComment(
) )
object NumericBooleanSerializer : KSerializer<Boolean> { object NumericBooleanSerializer : KSerializer<Boolean> {
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("NumericBoolean", PrimitiveKind.INT) override val descriptor: SerialDescriptor =
PrimitiveSerialDescriptor("NumericBoolean", PrimitiveKind.INT)
override fun serialize(encoder: Encoder, value: Boolean) { override fun serialize(encoder: Encoder, value: Boolean) {
encoder.encodeInt(if (value) 1 else 0) encoder.encodeInt(if (value) 1 else 0)