Update user agent (#1400)

* Rename user agent and update chrome for desktop, resolves #1387

* Rename more basic to desktop

* Apply spotless

1 files changed, 10 insertions, 10 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
index 24885fdf..81ade98f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
@@ -22,7 +22,7 @@ import com.pitchedapps.frost.activities.WebOverlayActivityBase
 import com.pitchedapps.frost.contracts.VideoViewHolder
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
 import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
@@ -32,7 +32,7 @@ import com.pitchedapps.frost.utils.isIndirectImageUrl
 import com.pitchedapps.frost.utils.isVideoUrl
 import com.pitchedapps.frost.utils.launchImageActivity
 import com.pitchedapps.frost.utils.launchWebOverlay
-import com.pitchedapps.frost.utils.launchWebOverlayBasic
+import com.pitchedapps.frost.utils.launchWebOverlayDesktop
 import com.pitchedapps.frost.views.FrostWebView
 
 /**
@@ -76,15 +76,15 @@ fun FrostWebView.requestWebOverlay(url: String): Boolean {
     if (!Prefs.overlayEnabled) return false
     if (context is WebOverlayActivityBase) {
         L.v { "Check web request from overlay" }
-        val shouldUseBasic = url.formattedFbUrl.shouldUseBasicAgent
+        val shouldUseDesktop = url.formattedFbUrl.shouldUseDesktopAgent
         //already overlay; manage user agent
-        if (userAgentString != USER_AGENT_BASIC && shouldUseBasic) {
-            L.i { "Switch to basic agent overlay" }
-            context.launchWebOverlayBasic(url)
+        if (userAgentString != USER_AGENT_DESKTOP && shouldUseDesktop) {
+            L.i { "Switch to desktop agent overlay" }
+            context.launchWebOverlayDesktop(url)
             return true
         }
-        if (userAgentString == USER_AGENT_BASIC && !shouldUseBasic) {
-            L.i { "Switch from basic agent" }
+        if (userAgentString == USER_AGENT_DESKTOP && !shouldUseDesktop) {
+            L.i { "Switch from desktop agent" }
             context.launchWebOverlay(url)
             return true
         }
@@ -103,9 +103,9 @@ val messageWhitelist: Set<String> =
     setOf(FbItem.MESSAGES, FbItem.CHAT, FbItem.FEED_MOST_RECENT, FbItem.FEED_TOP_STORIES)
         .mapTo(mutableSetOf(), FbItem::url)
 
-val String.shouldUseBasicAgent: Boolean
+val String.shouldUseDesktopAgent: Boolean
     get() = when {
-        contains("story.php") -> false // do not use basic for comment section
+        contains("story.php") -> false // do not use desktop for comment section
         contains("/events/") -> false // do not use for events (namely the map)
         contains("/messages") -> true // must use for messages
         else -> false // default to normal user agent