8000 new pr rebased by binaryb3ast · Pull Request #314 · bepass-org/oblivion · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
8000

new pr rebased #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 40 commits into from
Jul 6, 2024
Merged

new pr rebased #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
afe91a8
Refactor FileManager.java with detailed comments
binaryb3ast Jun 9, 2024
d60a324
Implemented ApplicationLoader class for global context access and ini…
binaryb3ast Jun 9, 2024
68f5495
Implemented default night mode configuration
binaryb3ast Jun 9, 2024
c3cc2b7
add viewbinding to gradle
binaryb3ast Jun 9, 2024
3d1455c
refactor: Optimize PublicIPUtils with improved scheduling and error h…
binaryb3ast Jun 10, 2024
30c4c78
feat: Integrate data binding into SplashScreenActivity
binaryb3ast Jun 10, 2024
3a42299
refactor: Move all activities into ui folder for better project struc…
binaryb3ast Jun 10, 2024
eb49922
make abstract method from StateAwareBaseActivity protected
binaryb3ast Jun 10, 2024
5e1fbab
refactor: Optimize MainActivity SettingsActivity SplitTunnelActivity …
binaryb3ast Jun 10, 2024
3331ef1
remove findviewbyids
binaryb3ast Jun 10, 2024
89651c6
remove setcontentView
binaryb3ast Jun 10, 2024
6d4c3ba
add binding and remove findviewbyIds
binaryb3ast Jun 10, 2024
f77e37c
add data binding
binaryb3ast Jun 10, 2024
f7e66b3
add data binding and reformat
binaryb3ast Jun 10, 2024
d73c221
move TouchAwareSwitch into new folder "Component"
binaryb3ast Jun 10, 2024
bd25c4a
conflict fix
binaryb3ast Jun 29, 2024
cc371b2
Merge remote-tracking branch 'origin/main'
binaryb3ast Jun 29, 2024
9677a61
Merge branch 'refs/heads/maintenance/code-improvements'
binaryb3ast Jun 29, 2024
ce1c9c1
Merge pull request #5 from binaryb3ast/main
binaryb3ast Jun 29, 2024
cf5226f
Solving the logo problem that was not displayed correctly on some pho…
binaryb3ast Jun 29, 2024
036b167
Merge remote-tracking branch 'origin/pr/benny' into maintenance/code-…
binaryb3ast Jun 29, 2024
47aeb60
add : night colors values
binaryb3ast Jun 30, 2024
dc7a35e
maintenance: add utils directory
binaryb3ast Jun 30, 2024
b80c682
maintenance: add service directory
binaryb3ast Jun 30, 2024
bf4aea6
maintenance: add interface directory
binaryb3ast Jun 30, 2024
2298bf0
maintenance: add model directory
binaryb3ast Jun 30, 2024
3174959
maintenance: add enums directory
binaryb3ast Jun 30, 2024
e58db8d
add: ThemeHelper.java for better dark mode management
binaryb3ast Jun 30, 2024
c265c84
Refactor ThemeHelper to Singleton
binaryb3ast Jun 30, 2024
ecad4a8
add status bar color for BaseActivity
binaryb3ast Jun 30, 2024
6ae9c9e
add SystemUtils.java for handling statusbar color on dark mode change
binaryb3ast Jun 30, 2024
b0c89e4
add status bar bg color and assign it to activities
binaryb3ast Jun 30, 2024
329a48d
now choose color from colors.xml
binaryb3ast Jun 30, 2024
b2e85ba
fix status bar color on dark mode
binaryb3ast Jun 30, 2024
de7edbf
handling icon color for dark mode
binaryb3ast Jun 30, 2024
c89ebb9
Merge pull request #6 from binaryb3ast/pr/benny
binaryb3ast Jul 3, 2024
e968509
Merge pull request #7 from binaryb3ast/feat-darkmode
binaryb3ast Jul 3, 2024
fd10fc0
add dark mode to LogActivity
binaryb3ast Jul 4, 2024
6034dc4
add dark mode check box in setting for changing theme
binaryb3ast Jul 6, 2024
47f6726
apply dark mode on app start
binaryb3ast Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ android {
useSupportLibrary true
}
}
buildFeatures {
dataBinding = true
}

