Mirrors/Frost-for-Facebook
1
0
Fork 0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-10 04:52:38 +01:00
Code Issues Releases Activity

Revert user agent changes

Browse Source
This commit is contained in:
Allan Wang 2019-08-08 00:08:22 -07:00
parent 7ed4ba701e
commit b71c73565f
No known key found for this signature in database
GPG Key ID: C93E3F9C679D7A56
10 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
View File

@ -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

7
app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
View File

@ -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
}

14
app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt
View File

@ -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 = {

2
app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
View File

@ -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)

4
app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
View File

@ -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()

2
app/src/main/play/en-US/whatsnew
View File

@ -5,4 +5,4 @@ v2.3.2
* Disable bugsnag completely when opting out of analytics
* Filter urls before sending to other apps
* Allow hiding main fab (see settings > newsfeed)
* Add many options under settings > experimental to help with recent
* Add option to disable non web based behaviour (settings > behaviour)

5
app/src/main/res/values/strings_pref_behaviour.xml
View File

@ -19,6 +19,11 @@
<string name="force_message_bottom_desc">When loading a message thread, trigger a scroll to the bottom of the page rather than loading the page as is.</string>
<string name="enable_pip">Enable PIP</string>
<string name="enable_pip_desc">Enable picture in picture videos</string>
<!-- Disable translation as this is still experimental -->
<string name="web_only" translatable="false">Web Only</string>
<string name="web_only_desc" translatable="false">Having troubles? Enable to use web exclusive features. All parsing and background services will be disabled.</string>
<string name="leave_web_only_title" translatable="false">Leave web only mode</string>
<string name="leave_web_only_desc" translatable="false">Currently in web only mode. Would you like to disable it to continue?</string>
<string name="autoplay_settings">Autoplay Settings</string>
<string name="autoplay_settings_desc">Open Facebook\'s auto play settings. Note that it must be disabled for PIP to work.</string>
<string name="exit_confirmation">Exit Confirmation</string>

9
app/src/main/res/values/strings_pref_experimental.xml
View File

@ -8,13 +8,4 @@
<string name="verbose_logging_desc">Enable verbose logging to help with crash reports. Logging will only be sent once an error is encountered, so repeat the issue to notify the dev. This will automatically be disabled if the app restarts.</string>
<string name="restart_frost">Restart Frost</string>
<string name="restart_frost_desc">Launch a cold restart for the application.</string>
<!-- Disable translation as this is still experimental -->
<string name="web_only" translatable="false">Web Only</string>
<string name="web_only_desc" translatable="false">Having troubles? Enable to use web exclusive features. All parsing and background services will be disabled.</string>
<string name="leave_web_only_title" translatable="false">Leave web only mode</string>
<string name="leave_web_only_desc" translatable="false">Currently in web only mode. Would you like to disable it to continue?</string>
<string name="single_user_agent" translatable="false">Single user agent</string>
<string name="single_user_agent_desc" translatable="false">Use one user agent across entire app</string>
</resources>

2
app/src/main/res/xml/frost_changelog.xml
View File

@ -13,7 +13,7 @@
<item text="Disable bugsnag completely when opting out of analytics" />
<item text="Filter urls before sending to other apps" />
<item text="Allow hiding main fab (see settings > newsfeed)" />
<item text="Add many options under settings > experimental to help with recent" />
<item text="Add option to disable non web based behaviour (settings > behaviour)" />
<item text="" />
<version title="v2.3.1" />

2
docs/Changelog.md
View File

@ -6,7 +6,7 @@
* Disable bugsnag completely when opting out of analytics
* Filter urls before sending to other apps
* Allow hiding main fab (see settings > newsfeed)
* Add many options under settings > experimental to help with recent
* Add option to disable non web based behaviour (settings > behaviour)
## v2.3.1
* Hide all story panels if enabled