Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove fake user agent

This commit is contained in:
Thomas 2022-11-27 11:48:14 +01:00
parent 6f8ca561bf
commit 6f288acbc9
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
View File

@ -136,8 +136,8 @@ public class WebviewConnectActivity extends BaseActivity {
clearCookies(WebviewConnectActivity.this); clearCookies(WebviewConnectActivity.this);
binding.webviewConnect.getSettings().setJavaScriptEnabled(true); binding.webviewConnect.getSettings().setJavaScriptEnabled(true);
String user_agent = sharedpreferences.getString(getString(R.string.SET_CUSTOM_USER_AGENT), Helper.USER_AGENT); // String user_agent = sharedpreferences.getString(getString(R.string.SET_CUSTOM_USER_AGENT), Helper.USER_AGENT);
binding.webviewConnect.getSettings().setUserAgentString(user_agent); // binding.webviewConnect.getSettings().setUserAgentString(user_agent);
binding.webviewConnect.getSettings().setDomStorageEnabled(true); binding.webviewConnect.getSettings().setDomStorageEnabled(true);
CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webviewConnect, true); CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webviewConnect, true);

8
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -287,7 +287,7 @@ public class Helper {
public static final String VALUE_TRENDS = "VALUE_TRENDS"; public static final String VALUE_TRENDS = "VALUE_TRENDS";
public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0"; //public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0";
public static final String REDIRECT_CONTENT_WEB = "fedilab://backtofedilab"; public static final String REDIRECT_CONTENT_WEB = "fedilab://backtofedilab";
public static final String REDIRECT_CONTENT = "urn:ietf:wg:oauth:2.0:oob"; public static final String REDIRECT_CONTENT = "urn:ietf:wg:oauth:2.0:oob";
public static final String APP_OAUTH_SCOPES = "read write"; public static final String APP_OAUTH_SCOPES = "read write";
@ -439,8 +439,8 @@ public class Helper {
webView.getSettings().setLoadsImagesAutomatically(true); webView.getSettings().setLoadsImagesAutomatically(true);
webView.getSettings().setSupportMultipleWindows(false); webView.getSettings().setSupportMultipleWindows(false);
webView.getSettings().setMediaPlaybackRequiresUserGesture(true); webView.getSettings().setMediaPlaybackRequiresUserGesture(true);
String user_agent = sharedpreferences.getString(activity.getString(R.string.SET_CUSTOM_USER_AGENT), USER_AGENT); //String user_agent = sharedpreferences.getString(activity.getString(R.string.SET_CUSTOM_USER_AGENT), USER_AGENT);
webView.getSettings().setUserAgentString(user_agent); // webView.getSettings().setUserAgentString(user_agent);
boolean cookies = sharedpreferences.getBoolean(activity.getString(R.string.SET_COOKIES), false); boolean cookies = sharedpreferences.getBoolean(activity.getString(R.string.SET_COOKIES), false);
CookieManager cookieManager = CookieManager.getInstance(); CookieManager cookieManager = CookieManager.getInstance();
cookieManager.setAcceptThirdPartyCookies(webView, cookies); cookieManager.setAcceptThirdPartyCookies(webView, cookies);
@ -1761,7 +1761,7 @@ public class Helper {
httpURLConnection = (HttpURLConnection) url.openConnection(proxy); httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
else else
httpURLConnection = (HttpURLConnection) url.openConnection(); httpURLConnection = (HttpURLConnection) url.openConnection();
httpURLConnection.setRequestProperty("User-Agent", USER_AGENT); // httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
int responseCode = httpURLConnection.getResponseCode(); int responseCode = httpURLConnection.getResponseCode();
// always check HTTP response code first // always check HTTP response code first

5
app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
View File

@ -16,7 +16,6 @@ package app.fedilab.android.helper;
import static app.fedilab.android.BaseMainActivity.currentAccount; import static app.fedilab.android.BaseMainActivity.currentAccount;
import static app.fedilab.android.helper.Helper.USER_AGENT;
import static app.fedilab.android.helper.ThemeHelper.linkColor; import static app.fedilab.android.helper.ThemeHelper.linkColor;
import android.content.ClipData; import android.content.ClipData;
@ -321,7 +320,7 @@ public class SpannableHelper {
HttpsURLConnection httpsURLConnection = (HttpsURLConnection) finalUrlCheck.openConnection(); HttpsURLConnection httpsURLConnection = (HttpsURLConnection) finalUrlCheck.openConnection();
httpsURLConnection.setConnectTimeout(10 * 1000); httpsURLConnection.setConnectTimeout(10 * 1000);
httpsURLConnection.setRequestProperty("http.keepAlive", "false"); httpsURLConnection.setRequestProperty("http.keepAlive", "false");
httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT); // httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
httpsURLConnection.setRequestMethod("HEAD"); httpsURLConnection.setRequestMethod("HEAD");
httpsURLConnection.setInstanceFollowRedirects(false); httpsURLConnection.setInstanceFollowRedirects(false);
if (httpsURLConnection.getResponseCode() == 301 || httpsURLConnection.getResponseCode() == 302) { if (httpsURLConnection.getResponseCode() == 301 || httpsURLConnection.getResponseCode() == 302) {
@ -550,7 +549,7 @@ public class SpannableHelper {
HttpsURLConnection httpsURLConnection = (HttpsURLConnection) finalUrlCheck.openConnection(); HttpsURLConnection httpsURLConnection = (HttpsURLConnection) finalUrlCheck.openConnection();
httpsURLConnection.setConnectTimeout(10 * 1000); httpsURLConnection.setConnectTimeout(10 * 1000);
httpsURLConnection.setRequestProperty("http.keepAlive", "false"); httpsURLConnection.setRequestProperty("http.keepAlive", "false");
httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT); //httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
httpsURLConnection.setRequestMethod("HEAD"); httpsURLConnection.setRequestMethod("HEAD");
httpsURLConnection.setInstanceFollowRedirects(false); httpsURLConnection.setInstanceFollowRedirects(false);
if (httpsURLConnection.getResponseCode() == 301 || httpsURLConnection.getResponseCode() == 302) { if (httpsURLConnection.getResponseCode() == 301 || httpsURLConnection.getResponseCode() == 302) {

4
app/src/main/java/app/fedilab/android/ui/fragment/media/FragmentMedia.java
View File

@ -245,8 +245,8 @@ public class FragmentMedia extends Fragment {
webview_video.setWebChromeClient(fedilabWebChromeClient); webview_video.setWebChromeClient(fedilabWebChromeClient);
webview_video.getSettings().setDomStorageEnabled(true); webview_video.getSettings().setDomStorageEnabled(true);
webview_video.getSettings().setAppCacheEnabled(true); webview_video.getSettings().setAppCacheEnabled(true);
String user_agent = sharedpreferences.getString(getString(R.string.SET_CUSTOM_USER_AGENT), Helper.USER_AGENT); // String user_agent = sharedpreferences.getString(getString(R.string.SET_CUSTOM_USER_AGENT), Helper.USER_AGENT);
webview_video.getSettings().setUserAgentString(user_agent); // webview_video.getSettings().setUserAgentString(user_agent);
webview_video.getSettings().setMediaPlaybackRequiresUserGesture(false); webview_video.getSettings().setMediaPlaybackRequiresUserGesture(false);
webview_video.setWebViewClient(new FedilabWebViewClient(requireActivity())); webview_video.setWebViewClient(new FedilabWebViewClient(requireActivity()));
webview_video.loadUrl(attachment.url); webview_video.loadUrl(attachment.url);