diff --git a/README.md b/README.md index 2543e7a2..de1e6e36 100644 --- a/README.md +++ b/README.md @@ -233,21 +233,21 @@ Benefit by simplicity: -------- -### Screenshot: +### Screenshots : -| Docking in Ntf. screen | Main screen | Forward rules | Forward detail | +| Docking in Ntf. screen | Main screen | Fwding rules | Fwding details | | ---- | ---- | ---- | ---- | -| ![前台服务常驻状态栏](pic/taskbar.jpg "前台服务常驻状态栏") | ![应用主界面](pic/main.png "应用主界面") | ![转发规则](pic/rule.jpg "转发规则") | ![转发详情](pic/maindetail.jpg "转发详情") | -| Test of Fw. rule(s) | Multiple rules | Supported senders | Add/Edit DingTalk sender | -| ![添加/编辑转发规则](pic/ruleset.png "添加/编辑转发规则") | ![多重匹配规则](pic/multimatch.png "多重匹配规则") | ![发送通道](pic/sender.jpg "发送通道") | ![添加/编辑发送通道钉钉](pic/sendersetdingding.jpg "添加/编辑发送通道钉钉") | -| Add/Edit E-mail sender | Add/Edit Bark sender | Add/Edit Webhook | Add/Edit WeCom Bot sender | -| ![添加/编辑发送通道邮箱](pic/sendersetemail.jpg "添加/编辑发送通道邮箱") | ![添加/编辑发送通道Bark](pic/sendersetbark.png "添加/编辑发送通道Bark") | ![添加/编辑发送通道网页通知](pic/sendersetwebnotify.jpg "添加/编辑发送通道网页通知") | ![添加/编辑发送通道企业微信群机器人](pic/sendersetqywechat.jpg "添加/编辑发送通道企业微信群机器人") | +| ![Docking in Ntf. screen](pic/taskbar.jpg "Docking in Ntf. screen") | ![Main screen](pic/main.png "Main screen") | ![Forwarding rules](pic/rule.jpg "Forwarding rules") | ![Fwding details](pic/maindetail.jpg "Fwding details") | +| Test of a Fw. rule | Multiple filters | Supported senders | Add/Edit DingTalk sender | +| ![Test of a Fw. rule](pic/ruleset.png "Test of a Fw. rule") | ![Multiple filters](pic/multimatch.png "Multiple filters") | ![Supported senders](pic/sender.jpg "Supported senders") | ![Add/Edit DingTalk sender](pic/sendersetdingding.jpg "Add/Edit DingTalk sender") | +| Add/Edit E-mail sender | Add/Edit Bark sender | Add/Edit Webhook | Add/Edit WeCom Group Bot sender | +| ![Add/Edit E-mail sender](pic/sendersetemail.jpg "Add/Edit E-mail sender") | ![Add/Edit Bark sender](pic/sendersetbark.png "Add/Edit Bark sender") | ![Add/Edit Webhook sender](pic/sendersetwebnotify.jpg "Add/Edit Webhook sender") | ![Add/Edit WeCom group bot](pic/sendersetqywechat.jpg "Add/Edit WeCom group bot") | | Add/Edit Telegram Bot sender | Add/Edit ServerChan Turbo sender | Add/Edit WeCom Group sender | Settings | -| ![添加/编辑发送通道Telegram机器人](pic/sendertelegram.jpg "添加/编辑发送通道Telegram机器人") | ![添加/编辑发送通道Server酱·Turbo版](pic/senderserverchan.jpg "添加/编辑发送通道Server酱·Turbo版") | ![添加/编辑发送通道企业微信应用](pic/sendersetqywxapp.jpg "添加/编辑发送通道企业微信应用") | ![应用设置](pic/setting.jpg "应用设置") | -| About/Update | RegEx & specific SIM slot | SMS Fw. template w/ SIM slot info. | Add/Edit an SMS forwarding rule | -| ![在线升级](pic/update.jpg "在线升级") | ![支持正则匹配规则 & 支持卡槽匹配规则](pic/regex.jpg "支持正则匹配规则 & 支持卡槽匹配规则") | ![转发短信模板增加卡槽标识](pic/siminfo.jpg "转发短信模板增加卡槽标识") | ![添加/编辑发送通道其他手机短信](pic/sendersetsms.jpg "添加/编辑发送通道其他手机短信") | -| Add/Edit FeiShu Bot sender | Import and export (one-key cloning) | Listen to ntf. of other Apps and fw. | Get App pkg name(s) | -| ![添加/编辑发送通道飞书](pic/senderfeishu.png "添加/编辑发送通道飞书") | ![增加配置导出导入功能(一键克隆)](pic/clone.png "增加配置导出导入功能(一键克隆)") | ![监听其他APP通知信息并转发](pic/app_notify.png "监听其他APP通知信息并转发") | ![获取所有应用列表(方便复制APP包名)](pic/app_list.png "获取所有应用列表(方便复制APP包名)") | +| ![Add/Edit Telegram bot](pic/sendertelegram.jpg "Add/Edit Telegram bot") | ![Add/Edit ServerChan Tubo sender](pic/senderserverchan.jpg "Add/Edit ServerChan Tubo sender") | ![Add/Edit WeCom Enterprise channel sender](pic/sendersetqywxapp.jpg "Add/Edit WeCom Enterprise channel sender") | ![Settings](pic/setting.jpg "Settings") | +| About/Update | RegEx & SIM filters | SMS fwding template w/ SIM label | Add/Edit an SMS fwding rule | +| ![Online update](pic/update.jpg "Online update") | ![RegEx & SIM filters](pic/regex.jpg "RegEx & SIM filters") | ![SMS fwding template w/ SIM label](pic/siminfo.jpg "SMS fwding template w/ SIM label") | ![Add/Edit SMS fwder.](pic/sendersetsms.jpg "Add/Edit SMS fwder.") | +| Add/Edit FeiShu Bot sender | Import and export (One-key Cloning) | Listen to ntf. of other Apps and fw. | Get App pkg name(s) | +| ![Add/Edit FeiShu sender](pic/senderfeishu.png "Add/Edit FeiShu sender") | ![New setting import & export function (One-key Clone)](pic/clone.png "New setting import & export function (One-key Cloning)") | ![Listen to notifications of other Apps and forward](pic/app_notify.png "Listen to notifications of other Apps and forward") | ![Getting list of all Apps (to get App package name)](pic/app_list.png "Getting list of all Apps (to get App package name)") | -------- @@ -269,7 +269,7 @@ Benefit by simplicity: + https://github.com/xuexiangjys/XUpdateAPI (online update) + https://github.com/mailhu/emailkit (email sending) + https://github.com/alibaba/fastjson (json parsing) -+ https://github.com/getActivity/XXPermissions (Permissions) ++ https://github.com/getActivity/XXPermissions (permission requiring) + [![GitHub license](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg?_ga=2.126618957.1361252949.1638261367-1417196221.1635638144&_gl=1*1pfl3dq*_ga*MTQxNzE5NjIyMS4xNjM1NjM4MTQ0*_ga_V0XZL7QHEB*MTYzODMzMjA4OC43LjAuMTYzODMzMjA5Ny4w)](https://jb.gg/OpenSourceSupport) (License Certificate for JetBrains All Products Pack) -------- diff --git a/README_en.md b/README_en.md index 23d09b0c..6d5da09c 100644 --- a/README_en.md +++ b/README_en.md @@ -64,7 +64,7 @@ Benefit by simplicity: - [x] Forward to webhook (a single web page [sending POST/GET requests to a designated URL](doc/POST_WEB.md)); - [x] Forward to WeCom Bots; - [x] Forward to WeCom enterprise channels; -- [x] 转发到ServerChan(Server酱·Turbo版) +- [x] Forward to ServerChan·Turbo; - [x] Forward to Telegram Bots (Proxy support ready); - [x] Forward to another mobile phone via SMS [Note: Paid service, carriers may charge for SMS forwarding. SMS forwarding should apply with filtered rules when device has no Internet access.] - [x] Check for new version and upgrade; @@ -89,21 +89,21 @@ Benefit by simplicity: -------- -### Screenshot: +### Screenshots : -| Docking in Ntf. screen | Main screen | Forward rules | Forward detail | +| Docking in Ntf. screen | Main screen | Fwding rules | Fwding details | | ---- | ---- | ---- | ---- | -| ![前台服务常驻状态栏](pic/taskbar.jpg "前台服务常驻状态栏") | ![应用主界面](pic/main.png "应用主界面") | ![转发规则](pic/rule.jpg "转发规则") | ![转发详情](pic/maindetail.jpg "转发详情") | -| Test of Fw. rule(s) | Multiple rules | Supported senders | Add/Edit DingTalk sender | -| ![添加/编辑转发规则](pic/ruleset.png "添加/编辑转发规则") | ![多重匹配规则](pic/multimatch.png "多重匹配规则") | ![发送通道](pic/sender.jpg "发送通道") | ![添加/编辑发送通道钉钉](pic/sendersetdingding.jpg "添加/编辑发送通道钉钉") | -| Add/Edit E-mail sender | Add/Edit Bark sender | Add/Edit Webhook | Add/Edit WeCom Bot sender | -| ![添加/编辑发送通道邮箱](pic/sendersetemail.jpg "添加/编辑发送通道邮箱") | ![添加/编辑发送通道Bark](pic/sendersetbark.png "添加/编辑发送通道Bark") | ![添加/编辑发送通道网页通知](pic/sendersetwebnotify.jpg "添加/编辑发送通道网页通知") | ![添加/编辑发送通道企业微信群机器人](pic/sendersetqywechat.jpg "添加/编辑发送通道企业微信群机器人") | +| ![Docking in Ntf. screen](pic/taskbar.jpg "Docking in Ntf. screen") | ![Main screen](pic/main.png "Main screen") | ![Forwarding rules](pic/rule.jpg "Forwarding rules") | ![Fwding details](pic/maindetail.jpg "Fwding details") | +| Test of a Fw. rule | Multiple filters | Supported senders | Add/Edit DingTalk sender | +| ![Test of a Fw. rule](pic/ruleset.png "Test of a Fw. rule") | ![Multiple filters](pic/multimatch.png "Multiple filters") | ![Supported senders](pic/sender.jpg "Supported senders") | ![Add/Edit DingTalk sender](pic/sendersetdingding.jpg "Add/Edit DingTalk sender") | +| Add/Edit E-mail sender | Add/Edit Bark sender | Add/Edit Webhook | Add/Edit WeCom Group Bot sender | +| ![Add/Edit E-mail sender](pic/sendersetemail.jpg "Add/Edit E-mail sender") | ![Add/Edit Bark sender](pic/sendersetbark.png "Add/Edit Bark sender") | ![Add/Edit Webhook sender](pic/sendersetwebnotify.jpg "Add/Edit Webhook sender") | ![Add/Edit WeCom group bot](pic/sendersetqywechat.jpg "Add/Edit WeCom group bot") | | Add/Edit Telegram Bot sender | Add/Edit ServerChan Turbo sender | Add/Edit WeCom Group sender | Settings | -| ![添加/编辑发送通道Telegram机器人](pic/sendertelegram.jpg "添加/编辑发送通道Telegram机器人") | ![添加/编辑发送通道Server酱·Turbo版](pic/senderserverchan.jpg "添加/编辑发送通道Server酱·Turbo版") | ![添加/编辑发送通道企业微信应用](pic/sendersetqywxapp.jpg "添加/编辑发送通道企业微信应用") | ![应用设置](pic/setting.jpg "应用设置") | -| About/Update | RegEx & specific SIM slot | SMS Fw. template w/ SIM slot info. | Add/Edit an SMS forwarding rule | -| ![在线升级](pic/update.jpg "在线升级") | ![支持正则匹配规则 & 支持卡槽匹配规则](pic/regex.jpg "支持正则匹配规则 & 支持卡槽匹配规则") | ![转发短信模板增加卡槽标识](pic/siminfo.jpg "转发短信模板增加卡槽标识") | ![添加/编辑发送通道其他手机短信](pic/sendersetsms.jpg "添加/编辑发送通道其他手机短信") | -| Add/Edit FeiShu Bot sender | Import and export (one-key cloning) | Listen to ntf. of other Apps and fw. | Get App pkg name(s) | -| ![添加/编辑发送通道飞书](pic/senderfeishu.png "添加/编辑发送通道飞书") | ![增加配置导出导入功能(一键克隆)](pic/clone.png "增加配置导出导入功能(一键克隆)") | ![监听其他APP通知信息并转发](pic/app_notify.png "监听其他APP通知信息并转发") | ![获取所有应用列表(方便复制APP包名)](pic/app_list.png "获取所有应用列表(方便复制APP包名)") | +| ![Add/Edit Telegram bot](pic/sendertelegram.jpg "Add/Edit Telegram bot") | ![Add/Edit ServerChan Tubo sender](pic/senderserverchan.jpg "Add/Edit ServerChan Tubo sender") | ![Add/Edit WeCom Enterprise channel sender](pic/sendersetqywxapp.jpg "Add/Edit WeCom Enterprise channel sender") | ![Settings](pic/setting.jpg "Settings") | +| About/Update | RegEx & SIM filters | SMS fwding template w/ SIM label | Add/Edit an SMS fwding rule | +| ![Online update](pic/update.jpg "Online update") | ![RegEx & SIM filters](pic/regex.jpg "RegEx & SIM filters") | ![SMS fwding template w/ SIM label](pic/siminfo.jpg "SMS fwding template w/ SIM label") | ![Add/Edit SMS fwder.](pic/sendersetsms.jpg "Add/Edit SMS fwder.") | +| Add/Edit FeiShu Bot sender | Import and export (One-key Cloning) | Listen to ntf. of other Apps and fw. | Get App pkg name(s) | +| ![Add/Edit FeiShu sender](pic/senderfeishu.png "Add/Edit FeiShu sender") | ![New setting import & export function (One-key Clone)](pic/clone.png "New setting import & export function (One-key Cloning)") | ![Listen to notifications of other Apps and forward](pic/app_notify.png "Listen to notifications of other Apps and forward") | ![Getting list of all Apps (to get App package name)](pic/app_list.png "Getting list of all Apps (to get App package name)") | -------- @@ -125,6 +125,7 @@ Benefit by simplicity: + https://github.com/xuexiangjys/XUpdateAPI (online update) + https://github.com/mailhu/emailkit (email sending) + https://github.com/alibaba/fastjson (json parsing) ++ https://github.com/getActivity/XXPermissions (permission requiring) + [![GitHub license](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg?_ga=2.126618957.1361252949.1638261367-1417196221.1635638144&_gl=1*1pfl3dq*_ga*MTQxNzE5NjIyMS4xNjM1NjM4MTQ0*_ga_V0XZL7QHEB*MTYzODMzMjA4OC43LjAuMTYzODMzMjA5Ny4w)](https://jb.gg/OpenSourceSupport) (License Certificate for JetBrains All Products Pack) -------- diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index edcd2b67..d7b9eb50 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -17,7 +17,7 @@ Sender Setting App List Tips: Pull to refresh; Long press to delete one log entry. - Tips: Tap "NEW FORWARDING RULE" to add a new rule; Long press a rule to delete; Tap an existing rule to edit. + Tips: Tap "NEW SMS/Call Fw. RULE" to add a new rule; Long press a rule to delete; Tap an existing rule to edit. Tips: Tap "NEW SENDER" to add a new sender; Long press a sender to delete; Tap an existing sender to edit. Tips: Tap to copy the package name of an App; Long press an App to start and jump to it. @@ -28,10 +28,10 @@ Repo URL Repo Mirror QQ Group - 1st:562854376 - 2nd:31330492 - Join 1st Group - Join 2nd Group + Group 1:562854376 + Group 2:31330492 + Join Group 1 + Join Group 2 Cache size Purge Checking… @@ -42,7 +42,7 @@ Clear Logs Delete confirmation Are you sure to delete this log entry? - This log entry is deleted. + The log entry is deleted. Details Are you sure to clear all forwarding logs? Pull to refresh. @@ -59,10 +59,10 @@ Please add a sender first. Select Sender Rule tester: - New SMS Fw. rule - New Call Fw. rule - New App Fw. rule - Test Sim Slot + New SMS Fw. Rule + New Call Fw. Rule + New App Fw. Rule + Test SIM Slot Test Phone Number Test Msg Content Test PackageName @@ -150,26 +150,26 @@ WebServer e.g. https://a.b.com/msg?token=xyz WebParams e.g. payload=%7B%22text%22%3A%22[msg]%22%7D [msg] will be replaced with text message content. \nSupport Json format, for example: {"text":[MSG]}.\n Note: MSG is automatically utF-8 encoded in addition to JSON format Secret (sign is not counted if left blank) - Sim Slot + SIM Slot Same source Receive mobile phone numbers separated by, e.g. 15888888888;19999999999 Enable when no network is available Device name - SIM1 Remark - SIM2 Remark - Carrier_Mobile Number + SIM1 Label + SIM2 Label + Label of SIM, eg.: "CMCC", "13800138000", etc. Low power alarm threshold Value range: 0–100. Left blank or 0 is disabled Retry interval (seconds) Retry five times after it fails Forward sms - Main switch, grant the permission to read short messages, notify short messages, and send short messages + Main switch, requires permissions to read and sned SMS messages, especially verification SMS texts. Forward missed calls - Main switch, please grant read call history, contact rights + Main switch, requires permissions to read call log and contacts. Forward app notify - Master switch, please grant notice first - Enable custom templates + Main switch, requires permission to read notification. + Global custom template Priority: custom template for forwarding rules > Global custom template > System default Enable regular replacement content Format: RegularExpression===ReplacementResult,One rule per line.\ne.g. (\\d{3})\\d+(\\d{4})===$1****$2