From a854dcc471078f4e21916730abb5d5d75dd7b03c Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 29 Aug 2017 20:52:53 -0400 Subject: Fix/message loading (#241) * Switch basic user agent * Disable js * Disable clients * Disable edge chat blacklisting * Update theme for message highlights --- app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt | 2 +- .../main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt | 2 +- app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt | 1 + 3 files changed, 3 insertions(+), 2 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 4d5127c5..65fae493 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt @@ -9,5 +9,5 @@ const val FB_URL_BASE = "https://m.facebook.com/" fun PROFILE_PICTURE_URL(id: Long) = "https://graph.facebook.com/$id/picture?type=large" const val USER_AGENT_FULL = "Mozilla/5.0 (Linux; Android 4.4.2; en-us; SAMSUNG SM-G900T Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.6 Chrome/28.0.1500.94 Mobile Safari/537.36" -const val USER_AGENT_BASIC = "Mozilla/5.0 (Linux; U; Android 2.3.3; en-gb; Nexus S Build/GRI20) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1" +const val USER_AGENT_BASIC = "Mozilla/5.0 (BB10; Kbd) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.1.0.4633 Mobile Safari/537.10+" const val USER_AGENT_MESSENGER = "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" \ No newline at end of file diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt index 2dfdda89..34022c25 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt @@ -23,7 +23,7 @@ private val blankResource: WebResourceResponse by lazy { WebResourceResponse("te //these hosts will redirect to a blank resource private val blacklistHost: Set = setOf( - "edge-chat.facebook.com" +// "edge-chat.facebook.com" ) //these hosts will return null and skip logging 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 d188d629..73d2476c 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt @@ -49,6 +49,7 @@ class LoginWebView @JvmOverloads constructor( fun loadLogin(progressCallback: (Int) -> Unit, loginCallback: (CookieModel) -> Unit) { this.progressCallback = progressCallback this.loginCallback = loginCallback + L.d("Begin loading login") loadUrl(LOGIN_URL) } -- cgit v1.2.3