From adc613d8011af7c508050badb1272e8326554c39 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Mon, 9 Mar 2020 19:00:14 +0530
Subject: [PATCH] Migrate tunnel related classes to tunnel/ Gradle module

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .gitmodules                                   |  4 +--
 app/build.gradle                              | 34 ++-----------------
 app/src/main/AndroidManifest.xml              |  8 -----
 build.gradle                                  | 26 ++++++++++++--
 settings.gradle                               |  1 +
 tunnel/build.gradle                           | 30 ++++++++++++++++
 tunnel/src/main/AndroidManifest.xml           | 17 ++++++++++
 .../wireguard/android/backend/Backend.java    |  0
 .../android/backend/BackendException.java     |  0
 .../wireguard/android/backend/GoBackend.java  |  0
 .../wireguard/android/backend/Statistics.java |  0
 .../com/wireguard/android/backend/Tunnel.java |  0
 .../android/backend/WgQuickBackend.java       |  0
 .../wireguard/android/util/AsyncWorker.java   |  0
 .../com/wireguard/android/util/RootShell.java |  0
 .../android/util/SharedLibraryLoader.java     |  0
 .../android/util/ToolsInstaller.java          |  0
 .../java/com/wireguard/config/Attribute.java  |  0
 .../wireguard/config/BadConfigException.java  |  0
 .../java/com/wireguard/config/Config.java     |  0
 .../com/wireguard/config/InetAddresses.java   |  0
 .../com/wireguard/config/InetEndpoint.java    |  0
 .../com/wireguard/config/InetNetwork.java     |  0
 .../java/com/wireguard/config/Interface.java  |  0
 .../com/wireguard/config/ParseException.java  |  0
 .../main/java/com/wireguard/config/Peer.java  |  0
 .../java/com/wireguard/crypto/Curve25519.java |  0
 .../main/java/com/wireguard/crypto/Key.java   |  0
 .../wireguard/crypto/KeyFormatException.java  |  0
 .../java/com/wireguard/crypto/KeyPair.java    |  0
 .../com/wireguard/util/NonNullForAll.java     |  0
 {app => tunnel}/tools/CMakeLists.txt          |  0
 {app => tunnel}/tools/libwg-go/.gitignore     |  0
 {app => tunnel}/tools/libwg-go/Makefile       |  0
 {app => tunnel}/tools/libwg-go/api-android.go |  0
 {app => tunnel}/tools/libwg-go/go.mod         |  0
 {app => tunnel}/tools/libwg-go/go.sum         |  0
 .../goruntime-boottime-over-monotonic.diff    |  0
 {app => tunnel}/tools/libwg-go/jni.c          |  0
 {app => tunnel}/tools/ndk-compat/compat.c     |  0
 {app => tunnel}/tools/ndk-compat/compat.h     |  0
 {app => tunnel}/tools/wireguard-tools         |  0
 42 files changed, 76 insertions(+), 44 deletions(-)
 create mode 100644 tunnel/build.gradle
 create mode 100644 tunnel/src/main/AndroidManifest.xml
 rename {app => tunnel}/src/main/java/com/wireguard/android/backend/Backend.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/backend/BackendException.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/backend/GoBackend.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/backend/Statistics.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/backend/Tunnel.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/backend/WgQuickBackend.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/util/AsyncWorker.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/util/RootShell.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/android/util/ToolsInstaller.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/Attribute.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/BadConfigException.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/Config.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/InetAddresses.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/InetEndpoint.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/InetNetwork.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/Interface.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/ParseException.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/config/Peer.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/crypto/Curve25519.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/crypto/Key.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/crypto/KeyFormatException.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/crypto/KeyPair.java (100%)
 rename {app => tunnel}/src/main/java/com/wireguard/util/NonNullForAll.java (100%)
 rename {app => tunnel}/tools/CMakeLists.txt (100%)
 rename {app => tunnel}/tools/libwg-go/.gitignore (100%)
 rename {app => tunnel}/tools/libwg-go/Makefile (100%)
 rename {app => tunnel}/tools/libwg-go/api-android.go (100%)
 rename {app => tunnel}/tools/libwg-go/go.mod (100%)
 rename {app => tunnel}/tools/libwg-go/go.sum (100%)
 rename {app => tunnel}/tools/libwg-go/goruntime-boottime-over-monotonic.diff (100%)
 rename {app => tunnel}/tools/libwg-go/jni.c (100%)
 rename {app => tunnel}/tools/ndk-compat/compat.c (100%)
 rename {app => tunnel}/tools/ndk-compat/compat.h (100%)
 rename {app => tunnel}/tools/wireguard-tools (100%)

diff --git a/.gitmodules b/.gitmodules
index 77b129f7..46c0abd5 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 a32d14f0..a21c2027 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 4bcb7588..5e993ae2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -73,14 +73,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name=".backend.GoBackend$VpnService"
-            android:permission="android.permission.BIND_VPN_SERVICE">
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-        </service>
-
         <service
             android:name=".QuickTileService"
             android:icon="@drawable/ic_tile"
diff --git a/build.gradle b/build.gradle
index 07abd269..01ab9af5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,31 @@ allprojects {
 }
 
 buildscript {
+    ext {
+        annotationsVersion = '1.1.0'
+        appcompatVersion = '1.1.0'
+        cardviewVersion = '1.0.0'
+        collectionVersion = '1.1.0'
+        coreKtxVersion = '1.2.0'
+        constraintLayoutVersion = '1.1.3'
+        coordinatorLayoutVersion = '1.1.0'
+        agpVersion = '3.6.1'
+        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 {
-        classpath 'com.android.tools.build:gradle:3.6.1'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70'
+        classpath "com.android.tools.build:gradle:$agpVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
     repositories {
         google()
diff --git a/settings.gradle b/settings.gradle
index e7b4def4..748da187 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':app'
+include ':tunnel'
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
new file mode 100644
index 00000000..65ac6ceb
--- /dev/null
+++ b/tunnel/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+
+android {
+    buildToolsVersion '29.0.3'
+    compileSdkVersion 29
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 1
+        versionName '1.0'
+    }
+    externalNativeBuild {
+        cmake {
+            path 'tools/CMakeLists.txt'
+        }
+    }
+}
+
+dependencies {
+    api "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
+    api "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
+    api "com.google.code.findbugs:jsr305:$jsr305Version"
+    implementation "androidx.annotation:annotation:$annotationsVersion"
+    implementation "androidx.collection:collection:$collectionVersion"
+    implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
+}
diff --git a/tunnel/src/main/AndroidManifest.xml b/tunnel/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..111e5e2d
--- /dev/null
+++ b/tunnel/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.wireguard.android.tunnel">
+    <application>
+            <service
+            android:name="com.wireguard.android.backend.GoBackend$VpnService"
+            android:permission="android.permission.BIND_VPN_SERVICE">
+            <intent-filter>
+                <action android:name="android.net.VpnService" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>
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