Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build errors

Browse Source
This commit is contained in:
Jobobby04 2024-06-26 20:38:12 -04:00
parent 225b419bba
commit 7899474a36
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_push.yml vendored
View File

@ -32,7 +32,7 @@ jobs:
- name: Set up gradle - name: Set up gradle
uses: gradle/actions/setup-gradle@v3 uses: gradle/actions/setup-gradle@v3
# SY <-- # SY <--
- name: Write google-services.json - name: Write google-services.json
uses: DamianReeves/write-file-action@v1.2 uses: DamianReeves/write-file-action@v1.2

3
app/src/main/java/eu/kanade/tachiyomi/data/coil/PagePreviewFetcher.kt
View File

@ -18,7 +18,6 @@ import okhttp3.CacheControl
import okhttp3.Call import okhttp3.Call
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
import okhttp3.internal.http.HTTP_NOT_MODIFIED
import okio.FileSystem import okio.FileSystem
import okio.Path.Companion.toOkioPath import okio.Path.Companion.toOkioPath
import okio.Source import okio.Source
@ -260,5 +259,7 @@ class PagePreviewFetcher(
companion object { companion object {
private val CACHE_CONTROL_NO_STORE = CacheControl.Builder().noStore().build() private val CACHE_CONTROL_NO_STORE = CacheControl.Builder().noStore().build()
private val CACHE_CONTROL_NO_NETWORK_NO_CACHE = CacheControl.Builder().noCache().onlyIfCached().build() private val CACHE_CONTROL_NO_NETWORK_NO_CACHE = CacheControl.Builder().noCache().onlyIfCached().build()
private const val HTTP_NOT_MODIFIED = 304
} }
} }

3
app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt
View File

@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.backup.create.BackupOptions
import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.data.backup.models.Backup
import eu.kanade.tachiyomi.data.backup.models.BackupChapter import eu.kanade.tachiyomi.data.backup.models.BackupChapter
import eu.kanade.tachiyomi.data.backup.models.BackupManga import eu.kanade.tachiyomi.data.backup.models.BackupManga
import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
import eu.kanade.tachiyomi.data.backup.restore.RestoreOptions import eu.kanade.tachiyomi.data.backup.restore.RestoreOptions
import eu.kanade.tachiyomi.data.backup.restore.restorers.MangaRestorer import eu.kanade.tachiyomi.data.backup.restore.restorers.MangaRestorer
@ -214,7 +213,7 @@ class SyncManager(
val cacheFile = File(context.cacheDir, "tachiyomi_sync_data.proto.gz") val cacheFile = File(context.cacheDir, "tachiyomi_sync_data.proto.gz")
return try { return try {
cacheFile.outputStream().use { output -> cacheFile.outputStream().use { output ->
output.write(ProtoBuf.encodeToByteArray(BackupSerializer, backup)) output.write(ProtoBuf.encodeToByteArray(Backup.serializer(), backup))
Uri.fromFile(cacheFile) Uri.fromFile(cacheFile)
} }
} catch (e: IOException) { } catch (e: IOException) {

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

@ -19,7 +19,6 @@ import com.google.api.services.drive.DriveScopes
import com.google.api.services.drive.model.File import com.google.api.services.drive.model.File
import eu.kanade.domain.sync.SyncPreferences import eu.kanade.domain.sync.SyncPreferences
import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.data.backup.models.Backup
import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.protobuf.ProtoBuf import kotlinx.serialization.protobuf.ProtoBuf
@ -124,7 +123,7 @@ class GoogleDriveSyncService(context: Context, json: Json, syncPreferences: Sync
drive.files().get(gdriveFileId).executeMediaAsInputStream().use { inputStream -> drive.files().get(gdriveFileId).executeMediaAsInputStream().use { inputStream ->
GZIPInputStream(inputStream).use { gzipInputStream -> GZIPInputStream(inputStream).use { gzipInputStream ->
val byteArray = gzipInputStream.readBytes() val byteArray = gzipInputStream.readBytes()
val backup = protoBuf.decodeFromByteArray(BackupSerializer, byteArray) val backup = protoBuf.decodeFromByteArray(Backup.serializer(), byteArray)
val deviceId = fileList[0].appProperties["deviceId"] ?: "" val deviceId = fileList[0].appProperties["deviceId"] ?: ""
return SyncData(deviceId = deviceId, backup = backup) return SyncData(deviceId = deviceId, backup = backup)
} }
@ -142,7 +141,7 @@ class GoogleDriveSyncService(context: Context, json: Json, syncPreferences: Sync
val fileList = getAppDataFileList(drive) val fileList = getAppDataFileList(drive)
val backup = syncData.backup ?: return val backup = syncData.backup ?: return
val byteArray = protoBuf.encodeToByteArray(BackupSerializer, backup) val byteArray = protoBuf.encodeToByteArray(Backup.serializer(), backup)
if (byteArray.isEmpty()) { if (byteArray.isEmpty()) {
throw IllegalStateException(context.stringResource(MR.strings.empty_backup_error)) throw IllegalStateException(context.stringResource(MR.strings.empty_backup_error))
} }

5
app/src/main/java/eu/kanade/tachiyomi/data/sync/service/SyncYomiSyncService.kt
View File

@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.data.sync.service
import android.content.Context import android.content.Context
import eu.kanade.domain.sync.SyncPreferences import eu.kanade.domain.sync.SyncPreferences
import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.data.backup.models.Backup
import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
import eu.kanade.tachiyomi.data.sync.SyncNotifier import eu.kanade.tachiyomi.data.sync.SyncNotifier
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.PUT import eu.kanade.tachiyomi.network.PUT
@ -104,7 +103,7 @@ class SyncYomiSyncService(
} }
return try { return try {
val backup = protoBuf.decodeFromByteArray(BackupSerializer, byteArray) val backup = protoBuf.decodeFromByteArray(Backup.serializer(), byteArray)
return Pair(SyncData(backup = backup), newETag) return Pair(SyncData(backup = backup), newETag)
} catch (_: SerializationException) { } catch (_: SerializationException) {
logcat(LogPriority.INFO) { logcat(LogPriority.INFO) {
@ -147,7 +146,7 @@ class SyncYomiSyncService(
.writeTimeout(timeout, TimeUnit.SECONDS) .writeTimeout(timeout, TimeUnit.SECONDS)
.build() .build()
val byteArray = protoBuf.encodeToByteArray(BackupSerializer, backup) val byteArray = protoBuf.encodeToByteArray(Backup.serializer(), backup)
if (byteArray.isEmpty()) { if (byteArray.isEmpty()) {
throw IllegalStateException(context.stringResource(MR.strings.empty_backup_error)) throw IllegalStateException(context.stringResource(MR.strings.empty_backup_error))
} }