From b71c73565f551b5bcc2712c3cf8fdcd4a9562095 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 8 Aug 2019 00:08:22 -0700
Subject: Revert user agent changes

---
 .../main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt  |  6 ++----
 .../kotlin/com/pitchedapps/frost/settings/Behaviour.kt     |  7 +++++++
 .../kotlin/com/pitchedapps/frost/settings/Experimental.kt  | 14 --------------
 app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt   |  2 --
 .../main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt  |  4 ----
 5 files changed, 9 insertions(+), 24 deletions(-)

(limited to 'app/src/main/kotlin')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
index a83af46c..f6316470 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
@@ -16,8 +16,6 @@
  */
 package com.pitchedapps.frost.facebook
 
-import com.pitchedapps.frost.utils.Prefs
-
 /**
  * Created by Allan Wang on 2017-06-01.
  */
@@ -34,8 +32,8 @@ const val FB_HOME_URL = "${FB_URL_BASE}home.php"
 const val USER_AGENT_MOBILE =
     "Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A3000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36"
 // Desktop agent, for pages like messages
-val USER_AGENT_DESKTOP =
-    if (Prefs.singleUserAgent) USER_AGENT_MOBILE else "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Safari/537.36"
+const val USER_AGENT_DESKTOP =
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Safari/537.36"
 
 /**
  * Animation transition delay, just to ensure that the styles
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
index ba5b839b..1ab53a56 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
@@ -83,6 +83,13 @@ fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.exit_confirmation_desc
     }
 
+    checkbox(R.string.web_only, Prefs::webOnly, {
+        Prefs.webOnly = it
+        shouldRestartMain()
+    }) {
+        descRes = R.string.web_only_desc
+    }
+
     checkbox(R.string.analytics, Prefs::analytics, { Prefs.analytics = it }) {
         descRes = R.string.analytics_desc
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt
index 0762d87a..7aac7526 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt
@@ -52,20 +52,6 @@ fun SettingsActivity.getExperimentalPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.verbose_logging_desc
     }
 
-    checkbox(R.string.web_only, Prefs::webOnly, {
-        Prefs.webOnly = it
-        shouldRestartMain()
-    }) {
-        descRes = R.string.web_only_desc
-    }
-
-    checkbox(R.string.single_user_agent, Prefs::singleUserAgent, {
-        Prefs.singleUserAgent
-        shouldRestartMain()
-    }) {
-        descRes = R.string.single_user_agent_desc
-    }
-
     plainText(R.string.restart_frost) {
         descRes = R.string.restart_frost_desc
         onClick = {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index 3f844653..f17645d0 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -193,8 +193,6 @@ object Prefs : KPref() {
 
     var webOnly: Boolean by kpref("web_only", false)
 
-    var singleUserAgent: Boolean by kpref("single_user_agent", false)
-
     inline val mainActivityLayout: MainActivityLayout
         get() = MainActivityLayout(mainActivityLayoutType)
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index 14f49bd1..09796b15 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -33,7 +33,6 @@ import com.pitchedapps.frost.db.CookieEntity
 import com.pitchedapps.frost.facebook.FB_LOGIN_URL
 import com.pitchedapps.frost.facebook.FB_USER_MATCHER
 import com.pitchedapps.frost.facebook.FbCookie
-import com.pitchedapps.frost.facebook.USER_AGENT_MOBILE
 import com.pitchedapps.frost.facebook.get
 import com.pitchedapps.frost.injectors.CssHider
 import com.pitchedapps.frost.injectors.jsInject
@@ -58,9 +57,6 @@ class LoginWebView @JvmOverloads constructor(
     @SuppressLint("SetJavaScriptEnabled")
     private fun setupWebview() {
         settings.javaScriptEnabled = true
-        if (Prefs.singleUserAgent) {
-            settings.userAgentString = USER_AGENT_MOBILE
-        }
         setLayerType(View.LAYER_TYPE_HARDWARE, null)
         webViewClient = LoginClient()
         webChromeClient = LoginChromeClient()
-- 
cgit v1.2.3