From cbe01e9338906cef9ae5b9c792a7cf802204c230 Mon Sep 17 00:00:00 2001
From: wenyifan <yifan.wen@eisgroup.com>
Date: Sun, 12 Nov 2023 16:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |   2 +-
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   3 +-
 app/build.gradle                              |  14 +--
 app/src/debug/res/mipmap-hdpi/ic_launcher.png | Bin 1109 -> 0 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 2704 -> 0 bytes
 app/src/debug/res/mipmap-mdpi/ic_launcher.png | Bin 845 -> 0 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 1729 -> 0 bytes
 .../debug/res/mipmap-xhdpi/ic_launcher.png    | Bin 1507 -> 0 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 3937 -> 0 bytes
 .../debug/res/mipmap-xxhdpi/ic_launcher.png   | Bin 2414 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 6351 -> 0 bytes
 .../debug/res/mipmap-xxxhdpi/ic_launcher.png  | Bin 3156 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 8936 -> 0 bytes
 app/src/main/AndroidManifest.xml              |   1 -
 .../main/java/run/evan/gost/GostService.java  |   5 +-
 .../main/java/run/evan/gost/MainActivity.java | 107 +++++++++---------
 app/src/main/res/layout/activity_main.xml     |  70 ++++++------
 app/src/main/res/values-zh-rCN/strings.xml    |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/themes.xml            |   6 +-
 21 files changed, 106 insertions(+), 105 deletions(-)
 delete mode 100644 app/src/debug/res/mipmap-hdpi/ic_launcher.png
 delete mode 100644 app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
 delete mode 100644 app/src/debug/res/mipmap-mdpi/ic_launcher.png
 delete mode 100644 app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
 delete mode 100644 app/src/debug/res/mipmap-xhdpi/ic_launcher.png
 delete mode 100644 app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
 delete mode 100644 app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
 delete mode 100644 app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
 delete mode 100644 app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
 delete mode 100644 app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdd9278..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 21f012e..63fdec6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,14 +8,17 @@ android {
 
     defaultConfig {
         applicationId "run.evan.gost"
-        minSdk 23
+        minSdk 26
         targetSdk 32
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-
+    buildFeatures {
+        viewBinding = true
+        aidl true
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -49,12 +52,7 @@ tasks.withType(JavaCompile)
 
 dependencies {
     implementation fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    implementation 'androidx.annotation:annotation:1.3.0'
 }
 
 
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index b1db91680018eab321d459af68e1200426f0c32a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1109
zcmV-b1giUqP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000CWNkl<ZcwX(B
z%S#(U9LJ+o=tHrG(ia6m2tE=eCcZC~9;GJ<c<V`&Ui2hLR6KYw*wp0I)<YkMo=pA*
zYrPk&e}pGr-~$aZ{e72=-OR2|c1^RH?fl?_7$?8Y_rvUF*%<=?UAlDX(xrUW3=a?2
z`3YnaL%OY6@dY2%t+QP<=;`Sh>Fw=Z>g(%!Pe0$$?<tkQXD)p9CHj5DE~C>j-WZF;
z9#PW`g82!Ow1I5qtWN6c{G?_-3QhAqgGHm!pMk$}O1~x*E@A;{@EVPHL!XhS8N@m|
zI^yQcB^AHQlb|GTW^(}5$<t}Z!r^cRS=|V#CBq+hGn)gbjv=VCv-2~ux)D^@-QE3>
zH?ui_>KKATq0kp(btNbgiG1SCY!0A0T+ml!bt`C%H?ui_>Tp5dkhN+A_4oI)cs$Mq
z2L~;Gt1#6ki0)+B+}s@7+uLKwWReXG3|Pigkm?gOJ3GtH&d%87<s~~kJ!LB^D~2?2
zT!p9}K{%}vi3B@8KR4uXASs<rdnKtl1VPTi!U8)!J}#2O!Rwh!#tTW_3*vH)j*cv1
zL`kcwtCg1Itsq>0A?M)Wz#_yBNJ^zrm6YV2AU<>U_xCL#ZUWb&<>lo{eY<%h2s2=2
zW`^zV?izv3TwGif3CZX4mNAgJxVUIY7JHW&Zv-LO`1m-RnwlzNdU~2|ZEY0^+S%E$
zj02OClWb^c$kMyacq8aKFtc*GT#=y7%}vX=3Zex`(1IjrK@zke3H}f?Ha5m4CMK>J
z9UZldafv?!VT}1b*=)94ciUQ!1T9E{79>FnlAr}i(1IjrK@zG<5Wr2I`KAvyf#MjE
z|4NV>v>*vukOVDAf)*q}3nK7<9uMlphxY&v_RWIu;2#SB;y5f6I9v%)M-YNxsRv6w
z;xZ7HhRlMnbR>?!5)+o19L_9t1OY4-VoMC){ZT5AibYC?vj?ap2w(<ajsE21#3I5D
zENerK%avI51OZ6GZjbABgK!QH583?uyqlTBQBx3*Ny6*cZ*&VeKwUuqlCZf-ye452
zRvF{~wFLo4z?K*;2|uxoPaNkG^#uW3fU%bm8$YoD)Zth8P546)z>Orf4wvDyGUFdX
z{|GHeLRkdq|JAT7E+`s}`hEt5!{J-apfqo0a{$#b1hu!fuOX`|LG<P~=4LhrQIbNI
zJe?t|rKRO9vc_VudeOs8RYTk%o^^F~{o)P%MB)0gO&MPlvLdsi!kZpay`=MW8@AEZ
z4<HN4`Q6mi^a>e?(oZj;?h?<5NON;@A{Y#QZ)<DIwYIjd6IsPr$7e?dWI?7vwtGd1
z9TukDec~w*Btk@3agYI7o)8ZLE>11Gs>iw3*x2}}p`qci${+)>Ad?uf90l8cK$k9E
bx|FCtvFpmVIb=8200000NkvXXu0mjf^qcs*

diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 2915c14dc3942d24bf15b07acff823bc815503db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2704
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
KMNUMnLSTX=+a#0#

diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index a13638717bffc3594f05599264d70d51e0b067e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009NNkl<ZcwX(9
zPiq=M7{=44Ep3&0sFy-3RIR9~5dRAz3M~m9dJz@8M*JFL4*3e9P;ykXkV5-0a?i;_
zFyv6$#-<(w6J+{6izB<Uu2s`@w{&0lu`o05?DOnDX5QV{u)@SqDwQ^Kx!gS?fd*06
zB5`+uSz;+Y(}9UZ;%PJ*b;aZH7e;_{L&Gd>S|JUf#K$zjA@P;CG#F?&geJL0t&lon
zvDkY`VrC*74u2qNceqAX@Rx<0I?2E{B++q1jH%5KaBgUTmPjP>JrD>ylWSE3-gq2o
z&?`#%i6l%SUWs+XHIRWTuh$!tYgGhq^!xojO6bdzjYKf8CD*D5xdF4@0guP?TCP<Q
zf5SjFn`QZYUe$gZ)@C4+$*^X#$xcsCS*21@^{>iW45ZU()@rrbXf$Hu@tAeHT~;oa
zRpVAccLS+ZinZHqc71&<iRYZ1ov}ippc=m{x*CA^<Kts?b918*&$+m`xU~u03~=${
zl^5ytdaPJ1s`3{_Hv>C6JFH%>vqqyKaddRVhQpyG`sCzf+77DKDoZAlsyP-xHv=Mj
zdwXm!7)S<iXT<(hu?&b4YVltfsMTuh;NXDm@9(qS-Cb4xEKFqp?dZoij2HW7VHpr7
z)WR~Lfn`9PPz!uj@O8mg245SoADG&}B3K42151F_Csv{IRVh}fFo0DnR<FDrt6HpX
z#W{ds1_1T}=jZ2=Xf3dxz@5SVLd*w-8UWalVP_@^2iVEY6AuhG0AK=pWbw*(I-R-V
zfhi0CR4Guc;NnrmKs7@gCt?}{0QDl&jZi;A9ZBq;g{cexRPIp06Wg^|$w2&HF7En#
zKEIxKU|Hk_+-`SBu2m8IrvbTqP6mD;DQ2P{9N}>I(&ciwp>d{xN#OU*!%!&nkrGu`
z!ziF77z}<QZI31zH3OZScDsFx5<YKlZ};ie{UY~QIIa_ZPCE8U%NLu?hQ|j_$y@^n
z41m*@4u|87)9HL?B&6Xjv`jSpQ9KU}d_dTUCk6uz(6X@jY2am{m+8Kd%zI(2Fhl$X
XwBp<H>10cj00000NkvXXu0mjfppJnY

diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index a8fc4267eae6044c256c8f77e3e8b20d02b2c34e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1729
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
X?c{pdEHvL=00000NkvXXu0mjfw8BMS

diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index f4e370a6c9f21da97bd7a70826e56dba0a73a01a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1507
zcmV<91swW`P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000H5Nkl<ZcwX(D
zOG_kI7>1p367Np%nsI{HZt>b`tKHshVaOi{G6SQ3KsUN_<3^&Z?6dZQQM}?tT(}pM
zkVUeXk$?~;n~(`J%mmTaoP2N1siZj7O>0+aRd;<KJamIqb?o=)bE=ecsxmUTxVX5u
zxVX5uxKgSfj*gCIGNYNuLJjB6%Frm6q3$J@NF?$|f8W{J`B^v|{;IpXyEYUG)p!wn
zc4UAoVr67&>2}-O+rOZO=ZGJPKZy6lJNfD*^v{e8ki{IbF=l03=~l^h6E*aT5KK&7
zb#-;M7&Eh6y3O9+-Xdz?H5#HuF6cE%TrnC^nTZGngQq^9uhf{GrP2>V2mclg5SP^0
zKk_{zk(nSHK||4Z#_X(=c6micv*_SI$;M#Z^b0T=S~eu$=hD*Bd}D@5m2NN)2;hwW
zCk{?${OcGEGu{7Z)6voKmcF!2#tf4xx$}d@#>N)vS|5y!FlO{@s0Vzkt*z}wc6JDO
z*wE0>$^sH&=m8&UYHC8r&JF>Y_4V~_EFdw)9#CCf-Gl5{z&*kO9EJrrOj-#T92^w0
zv$LYVzu)vTw~{sjhK7d3?(VKQKR*|Xi;H4lV8FDE8%YZRkw`@B?CglEt1EGReJw67
zE;I>{qHgOpQeMEw$cWh5+WIei9Y|POT5`RFlok*#e4~Wr<z-h7M=2{{cz9SF^W%kY
zl(4e0BKrFJOvi8oDJcNM%HG~y!tix2FE7Q~+L{Q5!=__7P09&C`1||&rjQd6jYhTM
z%54%-N&tqPgM$MtOf}$}fS%ws2`MAMYWO<XAH$Jb{#Z*10d|G2gPyRyzV3=kRM!i@
za4|PGCytMg#mUJ@OwP{EOd*5Q(^J#7I!8xGVrFJWghC-xoA-(91>A&%g#}aiU}|d0
zw5{7<0S?0g9EJrr3=41=7T_=}z+qT`!>|C!`1rUuJUlcpF)?A<)=pS}WO{nqv_HVH
z)otyB1xQ$c1z3QgSitRI0TLEq0Ty5=7H~UQfP@8DfCU(e1>BCb5HLA8Y5Ere7#kZi
zZ5xkx0_NxEP21W@S_rU%cmlWw+!HLoVOW5}umFc)0S?0g9EJrr3=6nJFaZ}6aWNrR
zousRSiM(p~026=JZFMkV7!!xBtT*t40D!6Jn39gE>1xQyfT{ABGLNbAYFoF#GXek>
zWo&G0SYBs<{jp5SYWToY0zgkskJ#ScPP!-P;oG&i!*c=v#%!z=OQt8-89wl&000SC
zD|XYKfF-e5muzSFz_S7X7H_Yvu4;?9)xg#8F>Ki}=Bs#G0KhG7a65x|5)eLyE8Gx7
z-PaC0F92Xz!Hqps2?&34b5pw~g}RSjumFiFK@a~fh8-g;z<@p+;igY_al(xS3sArx
zYq;$hWT-#83s``|umFc)0S?0g9EJrrjGhf{-fgP@zu(`^0up2F0aaC1y~xfM0eBbz
z9r&%W5yp%`z+aV>m7U1Wl7Ng)kKf45&(ANV9`K87h#z4RA1#|eAn-aTC+8`$lO$iA
zpB_^7m=5|qNkAj~5T6*xOfG}LprCW+A~KWNSu1&v{F0KAE|Tz@E`f-m%Q4!pgGYL4
zPf%)ZZhli(ScnsF0loiR%`=&LAfE{Iw4$Qod24Iy8(3Dq0bU20G&ME-URGB25?Rp~
zwgA~FStebN3JMBJ=+#$TT>Ol#ihgKmY5BFSt?eE0H}O%vdI|kAzeg5zb#-e+MMYmD
zBb+mlnUbNUg2}Ah+}sL!^$`I&$@Ei$-;|e^zn~uS+>6k+`~@<gEC!GXvXL2O$;@mm
zToGmG<>i%UXJ^;Ydq2@g;CWeI1{wH~39_O0*%?+I-j<+X6({99qL>=|l8irrb&v7{
z86XRp39_;Mn;)yt2(E82&Y@8+gA9<xy#&w2#l^+N#l@8#^)K-9QNoGZYn%W8002ov
JPDHLkV1hq&zH|Tp

diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index cc277879aea4018e1b4db62c9136400d7138407a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3937
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

diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 21fb4d8877c7d094b0e1418773e995f646bed83b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2414
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
N-FZi=DofwQzW^6@itzvd

diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index c37459a206501e30d7909f1fc6d93d46322d24f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6351
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
R?L`0p002ovPDHLkV1meCXfFT&

diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index c017209a32461471eeb89f5342a768b229af6976..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3156
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

diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 4a51cd7f0d0c795d03d58663e172a2d8207ea4f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8936
zcmZ8{by$;s6z>AYXht`qmF|wwAq@&hBN9pskdoTyE|riL1QdP<qI8S~X#_#Kq(oX8
zcIS=fx%cjQw)c;n?>XoFe9!lD;(g<d475mz7>NJ?0I80)x(V)z`S*oFaK9!C?gRh;
z$0r?i6|+FwKQ_cjYxAHb1^1!U*-U|-nN|I|{C}z+&As9N?Z69}uccxl0#YuZlArhc
z-NwCg)6K2_p5sgpe=Vj^77g$ye(hFlWU@QUL%%LV_Qe3i{);BYg;F^e6%@?{d2n`y
z-M_<LZSUE*1$>=cYPrUWFINe=jVYez9msECvA+9FXw=*P_cMq0hp6ifleA|mkwx3f
zztfk9_E@n-0ZGX*%eNcwKcAltl`)hG*2~UxN~*&zED^oMQW{dv)cZUBDA$lW*);h)
z{X0Hx^u*52PX1PTX?a;$MnvRL_v$BOS8|f%1w&YDN9XdI{DsiBnjt^Y7F#}|ukS2g
zzGw(%&(!8}rV5&e{)P|`G)!(Oo?d!)(QPmH$4@PnjD3%?qa39Yq7b4Kf@P50Fe!H*
z97<ozf4^B=zeoI(tn^!-<PX>!(xXMm@rOWhS!SJ$Tbj%3iLuH|VY?-rjh39a3#qFc
zlGXXBtsIQ%_8_D>`uW;ip^6REtLP_3g52C+DfKExBVS3E(*E*W-?RknGup1usP!nj
zMhX*TyrxH*Zx88(jZjU8OBmaXNVN;tPmSe(vlZVjpru^k{Np1x=Zg_H&dFhpcQ#sh
z&9R3Rt1d$7V8l0v5HW9+yV?Ou>H$BJVi~_0Yzn%0oprxcadl}p*smr0>v04BEQ>Zl
z0#sr!+CoJ=h+x&b%gbh9BTau`|M)tii$X(6Wu*Y=b%1Gm-07#8Tk)oFaH>#>LyakY
zQ|KxriqMg=kHMi$_u|NYl=8;yj`jQsx*VMQlV_LpO-_^EiTOA*P|@#(7h-}g)k!+N
z=XJYqPXELo!4v}Wh^S{MS)2-SHjvV~17ow~t_0PiN@#&1%~{+#b)6L56*<ZCkWOE@
zN8@|xSohbJ;t~=PS#o~ltGTo=uDUh(^D>K-;4Fbxm-1hx|8PYGO{VNJ1}$@?`6kg-
zAa2T&Qv5W7?}p*(+>yQZ4I`#eiklI+kRetH*8Eb_>Z0`LRDKIonp(|%)m`|OQHOZ9
zHzUqW&qG#7nIw0~OV7TC3~tNhti8Di>O!VYdh~l->$-X6lj^$i90dmlGeJx$3p>Q+
zU?mos{d`0bKQmp|ug5n%LyM&@rJhZd8@mzv4TwK-*@?4rqOVTB*<<+9b{aVfF|{vS
z*5NcF_Um#<CiAvBG^S=)=yU$DUAIl#pk%`T&a&h#w_<gSF~4YkbgJ9^q;8w4q1`06
z@x3_NzynjY@Sa^fzW`mlc|k^I=9`Kt7K<F&ud2g&2DRu!#v3b5g6)a}mh4cp#+T=d
zS4M*5b(6XBI)DyQMk}q*RP+<D7Id5c3M<smZZ_1J1Zl}&JPy@V`(1GmT6$ga>C?gO
zRO~285y!wpY4M{f3uCp7WfzI6Ham?~o6_q9^+P}}{#WPak55J2;CTrm$RK_&qv`it
zrN|ti_u=83>DubUN{^U4c6tRluwu`?lsB<YFQ1DJ3&2J|W2dL5B=1t2K1r(eWE%LI
zsQt%%^O}i5E6PdYV^<dPDntFylyT)p$tOwuw_;m0_irLK6LTxlZ6%oWj2}_JTD8SH
zM;5R&p>bJBH-YL$q~H(W;&G$5JNNBmLLWpf2E8Q=Ti!tRCLc>5fj_9&$`@^X;?mYb
zwl_4K(;|!3Ku_3}CA%1(qlY{NG=fys0Rd1^m0xifcsQG6m#=eVAdB<@QqAXknZCu&
z@I^j{mrSTZ_4rA=x}&U&@fk<W@s09k%%KLR#sAOT1{zF|!E0Ec=egMYP{WAXx+oB?
zQ$7CuD3G~dCi6fJT`ISuS-I2KAw;?|d9R@R<HO2~{uGu6DM?9O!nUp13Vyq0K4S%n
z4B_SXpeaySqma*SZEd3)y0SUU<>;bw<;%X%)id|m8up;Wl}?FEd|rb*?fr!&aajq8
z*GDWGOPD6T!S@fclqgo()F3V)UOTVwwt1GjrIViejD0$E+#tA&jg8exw*v&Y4rK~5
zESqi+*owAmdpl&Tp*zH7y9@6mITwR+y}uVM&w~q>Uj%<%9nKLSYzsbj4zWvT3p}8(
zW{+F(NA{f`p;W?VKV3L0c2xS_Ui}@sy*^KU5C(LN_%q*7DKFu@(&UNP+p)j1V@bGw
z@d%G{z{p;lt_64rQ9L;B{v-Qh+vrgPFB1h70?$7vp>?$fEI}MnSzB8hb8llvt#PGA
zcDv(-<kQw*_<FK5Pb#x)hV&(VHsKTtA5jd9yl4H$Fx#53S44RJ^VASsH71OFy-eZH
zdE^Z;n25UrAPNLM@rxyj?E!BPakn%#*P|Z{-#^H8_k4H1D&2F9Yx#A#R(PW#6~m<m
zTt15WLnw=eZQ9g!4pJs5EAWDYHO*~Tw;3J&ipjf4b_@XYVpqZjBJ@zbVm6`$6g@Oo
z)+@(Xr~n&w&fmV3-c$u6=bY1)B>(evFf1l8YKScx(z@6}z@Mq{*H24?b>aU0zJ}Qj
z+o67-|7k;mv>xq?`JO0t%VM@z)nXpxa3u!{fJ_>^Zd${sa+zNeu^jiHqUwXv4h+y-
z-IM9FK1qrHt#&szj``KksF?GY!7I4i3CJ<q8sw`PO1%!YWG9QWOHk){p8dRFkVq$m
zwgd~db~9{Nnz0KHJ>H%uF_k)=mkGW4(ySKUO&B-Wdq?R#!hmFWFL`#Wa%YwF?WNG6
zMnU*;d#I_>@jOPa#$#T}FZMVJuSbH|-ou_>W-FS;aqGifUteF2S<||;<yi6^GMF{w
zuruS8-Qix{m>fsV?+^5J8MLAA>g&%Kk*Ts4j8BwFO0fPV83l~DGyhp-DTG|qxC{uV
z`GH#66ZS-0(4(WH%8+wcscg>^pO3=~w;w>h6^@2J+=_25ftPJ7XHH;85MJLd*{^6=
z0e<`Z!h$s^8ALao=J;xxyrDmlvxBrzP2PWRprWIT<%a;0PR1f3DNX!}AhMJ1<8X<!
z?AXN}G_Y;sB$Xh}ex}-{*)dO^i#BjF4!_KkcBK{jMrL-P;x(^kc&S|5-kDQm6;%ba
zFLoHDsHiyTD$z`8o%e0pVX(tipGJ1z&2bOTCP7eG2kzv+?0ISq9;_xfRFRpITv2$#
z(1%l1#Bm3PO0$088^>o=Q%z<_-SmSeNw(2Fc#QO^q?RmYmMf~k!SV)Kxu26LLjJ4V
zUSnJP_FCa2GCf=@z|TMu4qB8-r_#JA&M_ns7ObY7={Y~x-}mGI=B4R2nhno1o-YN9
zYs<2-hMpSp-qj45=<(&nZr`U@`u^hwEkv4ElCuZYm=N+Q--M7*`x_x2ARMC?ugQ_#
z(m66n5|e&~S2hvdG4SS4{m{z20uX{v7{kWnIVutO*!tB(VHs0v_wSj;M!JaQK@<^2
zIn7=sUHgWIo}?P2#XCf*it?7ExyuSU`pl(V1Uh69>LN|hEC~mvh?yro8~qYtQ&?Ib
zd-?7u-3^f$pgpoqIc}k-|Jk!=n?!bkWOSZucWK|YAOHGu2f%sN`65!ac>M3mGvh_L
z(BAIS(o(~*hVYvwXIePTblHhnD-gdIFIriw1<L?VaybTcb7ORZR_6ppzzfRJ$dg(N
z5-ZMxEK;%0${ye>!<VMO3P3Bwl3IQq2Lpjiq8Ks#{ut9Q$6tF`FdqP`A`{Q@ZWS3w
zAY+x(rZQS>*!6<4tL4)1seTv&f5pnWXQ>DmgsG^y;YGqf6mLj1AC}f|hNOS?4+qeo
zuz+)y6(6}%8E=0w--g5gV0&0QeKfx9^T)8ee>e!{$rQD;T)RJi{+zr~zE}p;p+M?&
z!fHQLp7*^FM1xXhU(n;Cq*E&%&&4dp_W*rv7EW=@e8*r{x_29nvu{|#wBerU>gClz
zxA2sVj+y`-OGH=k5tnJ#aXtk6^Ff*28vt6>=86a)G82s@eoT(ULzVCAXxRNqtN?sQ
z;2XWnMk8HZwy1o!MtdKe5zzwLWk_8<n|9Jr0dN4=brVJno-5Cfk5d3+87^}!u++wO
z5Ag3G(OK7^Y|IeIqCF(YXT2|ZaNe^;P<W+^tEI{(3Ms*w+A%vhdCZ4wOhe4do+c={
z;4*ZnU4R)O1N`5rI_KmQ)efA^U(vz)O}r)l7E$wev9PeTU>w}n3CguhL)@u=X2vSv
zUD4)vmq1}+z)av?ZNFHxGAq*1-|`nU1)P^(ywU!|#r2^I2!}zTN}>4ucVTRF*06nY
z9J<0>Gzoe}GR$}MGQ-xRh5)qLibx9%n&qa$1Skqfg9>NQfx9QCXqFIkI&Avbf-tN^
zA%t3m;SBhuMpfb%dLv*U!Qmqrnk(fV2L%p7p{>7pHFe<EBB?~zj6@HCNu)HW05~YF
z*KwJhOxQ_i>kUyfz*$04Qqss_S*@54Ra*=?B*Q#xROLdk%}h^!jT}NN;Gr7Y5u)OA
zb8~W6mr!*Y%<Mla9Duc>9PS610{B@cgi#uRhk;*`h(c_Mz6zUF<KmX7YdTONECsIy
zWWD(%%oCJG?Rt;;v8L|TdrMbtTo`yk&0AVp!WU;}8yT&Iv;jC2cceQi0evw<7<r0n
z9?JMECPu~|=%FA&6gKdY1Y=t!k(?LpW5R#BV~9_!-U6jiLzh($dExf5G0Rot1&!G_
ze%-h(?kF#dIHMdAfMMj;WjXe=jUL{M(|O_ua2EbbD?|rhM9K`Xgl0z(X99d)3a#k+
zqn%#?9+{{J=SDvQnE~!%RzdmYoj21fV&uC`|BOrFck^FeUrRzqfqZ}i3<YNB@87@D
z5ko;E01i}reSH|;Hl1_v8(iRaI6zm-H$bajwr}v@LPr12$Or)I^1r?Any#*{E`%MK
z<CZodH~<Q!I?;+x{`a3Nd|uHqHda<GB-W!30O+aB;-4p5V_wBw1sSS;h~M!4a|{Zn
zO}up-&6CYv@qzoP>yCnutTF6U#tx|uiqE3I(cqXytzJ#5WWtLoHcKR{wnI=D2zRac
z^ZWOA0!JSlFie;MFDQV#XG%1yb0-fEuJvyH#o`=}jtq<K|JSyHac)sEkj0Xtx`%(|
zrRoOYp{Q23eN_w%$AX)1GXDY$Oo74tI#IzgFgpuvaic0P{9Z{eE-w0rRI?_EL2%##
zh*u~_@t=8k^a7hCr>Cb+Fm9V?jhoP->T0s@nvxomxyfDps(3Q$-;^w#DXi3doUSx?
zdHoPa(S0#UiF9r2XKrpyVCGE*xH3@S@fT?NNl0s00g>Q!05}&T8gVueu@3B~S({aD
zsd5B^Fz!#NLKMu>08X$y{I$d17zftj6H36lrvl8woPX6T#><Uex$(PfqelTxx~=hY
zmBW<^2x6`|=ixq-06p4n3WBNgvoob(x{B=X+EyYOgnte8fH{?wEVjd7!NZwss};%<
zqwGJ5&mr&*we}<gMuUhi1`UwG04W;oI2vQa(bzwkO@SEi)7BasIeNAayw@d+YWt^4
zL^_{@qPO}05|Gm^D;yD@^BnlKv@92LF<A3|M4-}cn7&u`R-HBmTU)IV_$Cxpvh_Ba
zn2x97u&@Y88ufsf1|`38hX7n8^*WZvUCczZTna_R%YGO~@KH$=)|BEHg2GO39Yv{%
zze09|t;Oe{jJGE@BKD<YD9SS}a?Bvg?-XXNOzmGk*i3X|Hd3tsEI3?Y|NHMhEOb;X
zAbn(*AD?g2DPnUZ*Id6aQBF=yY63sz(s38^2FizP40zp&SlwJ*XNgBY1CB=l@v=E^
zGLC!96;`@;9eqG<+>vFW032fvv6YpTpTI7}BRCN>68=j~5H2BT(|mf;m`zml!U*W3
z3bGFqoJ>c2!xFf3F1CX0MG2!StD80%_da-T@9nkDH&)>Ep@`sAUA^iY>F%DMns*%z
zxQGv=fbe622r!P6P{Tq)&B8?QNulIB<=);GwD(BO068LO*qeVf7!UHz6Z0c1F(qI)
z9t`@x`>dz}t}h;Y+4Yu85NHM{Vc#)qR8H64knxu2vBq~HKEw8Mk!25>>Qdn|g!j@-
zzi=fi0@0J|gm>M#xw!=i%Y3u$Wqj0m*OA=={LDID6L_>X9U2-+bN++=69Qj^aqVs#
zbK~n1ZVOH^8BPGuUt%L}!@oPZ+?y;8T({-_;L%~dP@U%JQw(Y(8N6G$Tuw<zi3Q(3
zCtwzIC2*B`P_E`OR*?MX{YbIVwt;`-3uE_$f1<0l0RaJ@KYZBv)TzI=?TCCME5ACy
zmT3@6$t>;qqsp>v0}{$cH)Co4tQe%Nq8Tm_rcpBC;*0|d&l6&Di6wlmyr{QO^gQmS
zQJeqLnr*`p=Pa3&*HT`{*-sa7?Hw%=a&q4DgXKc&ug@O#g&J^21w+HEtgNs!c}|{=
z=PnZqY_(sQ)L~K~Rb^LKSELfeHwpYD9Q0r{HMKz&dH)MrJWftdvdfuIc7@)lrliP}
z$Yr|S-Q6Xq!RJI<vvVzhd{Uy)`fOFVKSzN#9TxH3lvMXVKfx8GgH*f*P837rn1S%q
z?TL)k8x)dEUitpTtytqg9-ee!=54KD+r2)tW?ET+;6|h@v7;PuQfg<XN<YhSE);PW
zdVMB)6dP*z9+h-wV`D>y%MzXhbc44a2&8jLH2lJQCKDaeW+DsP(C-4sB$^NW-Le1<
zjNS@e0CXe#u#+IaE@LnFK7Q15?a-L+)lV>jl3@+J4h_qjZ_YbyDpAkx?e^7v_i$=C
zq9!vpa6vPpvsX3-Uok|TP$KTSW66WN{=f#dQ>S>7?*bwtdo-XJk}zHkK+OvgX6^ju
zdG)wS0i?AH`UZsw#C4j3;x4036l25`4K9n#ehhxXG{X~xAy_Q;es6Z958hR2@|~lz
zh(hY?*u+>@+QznqhMAvqQ=hIQkGq!If?t&z<bQ+P-)HCS$QmF=S?yihy_>)aV-(lm
zWF1}K4odMm>UBi+T2*+`<U%W7@%d3FQkqS`Mxei9aouPzj|gqy@&iwD`{cV+h)IcZ
zBLP`N;w##lIp=DUF&AuQTT{~|d4<nQe<L7D9uM~VB@abIKR@sjA?L|S3vSaFSD1t0
z+M%?ezXBA70u4|U$-R!}PiWIvUY_aS>w_#5oAlyYY^WA2^M5d4q5wP!#T9+*$YfcU
zgX=;uptgwnD5$u(xtSE#T8u^BG;39ez(opn_tMPkr5l0Ppi9vje}Df1s~Y>xk(IZS
zSB5VSpXcUK`YmxkdiZc!vk-PXri3c@g`A>uB5-~C)@Z&dEmfdfa3oW<T2|T_mo(GX
zt-AAYHriwCc>j}*VW_jXI4y!Y#ScCH#qImc0mI-7u;U_!G5l=rr}&O2ItynO-6TGY
zJ}~VOY&~V%i0ucC>Ng#Dy&VQ+z#hZv5T>TzrF^1=22P(YXFG=2_tNi=JH=z3&ojAa
zSCjW<($NarCUsYH42xD>z0E1ifC8kR*`QF0sz$CZxRQ;oQI(N`jw}u!u2Q?mo`xMS
zRx9ue1~e*B0IUmt{P=+dl!HF#d#%jA-n{J>&%v*uj8#+}81Wx}F-@1+-!U}L^}@p*
zgwQjp!q9K@6W_M(o&knwc(>T%)x)%{8S!wd!Jja-t+pYGKY8j<by{&XX%W=-B#F%L
zrEBNSRE_r-Re4Zl{5f(gu(N*}8up-ij1?I#gAZJ>r2cub9zS8HH~G#d@1^2H8NEVL
zpJ*j0_j;MkyRk+$4bR5)6nUZ)LZ^*$u}k3hzl4xTHiFpf2ebPmp8C5fW2%CjaI(@e
zelrCX-8-Uk&1ssqaH5|Yd`cZzi>wH1HrvClM_a6$MrpFY;xW>>IY7}ABTKI8@z$V|
zAAWv*`L6>p?cN&uY5n}Z`Gl<nTXfLNOVqqLu9OayZ0u(4DoI&+?E+eMhdg~-Z3JFK
zL@7O?Cg0<E+96=Yy$3Pch?PHR6%WGgBT3i%hO+;jh0mY4uMErQlmZ>tn+)y;chq?f
z`vWB@Ygd6Bha=9O)kf>5JKt*qN^;A-cJ!X|NV`i%aVWblHcS5212k-{bVjx#gJqO@
zG^LrnF3wkod^HPBkH7qWlDk7BYgvr=7TZnQD=#Of6dju*J3CPn2tvt!2|nLX$_8*M
z4|F(m$0QvDQjn2ToYsH+8p_J-Q2j+L0K-1kqExT*NV{Ig{s`30Oe_9!pg$POv7#YH
z(}{<+DJ?fFWc_s(7`j2gwN91V4?De+_I`5Tx5xUBZ_v3R{_PHt!vx6XYxz1lN8Cjy
zRkLIn@$v;Ca*Yto--nD9p<<RnVosDgfV}J9mzM5W)_Qc2-G|qm48EO1<{(r&)TzIM
zf&7J_MU6cRzJjtDjGBO=vrIoX<KGys??52|76{xRRlrf^Egv$X5j|mdbC<DyDv<f}
z2z3JGUcATZ^4qo%x%&IaMBJ7WxrF#|&kNc7U3MyAAiTb;3{u|AzAee-efoa6aAY_T
zkz(Oh%(P!NcCpr*C_Sl%e57F{n)YX8Z2HF!PY6LAF*KwWN#u#*Tssez`;}7}&(HN6
z40W%mfl<S7BkNWM4x@mIJ$BEr6Nzgtm1XhENc51(r<{ZH+ihWINbhIu7$#2|*wpm&
zB2j?0deP6~W8nGwG;EdVamhjYJ|3M@?NEctLEvU4Ll=ZM4p4#s{hNL1r)Lt(E_Xz=
ztJlXa6cpBs6&5KO79He(+s7_8o_TU0zEvhOaiK%ia1{VktK;5A{GXVIfoy$5pXvr^
zh@#si1NIk4x1T6TB`R&T(;Z(ct-q?w*)bOImiNjhELC3_#>4TswTkI4V}Y~*2P=Ot
ze=9NTWqy8#-rXmYLfhE(Uuc7Y)OG>_zL*=w4A!q2X(@z<>Xuek^W_t$=ESK0`c;>p
zBboKv?FXm#$&tul_v0*$W^p@TDs&GXN5uOn)WOc~?n}$aCti^@th}=tcDS^DGBPs4
zhG2UqoQ$FiwLaRQtJ8p^y+zXGt|wqBYHHoK&&H`J>9+l!d3Bzi%g!o3w6hD(N-Mmk
z4CMoU%2*bW7s;f)PpioR&Hndf=`S^1$n=Z&7gF~GhmF~U$m_*lb%eJzH(yOJcu@fA
z+lz#`r|<t{<?e8(hdR{`%Q~ovsZSNPb=n_xPmK#7Wj<3-FRoJ|gqJAYUUOW%tE)TV
z&RgiaYsYH|Ok)X+YgaFPr2etaNL&NX-#1GaAr7DCR>Ongs(4rV5y-NnGdK@XUe`&D
zq5m5zx?4g%H$UH@6?&|-&2$Por>U118sc|~HXl?@!Nv0dg_OoBiT0MCUX)PIW5P&k
zczA|pK~|7d8ti__cWNqvxh&;;Da~BY@%Idurc-o7O@?X92W#!Bg~bQsv71Y*+*lds
z1b{rKR`8LSx{7MH2EblwR;8}<)uHk)E;+x%1Y#cLh=s&#@1QB{W>++EKnb~%k?Jy%
zO{a_?G*-#%c*~6gB(4?(AZjmNr-U^p|14q~%b1Ki&1(uQ6YuJ=AO2{NmRSG3bF-<e
ztn69@%v7RelDBqTlsaziT&6W>S5!PPj-sTqudHfR{}0IdAS%7$UyZ6@&Y0M1t1d^D
zA46uwzCp$l+Prw^MdoA2m34x~C#G#(qW`NBrqCJPPLV|r%5~T7{4&Ab-x}pc)8te-
zo#ucUh@1uFN5DR$F1%AFiB=_lW%U9r{iE2|Pm><Zb3_ox1fC<~75`pz4E?%e@I|me
zG{WZM$~E{Dcm)cLXg3ZIryTZ==X&^T6yjjeRvgL9E@1h2qZ(J5_G?4C#W;~$a;ga4
zdG!hjCr+igq??=m52VX{JzDcVOx-imTA@1LABV&Tc~mi{I1Q9cQP6w^MR`sd2Zktw
zc$YbHoASoOAYV>ipWm2-XXo;+wz;4Oj+W}$l;pV+^HlQ=I2;z5vj_?GotmNEqRyFj
z2Xs)8n{ZyE9%|{0h|;2|*zBp*`r^t?Zm9(d)p)>`oUfp_AO6fRMBOK#FJ<En`2w7a
znA_OeSZ7-aQPK=yS6X0ke~QR`=P}Xe`us~%$`!Ym#1{r8_%u%rhd`_SGct$?e|j9b
zCLtQsB#jr@84iu@UM~Nz6l4+Uf{*b|S0@RhjncmYE*U3IuzHfg!lUL^2m}QMu~AaB
zapYM9VM=op9`RBd^SUwp23~xZ59~MH?OQYgF^|{4u!uMe40Ki@Eg^9utAA-%3Of|g
zRONJqI5{6i!`-{Yck<I&&!cSKS_pTxtrZ;A`+Y&Hgv8#s@_ULOolIobx0IB$#}4O_
zig0t1#?olVlOuoViKOkC#lt2UNN;dM{42?g^Y&M9M`>{?&Jgytq<8gjU3Q|AIn@gw
zKPD@E34W{gBK6>{a`>G-WG6ogNX4eqo^;_V&aN~^>5))BO_HiL;-BcwK9B?#1s%_f
zE^(Mb0no|W*$b%zx^{$6S8C0rfpe^T1ZKA`SHyi*-9Pe{1xz;a>#=84|GiX1;qEo%
zZb~qGvLk<g$M3s|%6~c`E(c@{(H9q+afQhjx?$w=fvPCBL<HI8?|KB^`&hW)LW!|s
z#mA42lexo>Un#3Q$$?D#{QcYE;&@P(gb4JAW6Cu!;%(Z0j6dzMZLhnZmf?dwbD}g@
zjIt~Q&Op1GB{#5-zeCNo6wS^heb{JsdPh3jN=V0PU8%k#Q+DVH<Wj8kb9g1|L1>XZ
ziW!!`9;9`tWu5cS2n&b`E@^mlSLmWo%W)~3RRtd3ki9-A34=Hj$AP(`5eN&`UK<zi
z$<~DxV7dF;IFo{92J@98eSjS4F$MH1mRpQzHfFij?>bSmPZZN8FCKDD4etBDtPc;<
zM&J!)C`r2DZ#3Z2mLtk=uTe*xOWav|i~`OKJD@@49tzFl7$IOBdgJg`aKGPGk1Lef
zszFq4{eu+8fg9t0g(YK!6TIraDcIz~e4f0bj%yg~2KNm9&Cyf7-@f-=eGB8Q1_s1b
zU+PBgIa3f%%44+_FIn{_*I7p<Y$tOl7x<2bru5k1k*iYt_5_?ab`<K)5P=)GNY5+%
z*;9NK8P%1E>8LbgKp_(sOO&?rSV3Ds#GjcTQ&S77v)YYs(BaDw%d1|84HsnL<~ROS
zJI@*Y5Ob7KS}exqQw)CniYvBA!$#?al6hAzXTR4MPdz#Cd><if=V`&3I*m{$$to`a
zZl1<2j%UrI0N}6^xr%>{f_BmBv?HxWU&{(|LtP$#?5JikVM|;Jy9sh7`;7#-r;X;m
zUuLQdqTkL}*(U&rm5{KS3$U^!9{P#miZ1;5B%?NrTnG}On+D?)i6bmz;uISoVzc(I
ze)}5+`soSB1RUDDMt?Tq!M$666tt$A(PS~Ao6>=%HoqIKkl*j*X-heK#*nE`f`oB7
zQ>YA(pp)&9{0N0cdU`(<%_I!mStO0)zL+2fB~a6yYV+XV-M2H5lzvmqxyOWy0i?b)
zlV2Ll7AmZyxLaLnJ~Xc<+DNGC45c9T#Gj0T!!>R2GU?GOdP#lo`?Tu_3s?f6M9Th7
z?~ZJ_Gr$<~|LIvuKGc2rl`to*pEfG@p2%)Q5(gP><%c*t&M(7o&$MOYCLqJadu!|N
z<UP+Q^T|s6gr@i|+L$;sKo=3hUOGGcNtpS!y7+1*^OL9?u3;WBCRJx?llhvVhh21o
acWezbGgnr%2mjt+0qAHLs8_4nNBj?pjJu@(

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e8da91..0f994ed 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Gost"
         tools:targetApi="31">
diff --git a/app/src/main/java/run/evan/gost/GostService.java b/app/src/main/java/run/evan/gost/GostService.java
index 738b660..5f9a245 100644
--- a/app/src/main/java/run/evan/gost/GostService.java
+++ b/app/src/main/java/run/evan/gost/GostService.java
@@ -38,12 +38,15 @@ public class GostService extends Service {
             Channel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
             manager.createNotificationChannel(Channel);
         }
+
         Notification.Builder builder = new Notification.Builder(this);
         builder = builder.setContentTitle("GOST")
                 .setContentText(getResources().getString(R.string.service_text))
                 .setWhen(System.currentTimeMillis())
                 .setSmallIcon(R.mipmap.ic_launcher)
-                .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher));
+                .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher))
+                .setAutoCancel(false)
+                .setPriority(Notification.PRIORITY_HIGH);
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             builder = builder.setChannelId(CHANNEL_ID);
         }
diff --git a/app/src/main/java/run/evan/gost/MainActivity.java b/app/src/main/java/run/evan/gost/MainActivity.java
index 7169417..63c92b6 100644
--- a/app/src/main/java/run/evan/gost/MainActivity.java
+++ b/app/src/main/java/run/evan/gost/MainActivity.java
@@ -1,8 +1,8 @@
 package run.evan.gost;
 
 import android.Manifest;
+import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -14,40 +14,26 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.os.PowerManager;
 import android.provider.Settings;
+import android.text.Editable;
 import android.text.InputType;
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.EditText;
-import android.widget.Spinner;
 import android.widget.Toast;
 
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
-import java.security.Permissions;
 import java.util.Map;
 
-public class MainActivity extends AppCompatActivity {
+import run.evan.gost.databinding.ActivityMainBinding;
 
-    Button btnSave;
+public class MainActivity extends Activity {
 
-    Button btnDelete;
-
-    Button btnStart;
-
-    EditText textView1;
-
-    EditText configEditText;
+    private ActivityMainBinding binding;
 
     Process process;
 
@@ -57,8 +43,6 @@ public class MainActivity extends AppCompatActivity {
 
     ArrayAdapter<String> starAdapter;
 
-    Spinner sp;
-
     MyHandler handler = new MyHandler(this);
 
     Intent gostServiceIntent;
@@ -84,21 +68,26 @@ public class MainActivity extends AppCompatActivity {
             if (null != activity) {
                 switch (msg.what) {
                     case 1:
-                        activity.textView1.append(msg.obj.toString());
-                        activity.textView1.setSelection(activity.textView1.getText().length());
+                        int length = activity.binding.textView.getText().length();
+                        String s = activity.binding.textView.getText().toString();
+                        if (length > 5000) {
+                            activity.binding.textView.setText(s.substring(2500));
+                        }
+                        activity.binding.textView.append(msg.obj.toString());
+                        activity.binding.textView.setSelection(activity.binding.textView.getText().length());
                         break;
                     case 2:
-                        activity.btnStart.setText(R.string.btn_stop);
-                        activity.btnStart.setBackgroundTintList(ColorStateList.valueOf(-1499549));
+                        activity.binding.btnStart.setText(R.string.btn_stop);
+                        activity.binding.btnStart.setBackgroundTintList(ColorStateList.valueOf(-1499549));
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                             activity.getApplicationContext().startForegroundService(activity.gostServiceIntent);
-                        }else {
+                        } else {
                             activity.getApplicationContext().startService(activity.gostServiceIntent);
                         }
                         break;
                     case 3:
-                        activity.btnStart.setText(R.string.btn_start);
-                        activity.btnStart.setBackgroundTintList(ColorStateList.valueOf(-11751600));
+                        activity.binding.btnStart.setText(R.string.btn_start);
+                        activity.binding.btnStart.setBackgroundTintList(ColorStateList.valueOf(-11751600));
                         activity.getApplicationContext().stopService(activity.gostServiceIntent);
                     default:
                 }
@@ -110,15 +99,18 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        binding = ActivityMainBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
         gostServiceIntent = new Intent(MainActivity.this, GostService.class);
         appPreferences = getSharedPreferences("app", MODE_PRIVATE);
 
-        if (ContextCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
-                || ContextCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
-                || ContextCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS) != PackageManager.PERMISSION_GRANTED
+        if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
+                || checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
+                || checkSelfPermission(Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS) != PackageManager.PERMISSION_GRANTED
         ) {
-            ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS}, 10);
+            requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS}, 10);
         }
         // android 11  且 不是已经被拒绝
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !appPreferences.getBoolean("refuse", false)) {
@@ -130,40 +122,42 @@ public class MainActivity extends AppCompatActivity {
             }
         }
 
-        textView1 = findViewById(R.id.textView);
-        textView1.setMovementMethod(ScrollingMovementMethod.getInstance());
-        configEditText = findViewById(R.id.configEditText);
+        binding.textView.setMovementMethod(ScrollingMovementMethod.getInstance());
         configPreferences = getSharedPreferences("config", MODE_PRIVATE);
 
 
-        sp = findViewById(R.id.spinner);
         starAdapter = new ArrayAdapter<String>(this, R.layout.item_select);
         starAdapter.setDropDownViewResource(R.layout.item_dropdown);
-        sp.setAdapter(starAdapter);
+        binding.spinner.setAdapter(starAdapter);
+        binding.configEditText.setVisibility(View.GONE);
         reloadConfig();
         //给下拉框设置选择监听器，一旦用户选中某一项，就触发监听器的onItemSelected方法
-        sp.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                configEditText.setText(configPreferences.getString(adapterView.getSelectedItem().toString(), ""));
+                binding.configEditText.setText(configPreferences.getString(adapterView.getSelectedItem().toString(), ""));
             }
 
             @Override
             public void onNothingSelected(AdapterView<?> adapterView) {
-                configEditText.setText("");
+                binding.configEditText.setText("");
             }
         });
 
 
-        btnSave = findViewById(R.id.button1);
-        btnDelete = findViewById(R.id.button2);
-        btnStart = findViewById(R.id.button3);
         MainActivity mainActivity = this;
-        btnSave.setOnClickListener(new View.OnClickListener() {
+        binding.btnSave.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
 
-                String config = configEditText.getText().toString();
+                int visibility = binding.configEditText.getVisibility();
+                if (visibility == View.GONE) {
+                    binding.configEditText.setVisibility(View.VISIBLE);
+                    binding.btnSave.setText(R.string.btn_save);
+                    return;
+                }
+
+                String config = binding.configEditText.getText().toString();
                 if ("".contains(config)) {
                     Toast.makeText(getApplicationContext(), R.string.toast_tip_config_empty, Toast.LENGTH_LONG).show();
                     return;
@@ -173,7 +167,7 @@ public class MainActivity extends AppCompatActivity {
                 builder.setTitle(R.string.title_config_box);
                 final EditText input = new EditText(mainActivity);
                 input.setInputType(InputType.TYPE_CLASS_TEXT);
-                Object selectedItem = sp.getSelectedItem();
+                Object selectedItem = binding.spinner.getSelectedItem();
                 input.setText(selectedItem == null ? "" : selectedItem.toString());
                 builder.setView(input);
 
@@ -189,12 +183,15 @@ public class MainActivity extends AppCompatActivity {
                         edit.putString(configName, config);
                         edit.apply();
                         reloadConfig();
+                        binding.btnSave.setText(R.string.btn_edit);
+                        binding.configEditText.setVisibility(View.GONE);
                     }
                 });
                 builder.setNegativeButton(R.string.title_btn_cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         dialog.cancel();
+                        binding.configEditText.setVisibility(View.GONE);
                     }
                 });
 
@@ -204,11 +201,11 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        btnDelete.setOnClickListener(new View.OnClickListener() {
+        binding.btnDelete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
 
-                if (null == sp.getSelectedItem()) {
+                if (null == binding.spinner.getSelectedItem()) {
                     Toast.makeText(getApplicationContext(), R.string.tip_config_not_selected, Toast.LENGTH_LONG).show();
                     return;
                 }
@@ -218,7 +215,7 @@ public class MainActivity extends AppCompatActivity {
                 builder.setPositiveButton(R.string.title_yes, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        String key = sp.getSelectedItem().toString();
+                        String key = binding.spinner.getSelectedItem().toString();
                         SharedPreferences.Editor edit = configPreferences.edit();
                         edit.remove(key);
                         edit.apply();
@@ -236,14 +233,14 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        btnStart.setOnClickListener(new View.OnClickListener() {
+        binding.btnStart.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 String basedir = getApplication().getApplicationInfo().nativeLibraryDir;
-                String config = configEditText.getText().toString();
+                String config = binding.configEditText.getText().toString();
 
-                if (null != sp.getSelectedItem()) {
-                    String key = sp.getSelectedItem().toString();
+                if (null != binding.spinner.getSelectedItem()) {
+                    String key = binding.spinner.getSelectedItem().toString();
                     appPreferences.edit().putString("lastConfig", key).apply();
                 }
 
@@ -350,7 +347,7 @@ public class MainActivity extends AppCompatActivity {
         for (String s : all.keySet()) {
             starAdapter.add(s);
             if (s.equals(lastConfig)) {
-                sp.setSelection(count);
+                binding.spinner.setSelection(count);
                 lastValid = true;
             }
             count++;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3f2a6fe..8bee1c4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,65 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    android:layout_height="match_parent">
+
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         android:layout_marginTop="10dp"
-        tools:layout_editor_absoluteX="1dp"
-        tools:layout_editor_absoluteY="1dp">
+        android:layout_marginRight="10dp"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/textTipConfig"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:text="@string/text_tip_config" />
+            android:text="@string/text_tip_config"
+            android:textSize="18sp" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:orientation="horizontal">
         <Spinner
             android:id="@+id/spinner"
-            android:layout_width="match_parent"
+            android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:spinnerMode="dropdown" />
 
+        <Button
+            android:id="@+id/btnSave"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/btn_edit"
+            android:textAllCaps="false" />
+
+        <Button
+            android:id="@+id/btnDelete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/btn_del"
+            android:textAllCaps="false" />
+    </LinearLayout>
+
         <EditText
             android:id="@+id/configEditText"
             android:layout_width="match_parent"
             android:layout_height="120dp"
             android:ems="10"
             android:gravity="start|top"
-            android:scrollbars="vertical"
-            android:inputType="textMultiLine" />
+            android:inputType="textMultiLine"
+            android:scrollbars="vertical" />
 
         <Button
-            android:id="@+id/button1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAllCaps="false"
-            android:text="@string/btn_save" />
-
-        <Button
-            android:id="@+id/button2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/btn_del"
-            android:textAllCaps="false" />
-
-        <Button
-            android:id="@+id/button3"
+            android:id="@+id/btnStart"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:backgroundTint="#4CAF50"
-            android:textColor="#FFFFFF"
             android:text="@string/btn_start"
-            android:textAllCaps="false" />
+            android:textAllCaps="false"
+            android:textColor="#FFFFFF" />
 
         <EditText
             android:id="@+id/textView"
@@ -69,7 +72,8 @@
             android:gravity="start|top"
             android:inputType="textMultiLine"
             android:scrollbars="vertical"
-            android:textSize="10sp" />
+            android:textSize="10dp" />
 
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 93ec365..7f58af5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -16,4 +16,5 @@
     <string name="title_no">否</string>
     <string name="tip_config_not_selected">未选择配置</string>
     <string name="service_text">GOST运行中</string>
+    <string name="btn_edit">编辑</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ca77d5..be466ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,4 +15,5 @@
     <string name="title_no">No</string>
     <string name="tip_config_not_selected">No config selected</string>
     <string name="service_text">GOST is running</string>
+    <string name="btn_edit">Edit</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2a3aeef..287d4f3 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Gost" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimary</item>
-        <item name="colorAccent">@color/colorAccent</item>
+    <style name="Theme.Gost" parent="@android:style/Theme.DeviceDefault.Light">
+        <item name="android:colorAccent">@color/colorAccent</item>
     </style>
 </resources>
\ No newline at end of file