From 06ce0112a99a273ca3196c2fb0c8418b809ab13b Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 20 Dec 2023 20:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=EF=BC=9Acode=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 1 -
.../forwarder/adapter/FrpcPagingAdapter.kt | 2 +-
.../forwarder/adapter/LogsPagingAdapter.kt | 56 ------------------
.../sms/forwarder/adapter/MsgPagingAdapter.kt | 2 +-
.../forwarder/adapter/RulePagingAdapter.kt | 2 +-
.../forwarder/adapter/SenderPagingAdapter.kt | 2 +-
.../forwarder/adapter/TaskPagingAdapter.kt | 2 +-
.../forwarder/adapter/TaskSettingAdapter.kt | 2 +-
.../base/broccoli/BroccoliRecyclerAdapter.kt | 1 -
.../base/delegate/BaseDelegateAdapter.kt | 1 -
.../forwarder/core/BaseContainerFragment.kt | 2 +-
.../sms/forwarder/core/SimpleListAdapter.kt | 1 -
.../core/webview/AgentWebFragment.kt | 20 ++++++-
.../core/webview/MiddlewareWebViewClient.kt | 2 +-
.../core/webview/WebViewInterceptDialog.kt | 1 -
.../sms/forwarder/database/dao/LogsDao.kt | 11 ++--
.../sms/forwarder/database/dao/TaskDao.kt | 10 ----
.../idormy/sms/forwarder/entity/MsgInfo.kt | 2 +-
.../sms/forwarder/fragment/AboutFragment.kt | 2 +-
.../forwarder/fragment/SettingsFragment.kt | 2 +-
.../forwarder/fragment/TasksEditFragment.kt | 2 +-
.../fragment/action/SendSmsFragment.kt | 2 +-
.../fragment/client/CloneFragment.kt | 1 -
.../fragment/client/ContactAddFragment.kt | 2 +-
.../fragment/client/LocationFragment.kt | 2 +-
.../fragment/client/SmsSendFragment.kt | 2 +-
.../receiver/NetworkChangeReceiver.kt | 2 +-
.../forwarder/receiver/PhoneStateReceiver.kt | 2 +-
.../sms/forwarder/receiver/SmsReceiver.kt | 2 +-
.../server/component/LoginInterceptor.kt | 57 -------------------
.../server/controller/ConfigController.kt | 2 +-
.../idormy/sms/forwarder/utils/AppUtils.kt | 30 ++++++++--
.../idormy/sms/forwarder/utils/CommonUtils.kt | 2 +-
.../idormy/sms/forwarder/utils/Constants.kt | 1 +
.../sms/forwarder/utils/HttpServerUtils.kt | 1 -
.../idormy/sms/forwarder/utils/SendUtils.kt | 1 -
.../forwarder/utils/sender/PushplusUtils.kt | 1 -
.../sms/forwarder/utils/sender/SmsUtils.kt | 1 -
.../sms/forwarder/utils/sender/SocketUtils.kt | 2 +-
.../forwarder/utils/sender/UrlSchemeUtils.kt | 2 +-
.../forwarder/utils/sender/WebhookUtils.kt | 2 +-
.../update/CustomUpdateFailureListener.kt | 1 -
.../sms/forwarder/widget/GuideTipsDialog.kt | 2 +-
app/src/main/res/values-en/strings.xml | 2 +-
44 files changed, 77 insertions(+), 171 deletions(-)
delete mode 100644 app/src/main/java/com/idormy/sms/forwarder/adapter/LogsPagingAdapter.kt
delete mode 100644 app/src/main/java/com/idormy/sms/forwarder/server/component/LoginInterceptor.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a8aead44..5cbee035 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,6 @@
-
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/FrpcPagingAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/FrpcPagingAdapter.kt
index 34b8455d..22e10692 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/FrpcPagingAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/FrpcPagingAdapter.kt
@@ -15,7 +15,7 @@ import com.idormy.sms.forwarder.databinding.AdapterFrpcsCardViewListItemBinding
import com.xuexiang.xutil.resource.ResUtils.getColors
import frpclib.Frpclib
-@Suppress("EmptyMethod", "unused")
+@Suppress("EmptyMethod")
class FrpcPagingAdapter(private val itemClickListener: OnItemClickListener) : PagingDataAdapter(diffCallback) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/LogsPagingAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/LogsPagingAdapter.kt
deleted file mode 100644
index e8c1c78a..00000000
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/LogsPagingAdapter.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.idormy.sms.forwarder.adapter
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.paging.PagingDataAdapter
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.idormy.sms.forwarder.adapter.LogsPagingAdapter.MyViewHolder
-import com.idormy.sms.forwarder.database.entity.LogsAndRuleAndSender
-import com.idormy.sms.forwarder.databinding.AdapterLogsCardViewListItemBinding
-import com.xuexiang.xutil.data.DateUtils
-
-class LogsPagingAdapter(private val itemClickListener: OnItemClickListener) : PagingDataAdapter(diffCallback) {
-
- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
- val binding = AdapterLogsCardViewListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
- return MyViewHolder(binding)
- }
-
- override fun onBindViewHolder(holder: MyViewHolder, position: Int) {
- val item = getItem(position)
- if (item != null) {
- holder.binding.tvFrom.text = item.msg.from
- holder.binding.tvTime.text = DateUtils.getFriendlyTimeSpanByNow(item.logs.time)
- holder.binding.tvContent.text = item.msg.content
- //holder.binding.ivSenderImage.setImageResource(Sender.getImageId(item.sender.type))
- //holder.binding.ivStatusImage.setImageResource(item.logs.statusImageId)
- holder.binding.ivSimImage.setImageResource(item.msg.simImageId)
-
- holder.binding.cardView.setOnClickListener { view: View? ->
- itemClickListener.onItemClicked(view, item)
- }
- }
- }
-
- class MyViewHolder(val binding: AdapterLogsCardViewListItemBinding) : RecyclerView.ViewHolder(binding.root)
- interface OnItemClickListener {
- fun onItemClicked(view: View?, item: LogsAndRuleAndSender)
- fun onItemRemove(view: View?, id: Int)
- }
-
- companion object {
- var diffCallback: DiffUtil.ItemCallback = object : DiffUtil.ItemCallback() {
- override fun areItemsTheSame(oldItem: LogsAndRuleAndSender, newItem: LogsAndRuleAndSender): Boolean {
- return oldItem.logs.id == newItem.logs.id
- }
-
- @SuppressLint("DiffUtilEquals")
- override fun areContentsTheSame(oldItem: LogsAndRuleAndSender, newItem: LogsAndRuleAndSender): Boolean {
- return oldItem.logs === newItem.logs
- }
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/MsgPagingAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/MsgPagingAdapter.kt
index bba93742..b5da6bc9 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/MsgPagingAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/MsgPagingAdapter.kt
@@ -18,7 +18,7 @@ import com.idormy.sms.forwarder.database.entity.MsgAndLogs
import com.idormy.sms.forwarder.databinding.AdapterLogsCardViewListItemBinding
import com.xuexiang.xutil.data.DateUtils
-@Suppress("EmptyMethod", "unused")
+@Suppress("EmptyMethod")
class MsgPagingAdapter(private val itemClickListener: OnItemClickListener) : PagingDataAdapter(diffCallback) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/RulePagingAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/RulePagingAdapter.kt
index c8f17bca..e0a69bbc 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/RulePagingAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/RulePagingAdapter.kt
@@ -16,7 +16,7 @@ import com.idormy.sms.forwarder.adapter.RulePagingAdapter.MyViewHolder
import com.idormy.sms.forwarder.database.entity.Rule
import com.idormy.sms.forwarder.databinding.AdapterRulesCardViewListItemBinding
-@Suppress("EmptyMethod", "unused")
+@Suppress("EmptyMethod")
class RulePagingAdapter(private val itemClickListener: OnItemClickListener) : PagingDataAdapter(diffCallback) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/SenderPagingAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/SenderPagingAdapter.kt
index 220935a0..a835596c 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/SenderPagingAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/SenderPagingAdapter.kt
@@ -11,7 +11,7 @@ import com.idormy.sms.forwarder.adapter.SenderPagingAdapter.MyViewHolder
import com.idormy.sms.forwarder.database.entity.Sender
import com.idormy.sms.forwarder.databinding.AdapterSendersCardViewListItemBinding
-@Suppress("EmptyMethod", "unused")
+@Suppress("EmptyMethod")
class SenderPagingAdapter(private val itemClickListener: OnItemClickListener) : PagingDataAdapter(diffCallback) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskPagingAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskPagingAdapter.kt
index c838b16d..e6b79c38 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskPagingAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskPagingAdapter.kt
@@ -18,7 +18,7 @@ import com.idormy.sms.forwarder.databinding.AdapterTasksCardViewListItemBinding
import com.idormy.sms.forwarder.entity.TaskSetting
import com.xuexiang.xutil.data.DateUtils
-@Suppress("EmptyMethod", "unused")
+@Suppress("EmptyMethod")
class TaskPagingAdapter(private val itemClickListener: OnItemClickListener) : PagingDataAdapter(diffCallback) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskSettingAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskSettingAdapter.kt
index 4af529fb..9a923701 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskSettingAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskSettingAdapter.kt
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
import com.idormy.sms.forwarder.R
import com.idormy.sms.forwarder.entity.TaskSetting
-@Suppress("DEPRECATION", "unused")
+@Suppress("DEPRECATION")
class TaskSettingAdapter(
val itemList: MutableList,
private val editClickListener: (Int) -> Unit,
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/base/broccoli/BroccoliRecyclerAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/base/broccoli/BroccoliRecyclerAdapter.kt
index 86ef7527..bd943c0b 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/base/broccoli/BroccoliRecyclerAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/base/broccoli/BroccoliRecyclerAdapter.kt
@@ -12,7 +12,6 @@ import me.samlss.broccoli.Broccoli
* @author XUE
* @since 2019/4/8 16:33
*/
-@Suppress("unused")
abstract class BroccoliRecyclerAdapter(collection: Collection?) :
BaseRecyclerAdapter(collection) {
/**
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/base/delegate/BaseDelegateAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/base/delegate/BaseDelegateAdapter.kt
index af639d2d..27561ea1 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/base/delegate/BaseDelegateAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/base/delegate/BaseDelegateAdapter.kt
@@ -9,7 +9,6 @@ import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder
* @author xuexiang
* @since 2020/3/20 12:44 AM
*/
-@Suppress("unused")
abstract class BaseDelegateAdapter : XDelegateAdapter {
constructor() : super()
constructor(list: Collection?) : super(list)
diff --git a/app/src/main/java/com/idormy/sms/forwarder/core/BaseContainerFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/core/BaseContainerFragment.kt
index d5b27ba3..ecb157d2 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/core/BaseContainerFragment.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/core/BaseContainerFragment.kt
@@ -16,7 +16,7 @@ import com.xuexiang.xui.widget.actionbar.TitleUtils
* @author xuexiang
* @since 2018/11/22 上午11:26
*/
-@Suppress("UNUSED_PARAMETER", "unused")
+@Suppress("UNUSED_PARAMETER")
abstract class BaseContainerFragment : XPageContainerListFragment() {
override fun initPage() {
initTitle()
diff --git a/app/src/main/java/com/idormy/sms/forwarder/core/SimpleListAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/core/SimpleListAdapter.kt
index 5e282ae5..7289f83a 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/core/SimpleListAdapter.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/core/SimpleListAdapter.kt
@@ -13,7 +13,6 @@ import com.xuexiang.xutil.common.StringUtils
* @author xuexiang
* @since 2018/12/19 上午12:19
*/
-@Suppress("unused")
class SimpleListAdapter(context: Context?, data: List