buildTypes {
release {
Expand Down
17 changes: 9 additions & 8 deletions app/libs/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ toolchain go1.22.2

replace github.com/eycorsican/go-tun2socks => github.com/trojan-gfw/go-tun2socks v1.16.3-0.20210702214000-083d49176e05


require (
github.com/bepass-org/warp-plus v1.2.4-0.20240603141320-b3f8c9953e10
github.com/eycorsican/go-tun2socks v1.16.11
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
github.com/xjasonlyu/tun2socks/v2 v2.5.2
golang.org/x/mobile v0.0.0-20240213143359-d1f7d3436075
golang.org/x/mobile v0.0.0-20240604190613-2782386b8afd
)

require (
Expand Down Expand Up @@ -72,15 +73,15 @@ require (
gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/mock v0.4.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.18.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
google.golang.org/protobuf v1.32.0 // indirect
Expand Down
17 changes: 17 additions & 0 deletions app/libs/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,20 @@ golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 h1:Di6/M8l0O2lCLc6VVRWhgCiApHV8MnQurBnFSHsQtNY=
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
golang.org/x/mobile v0.0.0-20240213143359-d1f7d3436075 h1:iZzqyDd8gFkJZpsJNzveyScRBcQlsveheh6Q77LzhPY=
golang.org/x/mobile v0.0.0-20240213143359-d1f7d3436075/go.mod h1:Y8Bnziw2dX69ZhYuqQB8Ihyjks1Q6fMmbg17j9+ISNA=
golang.org/x/mobile v0.0.0-20240604190613-2782386b8afd h1:ow0zRCrn9LoaazcXsRUYYjFp+cwkdgB/vlW/ZJEzNRw=
golang.org/x/mobile v0.0.0-20240604190613-2782386b8afd/go.mod h1:CKRkjuY6XI4LTd47GM+4lCT8aFnTO+FcLAGMu0ibd0g=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
Expand All @@ -238,12 +244,16 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand All @@ -259,6 +269,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
Expand All @@ -267,6 +279,7 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
Expand All @@ -275,6 +288,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand All @@ -283,6 +298,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
Expand Down
17 changes: 9 additions & 8 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
android:banner="@mipmap/tv_banner"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:name=".base.ApplicationLoader"
tools:replace="android:supportsRtl"
android:screenOrientation="portrait"
android:enableOnBackInvokedCallback="true"
Expand All @@ -41,7 +42,7 @@
tools:ignore="DiscouragedApi">

<service
android:name=".OblivionVpnService"
android:name=".service.OblivionVpnService"
android:enabled="true"
android:exported="false"
android:permission="android.permission.BIND_VPN_SERVICE"
Expand All @@ -57,7 +58,7 @@
</service>

<service
android:name=".QuickStartService"
android:name=".service.QuickStartService"
android:exported="true"
android:label="Oblivion"
android:icon="@drawable/vpn_off"
Expand All @@ -69,7 +70,7 @@
</intent-filter>

</service>
<activity android:name="org.bepass.oblivion.SplashScreenActivity"
<activity android:name="org.bepass.oblivion.ui.SplashScreenActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -78,7 +79,7 @@
</intent-filter>
</activity>
<activity
android:name="org.bepass.oblivion.MainActivity"
android:name="org.bepass.oblivion.ui.MainActivity"
android:exported="true"
android:theme="@style/Theme.OblivionUI">
<intent-filter>
Expand All @@ -88,20 +89,20 @@
</intent-filter>
</activity>
<activity
android:name="org.bepass.oblivion.InfoActivity"
android:name="org.bepass.oblivion.ui.InfoActivity"
android:exported="false" />

<activity
android:name="org.bepass.oblivion.LogActivity"
android:name="org.bepass.oblivion.ui.LogActivity"
android:exported="false" />

<activity
android:name="org.bepass.oblivion.SettingsActivity"
android:name="org.bepass.oblivion.ui.SettingsActivity"
android:exported="false"
android:windowSoftInputMode="adjustResize" />

<activity
android:name=".SplitTunnelActivity"
android:name=".ui.SplitTunnelActivity"
android:exported="false" />
</application>

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/bepass/oblivion/BypassListAppsAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import com.bumptech.glide.Glide;
import com.google.android.material.imageview.ShapeableImageView;

import org.bepass.oblivion.utils.FileManager;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/org/bepass/oblivion/EditSheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

import com.google.android.material.bottomsheet.BottomSheetDialog;

import org.bepass.oblivion.interfaces.SheetsCallBack;
import org.bepass.oblivion.utils.FileManager;

public class EditSheet {

FileManager fileManager;
Expand Down
99 changes: 0 additions & 99 deletions app/src/main/java/org/bepass/oblivion/FileManager.java
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions app/src/main/java/org/bepass/oblivion/InfoActivity.java
View file
Open in desktop

This file was deleted.

Loading
0