add a checkbox to control the User-Agent override

cernekee · Aug 10, 2018 · 697cad1 · 697cad1
1 parent 6959e0d
commit 697cad1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/app/src/main/java/app/openconnect/core/OpenConnectManagementThread.java b/app/src/main/java/app/openconnect/core/OpenConnectManagementThread.java
@@ -707,11 +707,12 @@ private boolean runVPN() {
 		mCacheDir = mContext.getCacheDir().getPath();
 		extractBinaries();
 
-		String userAgent = getStringPref("reported_user_agent");
+		String userAgent = getBoolPref("reported_user_agent_override")
+			? getStringPref("reported_user_agent") : null;
 
 		setState(STATE_CONNECTING);
 		synchronized (mMainloopLock) {
-			if (userAgent.length() > 0)
+			if (userAgent != null)
 				mOC = new AndroidOC(userAgent);
 			else
 				mOC = new AndroidOC();

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -164,8 +164,10 @@
     <string name="unknown">Unknown</string>
     <string name="batch_mode">Batch mode</string>
     <string name="reported_os">Reported OS</string>
+    <string name="reported_user_agent_override">Override reported User-Agent</string>
+    <string name="reported_user_agent_override_summary">Use a custom HTTP User-Agent header, instead of OpenConnect\'s default; some servers are picky about this value.</string>
     <string name="reported_user_agent">Reported User-Agent</string>
-    <string name="reported_user_agent_summary">Override the HTTP User-Agent header.\n\nSome Cisco servers accept \"Cisco AnyConnect VPN Agent\"; some Juniper servers accept \"ncsvc\".</string>
+    <string name="reported_user_agent_summary">Some Cisco servers accept \"Cisco AnyConnect VPN Agent\"; some Juniper servers accept \"ncsvc\".</string>
     <string name="custom_csd_wrapper">Custom CSD wrapper</string>
     <string name="split_tunnel_mode">Split tunnel mode</string>
     <string name="split_tunnel_networks">Split tunnel networks</string>

diff --git a/app/src/main/res/xml/pref_openconnect.xml b/app/src/main/res/xml/pref_openconnect.xml
@@ -79,12 +79,18 @@
             android:entries="@array/reported_os_entries"
             android:entryValues="@array/reported_os_values"
             android:defaultValue="android" />
+        <CheckBoxPreference
+            android:key="reported_user_agent_override"
+            android:title="@string/reported_user_agent_override"
+            android:summary="@string/reported_user_agent_override_summary"
+            android:defaultValue="false" />
         <EditTextPreference
             android:key="reported_user_agent"
             android:title="@string/reported_user_agent"
+            android:dependency="reported_user_agent_override"
             android:dialogTitle="@string/reported_user_agent"
             android:dialogMessage="@string/reported_user_agent_summary"
-            android:defaultValue="" />
+            android:defaultValue="OpenConnect VPN Agent (Java)" />
         <app.openconnect.ShowTextPreference
             android:key="custom_csd_wrapper"
             android:title="@string/custom_csd_wrapper"