v2 refactors

.github/workflows/release.yaml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
 
       # Set up JDK
@@ -70,13 +70,3 @@ jobs:
           name: oblivion-${{ github.sha }}-unsigned.apk
           path: |
             app/build/outputs/apk/release/app-release-unsigned.apk
-
-      - name: Upload to GitHub Release
-        uses: svenstaro/upload-release-action@v2
-        if: github.event_name == 'release'
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: app/build/outputs/apk/release/app-release-unsigned.apk
-          asset_name: oblivion-${{ github.event.release.tag_name }}-unsigned.apk
-          tag: ${{ github.ref }}
-          overwrite: true

README.md

@@ -25,7 +25,7 @@ It's leveraging `bepass-sdk` and a custom Go implementation of WireGuard, it's d
 - Gradle 8
 - Android Gradle Plugin (AGP) 8.1.2
 - NDK r26b (26.1.10909125)
-- Go 1.20.0
+- Go 1.21
 
 Follow the steps below to build the Oblivion:
 
@@ -44,19 +44,6 @@ go run golang.org/x/mobile/cmd/gomobile bind -ldflags="-w -s" -target=android -a
 - Select "Generate Signed Bundle/APK..."
 - Choose "APK" and proceed.
 
-#### Select Keystore:
-- Click on "Choose existing..." or "Create new..." to locate your keystore file.
-- Enter the keystore password when prompted.
-
-#### Configure APK Signature:
-- Select the appropriate key alias from the dropdown menu.
-- Input the key password.
-- Continue to the next step.
-
-#### Select APK Destination:
-- Choose the destination folder for the signed APK.
-- Finalize by clicking "Finish" to generate the signed APK.
-
 ## Get Involved
 
 We're a community-driven project, aiming to make the internet accessible for all. Whether you want to contribute code, suggest features, or need some help, we'd love to hear from you! Check out our [GitHub Issues](https://github.com/bepass-org/oblivion/issues) or submit a pull request.

app/build.gradle

@@ -6,13 +6,12 @@ plugins {
 android {
     namespace 'org.bepass.oblivion'
     compileSdk 34
-    compileSdkVersion 34
     defaultConfig {
         applicationId "org.bepass.oblivion"
         minSdk 21
         targetSdk 34
-        versionCode 11
-        versionName "1"
+        versionCode 12
+        versionName "2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -43,6 +42,15 @@ android {
     packagingOptions {
         resources.excludes.add("META-INF/*")
     }
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
+}
+
+configurations {
+    all {
+        exclude group: 'org.json', module: 'json'
+    }
 }
 
 dependencies {
@@ -54,5 +62,6 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'com.github.bumptech.glide:glide:4.16.0'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation 'com.vdurmont:emoji-java:5.1.1'
     implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
 }

app/libs/README.md

@@ -1,6 +1,6 @@
 # How To build?
 
-## Go Version "MUST be exactly go 1.20" because of psiphon library then you can run
+## Go Version "MUST be exactly go 1.21" because of psiphon library then you can run
 
 ```sh
 go run golang.org/x/mobile/cmd/gomobile init

app/libs/go.mod

@@ -1,13 +1,15 @@
 module tun2socks
 
-go 1.20
+go 1.21.1
 
-replace github.com/Psiphon-Labs/psiphon-tunnel-core => github.com/uoosef/psiphon-tunnel-core v0.0.0-20240126135009-9fbc37b0b068
+toolchain go1.21.6
+
+replace github.com/Psiphon-Labs/psiphon-tunnel-core => github.com/bepass-org/psiphon-tunnel-core v0.0.0-20240311155012-9c2e10df08e5
 
 replace github.com/eycorsican/go-tun2socks => github.com/trojan-gfw/go-tun2socks v1.16.3-0.20210702214000-083d49176e05
 
 require (
-	github.com/bepass-org/wireguard-go v1.0.4-rc2
+	github.com/bepass-org/warp-plus v1.1.3-0.20240403205252-06b16247e1a5
 	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
@@ -18,22 +20,16 @@ require (
 	filippo.io/bigmod v0.0.1 // indirect
 	filippo.io/keygen v0.0.0-20230306160926-5201437acf8e // indirect
 	github.com/AndreasBriese/bbloom v0.0.0-20170702084017-28f7e881ca57 // indirect
-	github.com/MakeNowJust/heredoc/v2 v2.0.1 // indirect
 	github.com/Psiphon-Labs/bolt v0.0.0-20200624191537-23cedaef7ad7 // indirect
 	github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 // indirect
-	github.com/Psiphon-Labs/psiphon-tunnel-core v0.0.0-00010101000000-000000000000 // indirect
-	github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20230608213623-d58aa73e519a // indirect
-	github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf // indirect
-	github.com/Psiphon-Labs/quic-go v0.0.0-20230626192210-73f29effc9da // indirect
-	github.com/Psiphon-Labs/tls-tris v0.0.0-20230824155421-58bf6d336a9a // indirect
+	github.com/Psiphon-Labs/psiphon-tls v0.0.0-20240305020009-09f917290799 // indirect
+	github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.28+incompatible // indirect
+	github.com/Psiphon-Labs/quic-go v0.0.0-20240305203241-7c4a760d03cc // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f // indirect
-	github.com/bepass-org/ipscanner v0.0.0-20240205155121-8927b7437d16 // indirect
-	github.com/bepass-org/proxy v0.0.0-20240201095508-c86216dd0aea // indirect
 	github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 // indirect
 	github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9 // indirect
 	github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/siphash v1.2.3 // indirect
 	github.com/dgraph-io/badger v1.5.4-0.20180815194500-3a87f6d9c273 // indirect
 	github.com/dgryski/go-farm v0.0.0-20180109070241-2de33835d102 // indirect
@@ -65,9 +61,9 @@ require (
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/quic-go/quic-go v0.40.1 // indirect
-	github.com/refraction-networking/conjure v0.7.10-0.20231110193225-e4749a9dedc9 // indirect
+	github.com/refraction-networking/conjure v0.7.11-0.20240130155008-c8df96195ab2 // indirect
 	github.com/refraction-networking/ed25519 v0.1.2 // indirect
-	github.com/refraction-networking/gotapdance v1.7.7 // indirect
+	github.com/refraction-networking/gotapdance v1.7.10 // indirect
 	github.com/refraction-networking/obfs4 v0.1.2 // indirect
 	github.com/refraction-networking/utls v1.3.3 // indirect
 	github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507 // indirect
@@ -78,16 +74,16 @@ 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.3.0 // indirect
-	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/crypto v0.21.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.21.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.18.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
-	gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 // indirect
+	gvisor.dev/gvisor v0.0.0-20240313225113-67a078058255 // indirect
 )