From ec6aa2370c5dd842a771583fd32e3f00f800367a Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Thu, 30 Sep 2021 14:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=A2=B3=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 3 +- .../sms/forwarder/service/FrontService.java | 3 +- .../idormy/sms/forwarder/utils/CertUtils.java | 2 +- .../sms/forwarder/utils/SettingUtil.java | 3 +- .../res/drawable-hdpi/ic_sms_forwarder.png | Bin 688 -> 0 bytes .../res/drawable-mdpi/ic_sms_forwarder.png | Bin 458 -> 0 bytes .../res/drawable-xhdpi/ic_sms_forwarder.png | Bin 889 -> 0 bytes .../res/drawable-xxhdpi/ic_sms_forwarder.png | Bin 1304 -> 0 bytes .../res/drawable-xxxhdpi/ic_sms_forwarder.png | Bin 1870 -> 0 bytes app/src/main/res/drawable/ic_forwarder.xml | 5 ++ app/src/main/res/layout/activity_about.xml | 16 ++-- app/src/main/res/layout/activity_main.xml | 10 +-- app/src/main/res/layout/activity_rule.xml | 1 - app/src/main/res/layout/activity_sender.xml | 1 - app/src/main/res/layout/activity_setting.xml | 74 +++++++++++------- .../res/layout/alert_dialog_setview_bark.xml | 23 +++--- .../layout/alert_dialog_setview_dingding.xml | 29 ++++--- .../res/layout/alert_dialog_setview_email.xml | 38 +++++---- .../layout/alert_dialog_setview_feishu.xml | 27 ++++--- .../layout/alert_dialog_setview_qywxapp.xml | 32 +++++--- .../alert_dialog_setview_qywxgrouprobot.xml | 24 +++--- .../res/layout/alert_dialog_setview_rule.xml | 38 ++++----- .../layout/alert_dialog_setview_rule_test.xml | 13 +-- .../alert_dialog_setview_serverchan.xml | 24 +++--- .../res/layout/alert_dialog_setview_sms.xml | 28 ++++--- .../layout/alert_dialog_setview_telegram.xml | 27 ++++--- .../layout/alert_dialog_setview_webnotify.xml | 34 +++++--- app/src/main/res/layout/header.xml | 8 +- app/src/main/res/layout/item_log.xml | 1 - app/src/main/res/layout/item_rule.xml | 1 - app/src/main/res/layout/item_sender.xml | 3 +- .../mipmap-hdpi/ic_launcher_background.png | Bin 3324 -> 0 bytes .../mipmap-mdpi/ic_launcher_background.png | Bin 2121 -> 0 bytes .../mipmap-xhdpi/ic_launcher_background.png | Bin 4614 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_background.png | Bin 7445 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_background.png | Bin 10453 -> 0 bytes app/src/main/res/values-en/colors.xml | 10 --- app/src/main/res/values-en/strings.xml | 23 ++++-- app/src/main/res/values/colors.xml | 10 --- app/src/main/res/values/strings.xml | 25 +++--- 41 files changed, 306 insertions(+), 231 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_sms_forwarder.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_sms_forwarder.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_sms_forwarder.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_sms_forwarder.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_sms_forwarder.png create mode 100644 app/src/main/res/drawable/ic_forwarder.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_background.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_background.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_background.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png diff --git a/app/build.gradle b/app/build.gradle index 5172cac9..5b5485d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -142,6 +142,7 @@ dependencies { implementation 'com.github.mailhu:emailkit:4.2.2' //Lombok + //noinspection AnnotationProcessorOnCompilePath compileOnly 'org.projectlombok:lombok:1.18.20' annotationProcessor 'org.projectlombok:lombok:1.18.20' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3c9a6d17..c2d6d0ed 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -61,7 +61,8 @@ + android:label="@string/about" + tools:ignore="IntentFilterExportedReceiver"> = Build.VERSION_CODES.LOLLIPOP) { BatteryManager batteryManager = (BatteryManager) getSystemService(BATTERY_SERVICE); diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/CertUtils.java b/app/src/main/java/com/idormy/sms/forwarder/utils/CertUtils.java index 2bb01898..878b2265 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/CertUtils.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/CertUtils.java @@ -14,7 +14,7 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -@SuppressLint("TrustAllX509TrustManager") +@SuppressLint("ALL") public class CertUtils { //获取这个SSLSocketFactory diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java index c6da6b8f..0793f643 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java @@ -1,5 +1,6 @@ package com.idormy.sms.forwarder.utils; +import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; @@ -10,7 +11,7 @@ public class SettingUtil { static Boolean hasInit = false; private static final String TAG = "SettingUtil"; private static SharedPreferences sp_setting = null; - @SuppressWarnings("FieldCanBeLocal") + @SuppressLint("StaticFieldLeak") private static Context context = null; public static void init(Context context1) { diff --git a/app/src/main/res/drawable-hdpi/ic_sms_forwarder.png b/app/src/main/res/drawable-hdpi/ic_sms_forwarder.png deleted file mode 100644 index 554874c5f4df6e21b277fc90e3f13cbb16de0a52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 688 zcmV;h0#E&kP)p4aQl#-v zx0lb^08%KJu!4SB@q(B{g(f^*ZdkfYj*3lDm!nD$ukzT%-FEY98LD}J@Ppom`}U$l zkIEOk=uZ!jKFEpxB`+WPkbC9XEgWKeA48%{g(*fA^^QcVst-q;_A z1$rJOZ0Lj5wUHw#IwdQnkn-H@W{{Y%ic}jB8dsOqOfq)p^Sq1CJ=5Qe!B=fel+E^0 zr3reogTlN8c2{<|858a0zH|u%DjFM%po7W=C~tx2j+?S0tr%0sy?VbLP|)g_Mse6( zbA9Nn5|q5wj%lth8aFys>p&rKLKWI|SB#GywL|Ri^6gzZ!-$V=7&)TGh;nnLO-l}# zt|~F<9xAFZsOoW5K|Wwdm$4`p@y;F##t?6YFOZ?eN>SSa7ia|3S9G6(a)=mNQJcp+p{SP4LRGA~q4u31eO;s*CF#F*CH})4N Wu>^8s6wP%20000|829o zNP7!=2s-m}4*Wjmo0*+elz%xheb~a-FJZlx;TK`xQxxWgJJDStDe8EWS(%_iH1RI8 zdiY0LETMu1a_XS{PL1P;T6m>xz1IiJX@em^h{uXH6+xE-Pqig_Y6Z%rb$J zFlgTG-JpYj#J05&Dhoqf@Cd{%&V#ywNj%XW9(@8iu`-K_On7P#Xi$b5QV$TACE_0B zs4Rz1TD3ap7a(e0HX^9Xtl1GgEQ)9>FDlC75JCZ#Yyo@D^Zi7PiyGH;YmNoCW*N@s#*;PHHi3Y}5|QxN)4;x}Aan+7lPfz&k^a){R>ruMq06 z8jM}ryTEO|!$8N)!_`Kly%(vGU#x0!>W_X9UrU8~37dw&(EtDd07*qoM6N<$f>hGU AH2?qr diff --git a/app/src/main/res/drawable-xhdpi/ic_sms_forwarder.png b/app/src/main/res/drawable-xhdpi/ic_sms_forwarder.png deleted file mode 100644 index fb1d9a526e2e84475149f9c50262b52610d58b23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 889 zcmV-<1BU#GP)}k0>NzSIj1cZj5CBp2>~<2fS|@#2r7ywQ3zp1L2$e|-p0T6 z-rII-$J(`Hd@y>?r{1;Cb9(MM&pBO5$^Z42Ej)RQ;Bq}q;TH8aojwL|sfJ!aiVnD8 zf}%qwiU_V&(g^PA;HKesSuP0_0X$kp{g^aBXP^!GXwxKtIcPf?c&XHl>ju~?wi?G= zK?C?Z{Vvl|V?p5Yprqll0WwE7?7z03g_!wXkb>80olkfO!J-kC1tpw2)@mgV(T;J~ z9*p97ui#Da+3-9rk^4bLE=a@X@xwOW$BI1Q;mh>K%o0@NK`#zzRq`0_86+Fj<5G(8 zAnptBW$N?>p04j|e5yaoNMbGo?1mlrcC@sRvcK;35Yfm{*h0GS|9k=hBD!k(J^u^!j^S<5-0wjE|kDc3E&C-7(2MNb3>w#@)j zeX|cQV*@>~bmq-WH^Vh9@3`QbK!?W(e5rRYakb9!Cuye;1m2{=TERLzjPv-j{w!1< zziL(Nn45J9*w85oAqZIEMea1yFBmhm)})|K=)kVb7=Tlb^=}lKeAxTU5Mv8pt2v6< zO&WGT1JwyWTmLDZ3tl|e=N2OEaBy-|GGxzsS=Q-D0Jl8Ax0-F<(MEDVnB?yQ4GHmNrn``jUpeJ9dfjL*RLV$jVR zYZ&1^o5PE-;1%=#&Y_<1SXY1|Eb6Bvf1|Nqf)=`Wte@iXpmOQo`t#urR0hrrW}`%q P00000NkvXXu0mjf-{7Vn diff --git a/app/src/main/res/drawable-xxhdpi/ic_sms_forwarder.png b/app/src/main/res/drawable-xxhdpi/ic_sms_forwarder.png deleted file mode 100644 index 6c06c7ba9d930ca151282554d66f02d125a8f1bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1304 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 diff --git a/app/src/main/res/drawable/ic_forwarder.xml b/app/src/main/res/drawable/ic_forwarder.xml new file mode 100644 index 00000000..2d7c7d17 --- /dev/null +++ b/app/src/main/res/drawable/ic_forwarder.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 62f12984..9a8bed94 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -6,7 +6,7 @@ + android:text="@string/version_now" />