mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-15 15:02:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sync-part-final' into feat/add-sync-triggers-experimental

Browse Source
This commit is contained in:
KaiserBh 2024-01-10 19:59:24 +11:00
commit dd301c465b
No known key found for this signature in database
GPG Key ID: 14D73B142042BBA9
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/proguard-rules.pro vendored
View File

@ -81,6 +81,3 @@
# Google OAuth
-keep class com.google.api.client.** { *; }
# Keep backup models, otherwise gson fails on release builds.
-keep class eu.kanade.tachiyomi.data.backup.models.** { *; }

22
app/src/main/java/eu/kanade/tachiyomi/data/sync/service/GoogleDriveSyncService.kt
View File

@ -18,11 +18,10 @@ import com.google.api.client.json.jackson2.JacksonFactory
import com.google.api.services.drive.Drive
import com.google.api.services.drive.DriveScopes
import com.google.api.services.drive.model.File
import com.google.gson.Gson
import com.google.gson.stream.JsonWriter
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.withContext
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import logcat.LogPriority
import logcat.logcat
@ -35,7 +34,6 @@ import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.IOException
import java.io.InputStreamReader
import java.io.OutputStreamWriter
import java.time.Instant
import java.util.zip.GZIPInputStream
import java.util.zip.GZIPOutputStream
@ -139,12 +137,14 @@ class GoogleDriveSyncService(context: Context, json: Json, syncPreferences: Sync
return withContext(Dispatchers.IO) {
try {
val gzipInputStream = GZIPInputStream(ByteArrayInputStream(outputStream.toByteArray()))
val gson = Gson()
val syncData = gson.fromJson(gzipInputStream.reader(Charsets.UTF_8), SyncData::class.java)
val jsonString = gzipInputStream.bufferedReader(Charsets.UTF_8).use { it.readText() }
val syncData = json.decodeFromString(SyncData.serializer(), jsonString)
logcat(LogPriority.DEBUG) { "JSON deserialized successfully" }
syncData
} catch (e: Exception) {
logcat(LogPriority.ERROR) { "Failed to convert json to sync data: ${e.message}" }
logcat(
LogPriority.ERROR,
) { "Failed to convert json to sync data with kotlinx.serialization: ${e.message}" }
throw Exception(e.message)
}
}
@ -158,13 +158,11 @@ class GoogleDriveSyncService(context: Context, json: Json, syncPreferences: Sync
val byteArrayOutputStream = ByteArrayOutputStream()
withContext(Dispatchers.IO) {
val jsonData = json.encodeToString(syncData)
val gzipOutputStream = GZIPOutputStream(byteArrayOutputStream)
val jsonWriter = JsonWriter(OutputStreamWriter(gzipOutputStream, Charsets.UTF_8))
val gson = Gson().newBuilder().serializeNulls().create()
jsonWriter.use { jWriter ->
gson.toJson(syncData, SyncData::class.java, jWriter)
}
gzipOutputStream.write(jsonData.toByteArray(Charsets.UTF_8))
gzipOutputStream.close()
logcat(LogPriority.DEBUG) { "JSON serialized successfully" }
}
val byteArrayContent = ByteArrayContent("application/octet-stream", byteArrayOutputStream.toByteArray())