admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Okio, use more KTX stuff (#4353)

Browse Source 
* Update Okio to 2.10.0

* Use some more KTX extensions

(cherry picked from commit 5f7e34b6a1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt
This commit is contained in:
Taco
2021-01-26 09:02:53 -05:00
committed by Jobobby04
parent 9a70f25552
commit ec1fe205ad
30 changed files with 230 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/exh/md/similar/sql/mappers/SimilarTypeMapping.kt
+7 -7
View File
@@ -1,7 +1,7 @@
package exh.md.similar.sql.mappers
import android.content.ContentValues
import android.database.Cursor
import androidx.core.content.contentValuesOf
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -35,12 +35,12 @@ class SimilarPutResolver : DefaultPutResolver<MangaSimilar>() {
.whereArgs(obj.id)
.build()
override fun mapToContentValues(obj: MangaSimilar) = ContentValues(4).apply {
put(COL_ID, obj.id)
put(COL_MANGA_ID, obj.manga_id)
put(COL_MANGA_SIMILAR_MATCHED_IDS, obj.matched_ids)
put(COL_MANGA_SIMILAR_MATCHED_TITLES, obj.matched_titles)
}
override fun mapToContentValues(obj: MangaSimilar) = contentValuesOf(
COL_ID to obj.id,
COL_MANGA_ID to obj.manga_id,
COL_MANGA_SIMILAR_MATCHED_IDS to obj.matched_ids,
COL_MANGA_SIMILAR_MATCHED_TITLES to obj.matched_titles
)
}
class SimilarGetResolver : DefaultGetResolver<MangaSimilar>() {
app/src/main/java/exh/merged/sql/mappers/MergedMangaTypeMapping.kt
+14 -14
View File
@@ -1,7 +1,7 @@
package exh.merged.sql.mappers
import android.content.ContentValues
import android.database.Cursor
import androidx.core.content.contentValuesOf
import androidx.core.database.getLongOrNull
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
@@ -42,19 +42,19 @@ class MergedMangaPutResolver : DefaultPutResolver<MergedMangaReference>() {
.whereArgs(obj.id)
.build()
override fun mapToContentValues(obj: MergedMangaReference) = ContentValues(5).apply {
put(COL_ID, obj.id)
put(COL_IS_INFO_MANGA, obj.isInfoManga)
put(COL_GET_CHAPTER_UPDATES, obj.getChapterUpdates)
put(COL_CHAPTER_SORT_MODE, obj.chapterSortMode)
put(COL_CHAPTER_PRIORITY, obj.chapterPriority)
put(COL_DOWNLOAD_CHAPTERS, obj.downloadChapters)
put(COL_MERGE_ID, obj.mergeId)
put(COL_MERGE_URL, obj.mergeUrl)
put(COL_MANGA_ID, obj.mangaId)
put(COL_MANGA_URL, obj.mangaUrl)
put(COL_MANGA_SOURCE, obj.mangaSourceId)
}
override fun mapToContentValues(obj: MergedMangaReference) = contentValuesOf(
COL_ID to obj.id,
COL_IS_INFO_MANGA to obj.isInfoManga,
COL_GET_CHAPTER_UPDATES to obj.getChapterUpdates,
COL_CHAPTER_SORT_MODE to obj.chapterSortMode,
COL_CHAPTER_PRIORITY to obj.chapterPriority,
COL_DOWNLOAD_CHAPTERS to obj.downloadChapters,
COL_MERGE_ID to obj.mergeId,
COL_MERGE_URL to obj.mergeUrl,
COL_MANGA_ID to obj.mangaId,
COL_MANGA_URL to obj.mangaUrl,
COL_MANGA_SOURCE to obj.mangaSourceId
)
}
class MergedMangaGetResolver : DefaultGetResolver<MergedMangaReference>() {
app/src/main/java/exh/merged/sql/resolvers/MergeMangaSettingsPutResolver.kt
+4 -4
View File
@@ -1,6 +1,6 @@
package exh.merged.sql.resolvers
import android.content.ContentValues
import androidx.core.content.contentValuesOf
import com.pushtorefresh.storio.sqlite.StorIOSQLite
import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,7 @@ class MergeMangaSettingsPutResolver(val reset: Boolean = false) : PutResolver<Me
.whereArgs(mergedMangaReference.id)
.build()
fun mapToContentValues(mergedMangaReference: MergedMangaReference) = ContentValues(1).apply {
put(MergedTable.COL_CHAPTER_SORT_MODE, mergedMangaReference.chapterSortMode)
}
fun mapToContentValues(mergedMangaReference: MergedMangaReference) = contentValuesOf(
MergedTable.COL_CHAPTER_SORT_MODE to mergedMangaReference.chapterSortMode,
)
}
app/src/main/java/exh/merged/sql/resolvers/MergedMangaIdPutResolver.kt
+4 -4
View File
@@ -1,6 +1,6 @@
package exh.merged.sql.resolvers
import android.content.ContentValues
import androidx.core.content.contentValuesOf
import com.pushtorefresh.storio.sqlite.StorIOSQLite
import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,7 @@ class MergedMangaIdPutResolver : PutResolver<MergedMangaReference>() {
.whereArgs(mergedMangaReference.id)
.build()
fun mapToContentValues(mergedMangaReference: MergedMangaReference) = ContentValues(1).apply {
put(MergedTable.COL_MANGA_ID, mergedMangaReference.mangaId)
}
fun mapToContentValues(mergedMangaReference: MergedMangaReference) = contentValuesOf(
MergedTable.COL_MANGA_ID to mergedMangaReference.mangaId
)
}
app/src/main/java/exh/merged/sql/resolvers/MergedMangaSettingsPutResolver.kt
+7 -7
View File
@@ -1,6 +1,6 @@
package exh.merged.sql.resolvers
import android.content.ContentValues
import androidx.core.content.contentValuesOf
import com.pushtorefresh.storio.sqlite.StorIOSQLite
import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,10 +25,10 @@ class MergedMangaSettingsPutResolver(val reset: Boolean = false) : PutResolver<M
.whereArgs(mergedMangaReference.id)
.build()
fun mapToContentValues(mergedMangaReference: MergedMangaReference) = ContentValues(4).apply {
put(MergedTable.COL_GET_CHAPTER_UPDATES, mergedMangaReference.getChapterUpdates)
put(MergedTable.COL_DOWNLOAD_CHAPTERS, mergedMangaReference.downloadChapters)
put(MergedTable.COL_IS_INFO_MANGA, mergedMangaReference.isInfoManga)
put(MergedTable.COL_CHAPTER_PRIORITY, mergedMangaReference.chapterPriority)
}
fun mapToContentValues(mergedMangaReference: MergedMangaReference) = contentValuesOf(
MergedTable.COL_GET_CHAPTER_UPDATES to mergedMangaReference.getChapterUpdates,
MergedTable.COL_DOWNLOAD_CHAPTERS to mergedMangaReference.downloadChapters,
MergedTable.COL_IS_INFO_MANGA to mergedMangaReference.isInfoManga,
MergedTable.COL_CHAPTER_PRIORITY to mergedMangaReference.chapterPriority,
)
}
app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt
+8 -8
View File
@@ -1,7 +1,7 @@
package exh.metadata.sql.mappers
import android.content.ContentValues
import android.database.Cursor
import androidx.core.content.contentValuesOf
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -35,13 +35,13 @@ class SearchMetadataPutResolver : DefaultPutResolver<SearchMetadata>() {
.whereArgs(obj.mangaId)
.build()
override fun mapToContentValues(obj: SearchMetadata) = ContentValues(5).apply {
put(COL_MANGA_ID, obj.mangaId)
put(COL_UPLOADER, obj.uploader)
put(COL_EXTRA, obj.extra)
put(COL_INDEXED_EXTRA, obj.indexedExtra)
put(COL_EXTRA_VERSION, obj.extraVersion)
}
override fun mapToContentValues(obj: SearchMetadata) = contentValuesOf(
COL_MANGA_ID to obj.mangaId,
COL_UPLOADER to obj.uploader,
COL_EXTRA to obj.extra,
COL_INDEXED_EXTRA to obj.indexedExtra,
COL_EXTRA_VERSION to obj.extraVersion,
)
}
class SearchMetadataGetResolver : DefaultGetResolver<SearchMetadata>() {
app/src/main/java/exh/metadata/sql/mappers/SearchTagTypeMapping.kt
+8 -8
View File
@@ -1,7 +1,7 @@
package exh.metadata.sql.mappers
import android.content.ContentValues
import android.database.Cursor
import androidx.core.content.contentValuesOf
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -35,13 +35,13 @@ class SearchTagPutResolver : DefaultPutResolver<SearchTag>() {
.whereArgs(obj.id)
.build()
override fun mapToContentValues(obj: SearchTag) = ContentValues(5).apply {
put(COL_ID, obj.id)
put(COL_MANGA_ID, obj.mangaId)
put(COL_NAMESPACE, obj.namespace)
put(COL_NAME, obj.name)
put(COL_TYPE, obj.type)
}
override fun mapToContentValues(obj: SearchTag) = contentValuesOf(
COL_ID to obj.id,
COL_MANGA_ID to obj.mangaId,
COL_NAMESPACE to obj.namespace,
COL_NAME to obj.name,
COL_TYPE to obj.type,
)
}
class SearchTagGetResolver : DefaultGetResolver<SearchTag>() {
app/src/main/java/exh/metadata/sql/mappers/SearchTitleTypeMapping.kt
+7 -7
View File
@@ -1,7 +1,7 @@
package exh.metadata.sql.mappers
import android.content.ContentValues
import android.database.Cursor
import androidx.core.content.contentValuesOf
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -34,12 +34,12 @@ class SearchTitlePutResolver : DefaultPutResolver<SearchTitle>() {
.whereArgs(obj.id)
.build()
override fun mapToContentValues(obj: SearchTitle) = ContentValues(4).apply {
put(COL_ID, obj.id)
put(COL_MANGA_ID, obj.mangaId)
put(COL_TITLE, obj.title)
put(COL_TYPE, obj.type)
}
override fun mapToContentValues(obj: SearchTitle) = contentValuesOf(
COL_ID to obj.id,
COL_MANGA_ID to obj.mangaId,
COL_TITLE to obj.title,
COL_TYPE to obj.type,
)
}
class SearchTitleGetResolver : DefaultGetResolver<SearchTitle>() {