pull/2292/head
kunfei 2 years ago
parent 14d1ecc27a
commit b50f38b681
  1. 4
      app/src/main/java/io/legado/app/help/AppWebDav.kt
  2. 2
      app/src/main/java/io/legado/app/help/glide/ImageLoader.kt
  3. 2
      app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt
  4. 1
      app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt
  5. 3
      app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt
  6. 4
      app/src/main/java/io/legado/app/ui/book/read/page/provider/ImageProvider.kt
  7. 1
      app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
  8. 2
      app/src/main/java/io/legado/app/utils/EncoderUtils.kt
  9. 2
      app/src/main/java/io/legado/app/utils/StringExtensions.kt

@ -19,9 +19,11 @@ import io.legado.app.lib.webdav.WebDavException
import io.legado.app.lib.webdav.WebDavFile import io.legado.app.lib.webdav.WebDavFile
import io.legado.app.ui.widget.dialog.WaitDialog import io.legado.app.ui.widget.dialog.WaitDialog
import io.legado.app.utils.* import io.legado.app.utils.*
import kotlinx.coroutines.*
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import splitties.init.appCtx import splitties.init.appCtx
import java.io.File import java.io.File
import java.text.SimpleDateFormat import java.text.SimpleDateFormat

@ -7,8 +7,8 @@ import android.net.Uri
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import com.bumptech.glide.RequestBuilder import com.bumptech.glide.RequestBuilder
import io.legado.app.utils.isAbsUrl import io.legado.app.utils.isAbsUrl
import io.legado.app.utils.isDataUrl
import io.legado.app.utils.isContentScheme import io.legado.app.utils.isContentScheme
import io.legado.app.utils.isDataUrl
import java.io.File import java.io.File
@Suppress("unused") @Suppress("unused")

@ -1,6 +1,5 @@
package io.legado.app.ui.about package io.legado.app.ui.about
import java.text.SimpleDateFormat
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
@ -26,6 +25,7 @@ import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.text.SimpleDateFormat
class ReadRecordActivity : BaseActivity<ActivityReadRecordBinding>() { class ReadRecordActivity : BaseActivity<ActivityReadRecordBinding>() {

@ -15,7 +15,6 @@ import io.legado.app.lib.theme.backgroundColor
import io.legado.app.ui.widget.recycler.DragSelectTouchHelper import io.legado.app.ui.widget.recycler.DragSelectTouchHelper
import io.legado.app.ui.widget.recycler.ItemTouchCallback import io.legado.app.ui.widget.recycler.ItemTouchCallback
import java.util.* import java.util.*
import kotlin.collections.HashSet
class BookAdapter(context: Context, val callBack: CallBack) : class BookAdapter(context: Context, val callBack: CallBack) :
RecyclerAdapter<Book, ItemArrangeBookBinding>(context), RecyclerAdapter<Book, ItemArrangeBookBinding>(context),

@ -15,7 +15,8 @@ import android.view.animation.Animation
import android.widget.FrameLayout import android.widget.FrameLayout
import android.widget.SeekBar import android.widget.SeekBar
import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
import androidx.core.view.* import androidx.core.view.isGone
import androidx.core.view.isVisible
import io.legado.app.R import io.legado.app.R
import io.legado.app.constant.PreferKey import io.legado.app.constant.PreferKey
import io.legado.app.databinding.ViewReadMenuBinding import io.legado.app.databinding.ViewReadMenuBinding

@ -15,7 +15,9 @@ import io.legado.app.help.config.AppConfig
import io.legado.app.help.coroutine.Coroutine import io.legado.app.help.coroutine.Coroutine
import io.legado.app.model.ReadBook import io.legado.app.model.ReadBook
import io.legado.app.model.localBook.EpubFile import io.legado.app.model.localBook.EpubFile
import io.legado.app.utils.* import io.legado.app.utils.BitmapUtils
import io.legado.app.utils.FileUtils
import io.legado.app.utils.toastOnUi
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext

@ -21,7 +21,6 @@ import io.legado.app.data.entities.BookSource
import io.legado.app.databinding.ActivityBookSourceBinding import io.legado.app.databinding.ActivityBookSourceBinding
import io.legado.app.databinding.DialogEditTextBinding import io.legado.app.databinding.DialogEditTextBinding
import io.legado.app.help.DirectLinkUpload import io.legado.app.help.DirectLinkUpload
import io.legado.app.help.IntentData
import io.legado.app.help.config.LocalConfig import io.legado.app.help.config.LocalConfig
import io.legado.app.lib.dialogs.alert import io.legado.app.lib.dialogs.alert
import io.legado.app.lib.theme.primaryColor import io.legado.app.lib.theme.primaryColor

@ -1,10 +1,10 @@
package io.legado.app.utils package io.legado.app.utils
import android.util.Base64 import android.util.Base64
import cn.hutool.crypto.symmetric.SymmetricCrypto
import java.security.spec.AlgorithmParameterSpec import java.security.spec.AlgorithmParameterSpec
import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.IvParameterSpec
import javax.crypto.spec.SecretKeySpec import javax.crypto.spec.SecretKeySpec
import cn.hutool.crypto.symmetric.SymmetricCrypto
/** /**
* transformations https://developer.android.google.cn/reference/kotlin/javax/crypto/Cipher?hl=en * transformations https://developer.android.google.cn/reference/kotlin/javax/crypto/Cipher?hl=en

@ -2,11 +2,11 @@
package io.legado.app.utils package io.legado.app.utils
import io.legado.app.constant.AppPattern.dataUriRegex
import android.icu.text.Collator import android.icu.text.Collator
import android.icu.util.ULocale import android.icu.util.ULocale
import android.net.Uri import android.net.Uri
import android.text.Editable import android.text.Editable
import io.legado.app.constant.AppPattern.dataUriRegex
import java.io.File import java.io.File
import java.util.* import java.util.*

Loading…
Cancel
Save