diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt index f4b44815..f5e1b059 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt @@ -78,18 +78,13 @@ data class MsgInfo( @SuppressLint("SimpleDateFormat") fun replaceTemplate(template: String, regexReplace: String, needJson: Boolean = false): String { - val splitSimInfo = simInfo.split("#####") - val title = splitSimInfo.getOrElse(0) { simInfo } - val scheme = splitSimInfo.getOrElse(1) { "" } - return template.replaceTag(getString(R.string.tag_from), from, needJson) .replaceTag(getString(R.string.tag_package_name), from, needJson) .replaceTag(getString(R.string.tag_sms), content, needJson) .replaceTag(getString(R.string.tag_msg), content, needJson) - .replaceTag(getString(R.string.tag_card_slot), title, needJson) + .replaceTag(getString(R.string.tag_card_slot), simInfo, needJson) .replaceTag(getString(R.string.tag_card_subid), subId.toString(), needJson) - .replaceTag(getString(R.string.tag_title), title, needJson) - .replaceTag(getString(R.string.tag_scheme), scheme, needJson) + .replaceTag(getString(R.string.tag_title), simInfo, needJson) .replaceTag(getString(R.string.tag_uid), uid.toString(), needJson) .replaceTag(getString(R.string.tag_receive_time), SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date), needJson) .replaceTag(getString(R.string.tag_current_time), SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Date()), needJson) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt index d894433d..8094a171 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt @@ -143,12 +143,8 @@ class LogsFragment : BaseFragment(), MsgPagingAdapter.OnIt detailStr.append(getString(R.string.from)).append(item.msg.from).append("\n\n") if (!TextUtils.isEmpty(item.msg.simInfo)) { if (item.msg.type == "app") { - val splitSimInfo = item.msg.simInfo.split("#####") - val title = splitSimInfo.getOrElse(0) { item.msg.simInfo } - val scheme = splitSimInfo.getOrElse(1) { "" } - detailStr.append(getString(R.string.title)).append(title).append("\n\n") + detailStr.append(getString(R.string.title)).append(item.msg.simInfo).append("\n\n") detailStr.append(getString(R.string.msg)).append(item.msg.content).append("\n\n") - if (!TextUtils.isEmpty(scheme) && scheme != "null") detailStr.append(getString(R.string.scheme)).append(scheme).append("\n\n") } else { detailStr.append(getString(R.string.msg)).append(item.msg.content).append("\n\n") detailStr.append(getString(R.string.slot)).append(item.msg.simInfo).append("\n\n") diff --git a/app/src/main/java/com/idormy/sms/forwarder/service/NotificationService.kt b/app/src/main/java/com/idormy/sms/forwarder/service/NotificationService.kt index 52bc3f9a..ffffcfc9 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/service/NotificationService.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/service/NotificationService.kt @@ -2,7 +2,6 @@ package com.idormy.sms.forwarder.service import android.annotation.SuppressLint import android.content.ComponentName -import android.net.Uri import android.os.Build import android.service.notification.NotificationListenerService import android.service.notification.StatusBarNotification @@ -82,43 +81,12 @@ class NotificationService : NotificationListenerService() { //自身通知跳过 if (PACKAGE_NAME == sbn.packageName) return // 标题 - var title = extras["android.title"]?.toString() ?: "" + val title = extras["android.title"]?.toString() ?: "" // 通知内容 var text = extras["android.text"]?.toString() ?: "" if (text.isEmpty() && notification.tickerText != null) { text = notification.tickerText.toString() } - // TODO: 获取Scheme信息 - val pendingIntent = notification.contentIntent - /*try { - val method = pendingIntent.javaClass.getDeclaredMethod("getIntent") - val intent = method.invoke(pendingIntent) as Intent - // 获取scheme - val scheme = intent.scheme - if (scheme != null) { - // 处理scheme信息 - Log.d(TAG, "Scheme: $scheme") - } - } catch (e: Exception) { - // 处理异常 - Log.e(TAG, "Failed to get scheme from PendingIntent", e) - }*/ - try { - val creatorPackage = pendingIntent.creatorPackage - val appIntent = creatorPackage?.let { packageManager.getLaunchIntentForPackage(it) } - var scheme: String? = appIntent?.scheme - if (scheme == null) { - val uri: Uri? = appIntent?.data - scheme = uri?.scheme - } - Log.d(TAG, "from=$from, scheme=$scheme") - if (!TextUtils.isEmpty(scheme)) { - title += "#####$scheme" - } - } catch (e: Exception) { - e.printStackTrace() - Log.e(TAG, "Failed to get scheme from PendingIntent", e) - } //不处理空消息(标题跟内容都为空) if (TextUtils.isEmpty(title) && TextUtils.isEmpty(text)) return diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 92291d6e..c3f977f3 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -624,7 +624,6 @@ {{DEVICE_NAME}} {{APP_VERSION}} {{TITLE}} - {{SCHEME}} {{CALL_TYPE}} {{LOCATION}} {{LOCATION_LONGITUDE}} diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3b9b3cf4..02ae5a50 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -625,7 +625,6 @@ {{DEVICE_NAME}} {{APP_VERSION}} {{TITLE}} - {{SCHEME}} {{CALL_TYPE}} {{LOCATION}} {{LOCATION_LONGITUDE}} diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 62ac21a3..cb1f771b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -625,7 +625,6 @@ {{DEVICE_NAME}} {{APP_VERSION}} {{TITLE}} - {{SCHEME}} {{CALL_TYPE}} {{LOCATION}} {{LOCATION_LONGITUDE}} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d9c790c..d6221d28 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -625,7 +625,6 @@ {{DEVICE_NAME}} {{APP_VERSION}} {{TITLE}} - {{SCHEME}} {{CALL_TYPE}} {{LOCATION}} {{LOCATION_LONGITUDE}}