From f592cb40f53b100fd71f8b0374e5d2803bf5817d Mon Sep 17 00:00:00 2001 From: Cuynu Date: Wed, 25 Sep 2024 16:18:32 +0000 Subject: [PATCH 1/5] enable some preferences by default and termux to applist --- app/src/main/java/net/typeblog/socks/util/Profile.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/typeblog/socks/util/Profile.java b/app/src/main/java/net/typeblog/socks/util/Profile.java index 2f83e45..4a04911 100644 --- a/app/src/main/java/net/typeblog/socks/util/Profile.java +++ b/app/src/main/java/net/typeblog/socks/util/Profile.java @@ -84,7 +84,7 @@ public class Profile { } public boolean isPerApp() { - return mPref.getBoolean(key("perapp"), false); + return mPref.getBoolean(key("perapp"), true); } public void setIsPerApp(boolean is) { @@ -92,7 +92,7 @@ public class Profile { } public boolean isBypassApp() { - return mPref.getBoolean(key("appbypass"), false); + return mPref.getBoolean(key("appbypass"), true); } public void setIsBypassApp(boolean is) { @@ -100,7 +100,7 @@ public class Profile { } public String getAppList() { - return mPref.getString(key("applist"), ""); + return mPref.getString(key("applist"), "com.termux"); } public void setAppList(String list) { @@ -116,7 +116,7 @@ public class Profile { } public boolean hasUDP() { - return mPref.getBoolean(key("udp"), false); + return mPref.getBoolean(key("udp"), true); } public void setHasUDP(boolean has) { From e73cf265a5a77b3c8c68c5ff9cc0ea80ae59688b Mon Sep 17 00:00:00 2001 From: cuynu Date: Thu, 26 Sep 2024 00:28:55 +0700 Subject: [PATCH 2/5] request VpnService on first startup --- app/src/main/java/net/typeblog/socks/MainActivity.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/net/typeblog/socks/MainActivity.java b/app/src/main/java/net/typeblog/socks/MainActivity.java index 2821d1f..8aabae4 100644 --- a/app/src/main/java/net/typeblog/socks/MainActivity.java +++ b/app/src/main/java/net/typeblog/socks/MainActivity.java @@ -1,6 +1,8 @@ package net.typeblog.socks; import android.app.Activity; +import android.content.Intent; +import android.net.VpnService; import android.os.Bundle; public class MainActivity extends Activity { @@ -8,6 +10,13 @@ public class MainActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + // Prepare the VPN connection (this will request permission if needed) + Intent prepareIntent = VpnService.prepare(this); + if (prepareIntent != null) { + // Permission not yet granted, start the activity to request it + startActivityForResult(prepareIntent, 0); + } + this.getFragmentManager().beginTransaction().replace(android.R.id.content, new ProfileFragment()).commit(); } } From 75a24fc7a5937bddbfa2ab4fcaf67ee97b974ecf Mon Sep 17 00:00:00 2001 From: cuynu Date: Thu, 26 Sep 2024 00:30:44 +0700 Subject: [PATCH 3/5] push changes --- .idea/misc.xml | 2 +- .../net/typeblog/socks/SocksVpnService.java | 2 +- app/src/main/res/drawable/ic_gitlab.png | Bin 0 -> 2077 bytes app/src/main/res/drawable/ic_termux.png | Bin 0 -> 1225 bytes app/src/main/res/values-vi/strings.xml | 5 +- app/src/main/res/values/strings.xml | 5 +- app/src/main/res/xml/settings.xml | 52 ++++++++++++------ 7 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 app/src/main/res/drawable/ic_gitlab.png create mode 100644 app/src/main/res/drawable/ic_termux.png diff --git a/.idea/misc.xml b/.idea/misc.xml index f70bc04..7a7d23f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,7 @@ - + diff --git a/app/src/main/java/net/typeblog/socks/SocksVpnService.java b/app/src/main/java/net/typeblog/socks/SocksVpnService.java index 7d27acb..aa93dc1 100644 --- a/app/src/main/java/net/typeblog/socks/SocksVpnService.java +++ b/app/src/main/java/net/typeblog/socks/SocksVpnService.java @@ -93,7 +93,7 @@ public class SocksVpnService extends VpnService { new Intent(this, MainActivity.class), intentFlags); startForeground(NOTIFICATION_ID, builder .setContentTitle(getString(R.string.notify_title)) - .setContentText(String.format(getString(R.string.notify_msg), name)) + .setContentText(String.format( getString(R.string.notify_msg), name)) .setPriority(Notification.PRIORITY_MIN) .setSmallIcon(R.drawable.ic_vpn) .setContentIntent(contentIntent) diff --git a/app/src/main/res/drawable/ic_gitlab.png b/app/src/main/res/drawable/ic_gitlab.png new file mode 100644 index 0000000000000000000000000000000000000000..cb98d33895eee93c6c7ef7ea0c18eb55c32eee43 GIT binary patch literal 2077 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFCb2`N02WALzNl>LqiJ#!!HH~ zhK3gm45bDP46hOx7_4S6Fo+k-*%fHRz`($k|H*Yfq{X&#M9T6{RJzh zu)5T)H%prt7})-Lx;TbJ9G*L^vS)6nqLKJq_yQpq}%wDu7b+Y6`YB}?Z{^n1x; z{PxUKz57LR|92Q)ww`PKcFOnt#piz8o-dyF-S&Bnlkc0mMe6mh_s!|uU)xe5Q@r5$ z-W@72pLUB^m~Z@_d|hbOhEE^tPSr7=|9an}JhA6r{GUp-<7@va{5__aXInAh;+x;~>QH=b?1G^7ho%>W*%|`1kw>aTYmy%5ZD5m)`k^{MoP7F4pD= z+0UrYUUFDptm0*3wf>Afe|{Wh5uTj$vC91WyZ(cA>K%h!K_SySUx}_fd8qnMQfK(PU4`oy zoayZDN{`= z!qdH;+SzyA-2C&JF_V~l?c4=Ik5tM;z0RLupI~%tUHq?ShKE9`4l*6PJu5>__ISkZ zxDaDgCabwe;>4#o?>T(@97ji!$^RXnstm8)Q(6(sofeXBabjh<_a2Kqclw?D z{--{#Jjs7&H=n-F><7w5nyH)JVw$$_2i9A&Mmeshl*j^zw zBtK8q)=_h|_4)>#C#3!R+G&{`|jVu5FpGJk^_h!>g;z zqN`u`ZP7iyouAi_=k5k3K?c{Yw=|eEm>Oz-#`BbaNfi@4c0Kq%U#UvsgQq8-`j?#Q zn7V!c&3-5A_Is6XUElr&TU?#NCZHMS^m*}y10S`X`qWy?b`j+*+QRC%DRRo4HBVnU zHt#w2sZBbt?M_X(VD_Fm_5A4{+gd$l2rqhh$n&n4|CPwq!Ydt4Za@3EWygV_Uz47t zOx<{KLZSD1B`JQ7#cU-UXAVD17b&#J?`RB}_RE5)q`_pRwiN%Hb2WiJhMQL%PFT-A zA#B0Yz9LqA);O<+G5L#|q&4#P+OUc>ZwYN@tG;V`)O~mF;;GpO<7`a3OE{lAyB5a7 zBKfQ|qpIDJttYtMhP}kF_$T+SD+@PWlX!HS)wcNTPY3>tS2}`Bj$wkue09tRZ+_Fx zU?^!mQ+3%yRi#|&!p-z}MdBf1j+}Um3MV<50on z<>zL6{w8c5TyX0pN4(OMn9b{3-?n9}PWa65O?SdUt;nScJ-l35%O9}L+BG#KZgp9? z<|W0;)5LZD@hhLKzr9^pdHJ4h&NrH$X3txjml1W~QLnYRt{wN1I*>GF>)j?pe}yiO))G_?q{3y7|ES!uIGoY8WE-2u_r5B{o6 z`|`I@_IB%n1s>1eKC%Du;?1+U?>%~LJ_<&;&0BJ*hIL`&6uy$2&CWj*SZ^Oo)ad7U z+}y(sk_k!Yqj(AK5XiGtlhW#hvkCc3v+%u`5bnuzke^^GHNEv!^6(e&s6P~ zGjBEgczUbLB(?c6$|Yj4PmZ?AeoFf@^RoV>1zf#`=*`D z|Mj|Z<5{L3C-ZOhUNzAZmXMa$H~E^keeKHMd-#fvdo zuRp3b&DLA^;c09FYyNMpL+S1rw|<;qP5vu?BJI-T)I)1OGcYiymbgZgq$HN4S|t~y zCYGc!7#SFu=o*;n8d!!HT3Q)fS{WH?8yHv_7-)RH1FEAD8glbfGSez?YlvKzvWNoHbP0l+XkK-iOl! literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_termux.png b/app/src/main/res/drawable/ic_termux.png new file mode 100644 index 0000000000000000000000000000000000000000..30c3218b05b9d8382089889ad99f5a9cb96482d0 GIT binary patch literal 1225 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4i*LmhMUEk>KPaqn3BBRT^Rni_n+C%z`(#+ z;1OBOz`%PQgc+SQW>+vUFtC?+`ns~e;FJ^;*4kLap~1kwc(^Jgq9iD>T%n*SKP@vS zRiUJ^AXOnVIhldMqIYRv1ih!!!-2&cPKHpbp? z{S}-2%hZQgnCGzY7OhNUre&O&mrvgan9wWe$fsGP)DUZ=RMXqct1$b2(WNyhDF-4Q z8npj3m#(*xc*<*Xs4V@Pv$ws?{VAb6CS0j82F{)bom=e@W0&Fa7ZJY~`Q;9HZ|XjOG`ylr^;jpd%xgGZ-5Pt3TrV+G&Rofodi zzG`=yym9Sc(eySImT;yT^$GvZDa_|*bH1=y!fj(@%OZ}=>X+=~TGszbVCYx>nBsi! zgIdD%DMEsF+(yn%JEoL8mx9;SBq9+%IbvS&YYR|{>m5)MuO*xC4Phor2nP|(j4 zB0Ik%T0a(CyyT1n*UW>O+r{s; zUi4#8-zupg!}K`n`N5!5JGERM>3y}n`!;QVuk5$kzm@j<_xPf9 z2aeZdXT&}KaPejfzc%ao(ix6BKJ*^qJk-uzAv*aw_s4Gq?c6iGgc+C~f96yY=(rHU zY^CC8C9t%(gLTKobBD6!ER^kbWmb07IK6$Msv>@gTU%t|?AV`zlP|weF=JtS*Vc2%b(c|3dvPCCuPM!Q|u14ASMX64FVP{LE8DYKvRh1ze(>+-dkycd|1iVvs=wFN>(y(wZne2K zG3JA!)JI+OP19>8y^WdGB>eW3H;>4|FGgG67xEg*tk+fTO1ro}Wwxb6^u>Z4+iT?; zBG!aQvn6hgVeJ0;kA222?(74HUn(;&FsPQeMwFx^mZVxG7o{eaq%s&87@6oASn3*? zh8UV#8CqHynQI#uSQ!{p)$wbhXvob^$xN%nt$|y4`&0%71`W6kC7HRY#U+Wk1(9UOP@0sJnXKTFpPQJOw{4c2 zYH@N=WIP máy chủ, Xác thực, Cổng, IPv6, v.v... Termux có thể cần thiết trong 1 số mục đích cụ thể, ví dụ như sử dụng internet miễn phí. Xem mã nguồn dự án trên GitLab - Để sử dụng, hãy bật tất cả 3 tùy chọn dưới, và thêm com.termux vào danh sách ứng dụng nhé ! Chế độ bỏ qua Bật tùy chọn này để bỏ qua các ứng dụng đã chọn thay vì ủy quyền chúng Danh sách ứng dụng @@ -43,5 +42,7 @@ Cổng UDP (Từ xa) Chuyển tiếp UDP Chuyển tiếp gói UDP tới badvpn-udpgw qua SOCKS5. Điều này cần badvpn-udpgw chạy trên máy chủ từ xa (thường listen trên 127.0.0.1) để hoạt động. - + Thông tin ứng dụng + Phiên bản ứng dụng + Thời gian biên dịch diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a3318d..786101a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,12 +6,13 @@ Server IP, Authentication, Ports, IPv6, etc... Open Termux This might be needed for some purpose, such as getting free internet. - In order to use, enable all available option below, and add com.termux to App List ! View source code View project source code on GitLab Profile Default - + App info + App version + Compile time Connection Server IP Server Port diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index b10ef68..a13f51e 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -1,6 +1,7 @@ - - - - + + + + + + + + + + From 63cf9662116c7addcb3e184ee9479b66c6faa02a Mon Sep 17 00:00:00 2001 From: cuynu Date: Thu, 26 Sep 2024 00:31:48 +0700 Subject: [PATCH 4/5] remove commit id and build date --- app/src/main/res/xml/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index a13f51e..fc697c3 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -109,10 +109,10 @@ android:summary="1.0.6" /> + android:summary="YYYY-MM-DD" /> + android:summary=""> From e63295acf4fb93cd1011dc468e14980b5cb1374f Mon Sep 17 00:00:00 2001 From: cuynu Date: Thu, 26 Sep 2024 00:32:39 +0700 Subject: [PATCH 5/5] bump 1.0.7 --- app/build.gradle | 2 +- app/src/main/res/xml/settings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6b125c0..0575b2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { minSdkVersion 21 targetSdkVersion 33 versionCode 13 - versionName "1.0.6" + versionName "1.0.7" } buildTypes { release { diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index fc697c3..62f9c09 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -106,7 +106,7 @@ android:title="@string/appinfo_category"> + android:summary="1.0.7" />