1 files changed, 72 insertions, 0 deletions
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt
index 2792f749..1833d5c8 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt
@@ -4,6 +4,8 @@
  */
 package com.wireguard.android.viewmodel
 
+import android.net.Uri
+import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
 import androidx.databinding.BaseObservable
@@ -18,6 +20,12 @@ import com.wireguard.crypto.Key
 import com.wireguard.crypto.KeyFormatException
 import com.wireguard.crypto.KeyPair
 
+object Constants {
+    const val HTTP_PROXY_NONE = "None"
+    const val HTTP_PROXY_MANUAL = "Manual"
+    const val HTTP_PROXY_PAC = "Proxy Auto-Config"
+}
+
 class InterfaceProxy : BaseObservable, Parcelable {
     @get:Bindable
     val excludedApplications: ObservableList<String> = ObservableArrayList()
@@ -54,6 +62,44 @@ class InterfaceProxy : BaseObservable, Parcelable {
         }
 
     @get:Bindable
+    var httpProxyMenu: String = ""
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.httpProxyMenu)
+            notifyPropertyChanged(BR.httpProxyManualVisibility)
+            notifyPropertyChanged(BR.httpProxyPacVisibility)
+        }
+
+    @get:Bindable
+    var httpProxyManualVisibility: Int = 0
+        get() = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) android.view.View.GONE else (if (httpProxyMenu == Constants.HTTP_PROXY_MANUAL) android.view.View.VISIBLE else android.view.View.GONE)
+
+    @get:Bindable
+    var httpProxyHostname: String = ""
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.httpProxyHostname)
+        }
+
+    @get:Bindable
+    var httpProxyPort: String = ""
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.httpProxyPort)
+        }
+
+    @get:Bindable
+    var httpProxyPac: String = ""
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.httpProxyPac)
+        }
+
+    @get:Bindable
+    var httpProxyPacVisibility: Int = 0
+        get() = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) android.view.View.GONE else (if (httpProxyMenu == Constants.HTTP_PROXY_PAC) android.view.View.VISIBLE else android.view.View.GONE)
+
+    @get:Bindable
     var privateKey: String = ""
         set(value) {
             field = value
@@ -76,6 +122,10 @@ class InterfaceProxy : BaseObservable, Parcelable {
         parcel.readStringList(includedApplications)
         listenPort = parcel.readString() ?: ""
         mtu = parcel.readString() ?: ""
+        httpProxyMenu = parcel.readString() ?: ""
+        httpProxyHostname = parcel.readString() ?: ""
+        httpProxyPort = parcel.readString() ?: ""
+        httpProxyPac = parcel.readString() ?: ""
         privateKey = parcel.readString() ?: ""
     }
 
@@ -87,6 +137,10 @@ class InterfaceProxy : BaseObservable, Parcelable {
         includedApplications.addAll(other.includedApplications)
         listenPort = other.listenPort.map { it.toString() }.orElse("")
         mtu = other.mtu.map { it.toString() }.orElse("")
+        httpProxyHostname = other.httpProxy.map { if (it.getHost().startsWith('[') && it.getHost().endsWith(']')) it.getHost().substring(1, it.getHost().length-1) else it.getHost() }.orElse("")
+        httpProxyPort = other.httpProxy.map { if (it.getPort() <= 0) "8080" else it.getPort().toString() }.orElse("")
+        httpProxyPac = other.httpProxy.map { it.getPacFileUrl().toString() }.orElse("")
+        httpProxyMenu = other.httpProxy.map { if (it.getPacFileUrl() != null && it.getPacFileUrl() != Uri.EMPTY) Constants.HTTP_PROXY_PAC else if (it.getHost() != "") Constants.HTTP_PROXY_MANUAL else Constants.HTTP_PROXY_NONE }.orElse(Constants.HTTP_PROXY_NONE)
         val keyPair = other.keyPair
         privateKey = keyPair.privateKey.toBase64()
     }
@@ -111,6 +165,20 @@ class InterfaceProxy : BaseObservable, Parcelable {
         if (includedApplications.isNotEmpty()) builder.includeApplications(includedApplications)
         if (listenPort.isNotEmpty()) builder.parseListenPort(listenPort)
         if (mtu.isNotEmpty()) builder.parseMtu(mtu)
+        if (Constants.HTTP_PROXY_MANUAL.equals(httpProxyMenu) && httpProxyHostname.isNotEmpty()) {
+            var httpProxy: String
+            if (httpProxyHostname.contains(":")) {
+                httpProxy = "[" + httpProxyHostname + "]"
+            } else {
+                httpProxy = httpProxyHostname
+            }
+            if (httpProxyPort.isNotEmpty()) {
+                httpProxy += ":" + httpProxyPort;
+            }
+            builder.parseHttpProxy(httpProxy)
+        } else if (Constants.HTTP_PROXY_PAC.equals(httpProxyMenu) && httpProxyPac.isNotEmpty()) {
+            builder.parseHttpProxy("pac:" + httpProxyPac)
+        }
         if (privateKey.isNotEmpty()) builder.parsePrivateKey(privateKey)
         return builder.build()
     }
@@ -122,6 +190,10 @@ class InterfaceProxy : BaseObservable, Parcelable {
         dest.writeStringList(includedApplications)
         dest.writeString(listenPort)
         dest.writeString(mtu)
+        dest.writeString(httpProxyMenu)
+        dest.writeString(httpProxyHostname)
+        dest.writeString(httpProxyPort)
+        dest.writeString(httpProxyPac)
         dest.writeString(privateKey)
     }