diff --git a/.gitmodules b/.gitmodules
index 77b129f..46c0abd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "app/tools/wireguard-tools"]
- path = app/tools/wireguard-tools
+[submodule "tunnel/tools/wireguard-tools"]
+ path = tunnel/tools/wireguard-tools
url = https://git.zx2c4.com/wireguard-tools
diff --git a/app/build.gradle b/app/build.gradle
index a32d14f..a21c202 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,51 +65,21 @@ android {
}
}
}
- externalNativeBuild {
- cmake {
- path 'tools/CMakeLists.txt'
- }
- }
-}
-
-ext {
- annotationsVersion = '1.1.0'
- appcompatVersion = '1.1.0'
- cardviewVersion = '1.0.0'
- coreKtxVersion = '1.2.0'
- constraintLayoutVersion = '1.1.3'
- coordinatorLayoutVersion = '1.1.0'
- databindingVersion = '3.6.0'
- fragmentVersion = '1.2.2'
- materialComponentsVersion = '1.1.0'
- jsr305Version = '3.0.2'
- kotlinVersion = '1.3.70'
- preferenceVersion = '1.1.0'
- streamsupportVersion = '1.7.1'
- threetenabpVersion = '1.2.2'
- // ZXING switched minSdk to 24 so we cannot upgrade to 4.0.2 without following suit.
- // If you choose to upgrade to minSDK 24 then you should also disable Jetifier from
- // gradle.properties.
- zxingEmbeddedVersion = '3.6.0'
- eddsaVersion = '0.3.0'
}
dependencies {
+ implementation project(":tunnel")
implementation "androidx.annotation:annotation:$annotationsVersion"
implementation "androidx.appcompat:appcompat:$appcompatVersion"
implementation "androidx.cardview:cardview:$cardviewVersion"
implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
implementation "androidx.coordinatorlayout:coordinatorlayout:$coordinatorLayoutVersion"
implementation "androidx.core:core-ktx:$coreKtxVersion"
- implementation "androidx.databinding:databinding-runtime:$databindingVersion"
+ implementation "androidx.databinding:databinding-runtime:$agpVersion"
implementation "androidx.fragment:fragment:$fragmentVersion"
implementation "androidx.preference:preference:$preferenceVersion"
implementation "com.google.android.material:material:$materialComponentsVersion"
- implementation "com.google.code.findbugs:jsr305:$jsr305Version"
- implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
- implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
- implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
implementation "net.i2p.crypto:eddsa:$eddsaVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4bcb758..5e993ae 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -73,14 +73,6 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/wireguard/android/backend/Backend.java b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/backend/Backend.java
rename to tunnel/src/main/java/com/wireguard/android/backend/Backend.java
diff --git a/app/src/main/java/com/wireguard/android/backend/BackendException.java b/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/backend/BackendException.java
rename to tunnel/src/main/java/com/wireguard/android/backend/BackendException.java
diff --git a/app/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/backend/GoBackend.java
rename to tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
diff --git a/app/src/main/java/com/wireguard/android/backend/Statistics.java b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/backend/Statistics.java
rename to tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
diff --git a/app/src/main/java/com/wireguard/android/backend/Tunnel.java b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/backend/Tunnel.java
rename to tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
diff --git a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
rename to tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
diff --git a/app/src/main/java/com/wireguard/android/util/AsyncWorker.java b/tunnel/src/main/java/com/wireguard/android/util/AsyncWorker.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/util/AsyncWorker.java
rename to tunnel/src/main/java/com/wireguard/android/util/AsyncWorker.java
diff --git a/app/src/main/java/com/wireguard/android/util/RootShell.java b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/util/RootShell.java
rename to tunnel/src/main/java/com/wireguard/android/util/RootShell.java
diff --git a/app/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
rename to tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
diff --git a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
similarity index 100%
rename from app/src/main/java/com/wireguard/android/util/ToolsInstaller.java
rename to tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
diff --git a/app/src/main/java/com/wireguard/config/Attribute.java b/tunnel/src/main/java/com/wireguard/config/Attribute.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/Attribute.java
rename to tunnel/src/main/java/com/wireguard/config/Attribute.java
diff --git a/app/src/main/java/com/wireguard/config/BadConfigException.java b/tunnel/src/main/java/com/wireguard/config/BadConfigException.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/BadConfigException.java
rename to tunnel/src/main/java/com/wireguard/config/BadConfigException.java
diff --git a/app/src/main/java/com/wireguard/config/Config.java b/tunnel/src/main/java/com/wireguard/config/Config.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/Config.java
rename to tunnel/src/main/java/com/wireguard/config/Config.java
diff --git a/app/src/main/java/com/wireguard/config/InetAddresses.java b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/InetAddresses.java
rename to tunnel/src/main/java/com/wireguard/config/InetAddresses.java
diff --git a/app/src/main/java/com/wireguard/config/InetEndpoint.java b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/InetEndpoint.java
rename to tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
diff --git a/app/src/main/java/com/wireguard/config/InetNetwork.java b/tunnel/src/main/java/com/wireguard/config/InetNetwork.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/InetNetwork.java
rename to tunnel/src/main/java/com/wireguard/config/InetNetwork.java
diff --git a/app/src/main/java/com/wireguard/config/Interface.java b/tunnel/src/main/java/com/wireguard/config/Interface.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/Interface.java
rename to tunnel/src/main/java/com/wireguard/config/Interface.java
diff --git a/app/src/main/java/com/wireguard/config/ParseException.java b/tunnel/src/main/java/com/wireguard/config/ParseException.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/ParseException.java
rename to tunnel/src/main/java/com/wireguard/config/ParseException.java
diff --git a/app/src/main/java/com/wireguard/config/Peer.java b/tunnel/src/main/java/com/wireguard/config/Peer.java
similarity index 100%
rename from app/src/main/java/com/wireguard/config/Peer.java
rename to tunnel/src/main/java/com/wireguard/config/Peer.java
diff --git a/app/src/main/java/com/wireguard/crypto/Curve25519.java b/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java
similarity index 100%
rename from app/src/main/java/com/wireguard/crypto/Curve25519.java
rename to tunnel/src/main/java/com/wireguard/crypto/Curve25519.java
diff --git a/app/src/main/java/com/wireguard/crypto/Key.java b/tunnel/src/main/java/com/wireguard/crypto/Key.java
similarity index 100%
rename from app/src/main/java/com/wireguard/crypto/Key.java
rename to tunnel/src/main/java/com/wireguard/crypto/Key.java
diff --git a/app/src/main/java/com/wireguard/crypto/KeyFormatException.java b/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java
similarity index 100%
rename from app/src/main/java/com/wireguard/crypto/KeyFormatException.java
rename to tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java
diff --git a/app/src/main/java/com/wireguard/crypto/KeyPair.java b/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java
similarity index 100%
rename from app/src/main/java/com/wireguard/crypto/KeyPair.java
rename to tunnel/src/main/java/com/wireguard/crypto/KeyPair.java
diff --git a/app/src/main/java/com/wireguard/util/NonNullForAll.java b/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java
similarity index 100%
rename from app/src/main/java/com/wireguard/util/NonNullForAll.java
rename to tunnel/src/main/java/com/wireguard/util/NonNullForAll.java
diff --git a/app/tools/CMakeLists.txt b/tunnel/tools/CMakeLists.txt
similarity index 100%
rename from app/tools/CMakeLists.txt
rename to tunnel/tools/CMakeLists.txt
diff --git a/app/tools/libwg-go/.gitignore b/tunnel/tools/libwg-go/.gitignore
similarity index 100%
rename from app/tools/libwg-go/.gitignore
rename to tunnel/tools/libwg-go/.gitignore
diff --git a/app/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile
similarity index 100%
rename from app/tools/libwg-go/Makefile
rename to tunnel/tools/libwg-go/Makefile
diff --git a/app/tools/libwg-go/api-android.go b/tunnel/tools/libwg-go/api-android.go
similarity index 100%
rename from app/tools/libwg-go/api-android.go
rename to tunnel/tools/libwg-go/api-android.go
diff --git a/app/tools/libwg-go/go.mod b/tunnel/tools/libwg-go/go.mod
similarity index 100%
rename from app/tools/libwg-go/go.mod
rename to tunnel/tools/libwg-go/go.mod
diff --git a/app/tools/libwg-go/go.sum b/tunnel/tools/libwg-go/go.sum
similarity index 100%
rename from app/tools/libwg-go/go.sum
rename to tunnel/tools/libwg-go/go.sum
diff --git a/app/tools/libwg-go/goruntime-boottime-over-monotonic.diff b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff
similarity index 100%
rename from app/tools/libwg-go/goruntime-boottime-over-monotonic.diff
rename to tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff
diff --git a/app/tools/libwg-go/jni.c b/tunnel/tools/libwg-go/jni.c
similarity index 100%
rename from app/tools/libwg-go/jni.c
rename to tunnel/tools/libwg-go/jni.c
diff --git a/app/tools/ndk-compat/compat.c b/tunnel/tools/ndk-compat/compat.c
similarity index 100%
rename from app/tools/ndk-compat/compat.c
rename to tunnel/tools/ndk-compat/compat.c
diff --git a/app/tools/ndk-compat/compat.h b/tunnel/tools/ndk-compat/compat.h
similarity index 100%
rename from app/tools/ndk-compat/compat.h
rename to tunnel/tools/ndk-compat/compat.h
diff --git a/app/tools/wireguard-tools b/tunnel/tools/wireguard-tools
similarity index 100%
rename from app/tools/wireguard-tools
rename to tunnel/tools/wireguard-tools