From 1c0b03492c7df1677ddc48d47b47eacfc0f41cb8 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 2 Jul 2019 00:08:35 -0700 Subject: Make pymk dependent, resolves #1447 --- app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 4 ++++ .../kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'app/src/main/kotlin') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt index 8ad0d432..0574aeae 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt @@ -327,6 +327,10 @@ val dependentSegments = arrayOf( * Editing images */ "/confirmation/?", + /** + * Remove entry from "people you may know" + */ + "/pymk/xout/", /* * Facebook messages have the following cases for the tid query * mid* or id* for newer threads, which can be launched in new windows 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 b06208a6..4aa43b49 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt @@ -78,16 +78,16 @@ fun FrostWebView.requestWebOverlay(url: String): Boolean { val shouldUseDesktop = url.formattedFbUrl.shouldUseDesktopAgent //already overlay; manage user agent if (userAgentString != USER_AGENT_DESKTOP && shouldUseDesktop) { - L.i { "Switch to desktop agent overlay" } + L._i { "Switch to desktop agent overlay" } context.launchWebOverlayDesktop(url) return true } if (userAgentString == USER_AGENT_DESKTOP && !shouldUseDesktop) { - L.i { "Switch from desktop agent" } + L._i { "Switch from desktop agent" } context.launchWebOverlay(url) return true } - L.i { "return false switch" } + L._i { "return false switch" } return false } L.v { "Request web overlay passed" } -- cgit v1.2.3