msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

User agent for all connections

Browse Source
pull/198/head 1.1587
M66B 3 years ago
parent 54e0727c62
commit 78eec5ecb5
10 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File

1
app/src/main/java/eu/faircode/email/ActivityView.java
Unescape View File

@ -956,6 +956,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
urlConnection.setReadTimeout(UPDATE_TIMEOUT);
urlConnection.setConnectTimeout(UPDATE_TIMEOUT);
urlConnection.setDoOutput(false);
urlConnection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
urlConnection.connect();
int status = urlConnection.getResponseCode();

17
app/src/main/java/eu/faircode/email/ContactInfo.java
Unescape View File

@ -301,6 +301,7 @@ public class ContactInfo {
urlConnection.setDoOutput(false);
urlConnection.setReadTimeout(GRAVATAR_TIMEOUT);
urlConnection.setConnectTimeout(GRAVATAR_TIMEOUT);
urlConnection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
urlConnection.connect();
int status = urlConnection.getResponseCode();
@ -363,28 +364,28 @@ public class ContactInfo {
futures.add(executorFavicon.submit(new Callable<Bitmap>() {
@Override
public Bitmap call() throws Exception {
return parseFavicon(base, scaleToPixels);
return parseFavicon(base, scaleToPixels, context);
}
}));
futures.add(executorFavicon.submit(new Callable<Bitmap>() {
@Override
public Bitmap call() throws Exception {
return parseFavicon(www, scaleToPixels);
return parseFavicon(www, scaleToPixels, context);
}
}));
futures.add(executorFavicon.submit(new Callable<Bitmap>() {
@Override
public Bitmap call() throws Exception {
return getFavicon(new URL(base, "favicon.ico"), scaleToPixels);
return getFavicon(new URL(base, "favicon.ico"), scaleToPixels, context);
}
}));
futures.add(executorFavicon.submit(new Callable<Bitmap>() {
@Override
public Bitmap call() throws Exception {
return getFavicon(new URL(www, "favicon.ico"), scaleToPixels);
return getFavicon(new URL(www, "favicon.ico"), scaleToPixels, context);
}
}));
@ -466,7 +467,7 @@ public class ContactInfo {
return info;
}
private static Bitmap parseFavicon(URL base, int scaleToPixels) throws IOException {
private static Bitmap parseFavicon(URL base, int scaleToPixels, Context context) throws IOException {
Log.i("GET favicon " + base);
HttpsURLConnection connection = (HttpsURLConnection) base.openConnection();
connection.setRequestMethod("GET");
@ -479,6 +480,7 @@ public class ContactInfo {
return true;
}
});
connection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
connection.connect();
String response;
@ -551,7 +553,7 @@ public class ContactInfo {
futures.add(executorFavicon.submit(new Callable<Bitmap>() {
@Override
public Bitmap call() throws Exception {
return getFavicon(url, scaleToPixels);
return getFavicon(url, scaleToPixels, context);
}
}));
}
@ -571,7 +573,7 @@ public class ContactInfo {
}
@NonNull
private static Bitmap getFavicon(URL url, int scaleToPixels) throws IOException {
private static Bitmap getFavicon(URL url, int scaleToPixels, Context context) throws IOException {
Log.i("GET favicon " + url);
if (!"https".equals(url.getProtocol()))
@ -588,6 +590,7 @@ public class ContactInfo {
return true;
}
});
connection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
connection.connect();
try {

1
app/src/main/java/eu/faircode/email/DisconnectBlacklist.java
Unescape View File

@ -116,6 +116,7 @@ public class DisconnectBlacklist {
connection.setRequestMethod("GET");
connection.setReadTimeout(FETCH_TIMEOUT);
connection.setConnectTimeout(FETCH_TIMEOUT);
connection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
connection.connect();
try {

1
app/src/main/java/eu/faircode/email/EmailProvider.java
Unescape View File

@ -352,6 +352,7 @@ public class EmailProvider {
request.setReadTimeout(ISPDB_TIMEOUT);
request.setConnectTimeout(ISPDB_TIMEOUT);
request.setDoInput(true);
request.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
request.connect();
// https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser

1
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -7760,6 +7760,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
connection.setReadTimeout(timeout);
connection.setConnectTimeout(timeout);
connection.setInstanceFollowRedirects(true);
connection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
connection.connect();
try {

1
app/src/main/java/eu/faircode/email/FragmentOAuth.java
Unescape View File

@ -479,6 +479,7 @@ public class FragmentOAuth extends FragmentBase {
connection.setRequestMethod("GET");
connection.setReadTimeout(MAILRU_TIMEOUT);
connection.setConnectTimeout(MAILRU_TIMEOUT);
connection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
connection.connect();
try {

4
app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
Unescape View File

@ -419,8 +419,8 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
swIncognitoKeyboard.setChecked(prefs.getBoolean("incognito_keyboard", false));
swSecure.setChecked(prefs.getBoolean("secure", false));
tvGenericUserAgent.setText(WebViewEx.getUserAgent(getContext(), null));
swGenericUserAgent.setChecked(prefs.getBoolean("generic_ua", false));
tvGenericUserAgent.setText(WebViewEx.getUserAgent(getContext()));
swGenericUserAgent.setChecked(prefs.getBoolean("generic_ua", true));
swSafeBrowsing.setChecked(prefs.getBoolean("safe_browsing", false));
long time = prefs.getLong("disconnect_last", -1);

7
app/src/main/java/eu/faircode/email/IPInfo.java
Unescape View File

@ -51,17 +51,17 @@ public class IPInfo {
InetAddress address = DnsHelper.lookupMx(context, domain);
if (address == null)
throw new UnknownHostException();
return new Pair<>(domain, getOrganization(address));
return new Pair<>(domain, getOrganization(address, context));
} else {
String host = uri.getHost();
if (host == null)
throw new UnknownHostException();
InetAddress address = InetAddress.getByName(host);
return new Pair<>(host, getOrganization(address));
return new Pair<>(host, getOrganization(address, context));
}
}
private static Organization getOrganization(InetAddress address) throws IOException {
private static Organization getOrganization(InetAddress address, Context context) throws IOException {
synchronized (addressOrganization) {
if (addressOrganization.containsKey(address))
return addressOrganization.get(address);
@ -74,6 +74,7 @@ public class IPInfo {
connection.setRequestMethod("GET");
connection.setReadTimeout(FETCH_TIMEOUT);
connection.setConnectTimeout(FETCH_TIMEOUT);
connection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
connection.connect();
Organization organization = new Organization();

9
app/src/main/java/eu/faircode/email/ImageHelper.java
Unescape View File

@ -605,20 +605,13 @@ class ImageHelper {
int redirects = 0;
URL url = new URL(source);
while (true) {
// https://developer.chrome.com/multidevice/user-agent
String ua = "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 5 Build/LMY48B; wv)" +
" AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0" +
" Chrome/43.0.2357.65" +
" Mobile Safari/537.36";
urlConnection = (HttpURLConnection) url.openConnection();
urlConnection.setRequestMethod("GET");
urlConnection.setDoOutput(false);
urlConnection.setReadTimeout(timeout);
urlConnection.setConnectTimeout(timeout);
urlConnection.setInstanceFollowRedirects(true);
if (BuildConfig.DEBUG)
urlConnection.setRequestProperty("User-Agent", ua);
urlConnection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context));
urlConnection.connect();
int status = urlConnection.getResponseCode();

40
app/src/main/java/eu/faircode/email/WebViewEx.java
Unescape View File

@ -35,6 +35,7 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceManager;
import androidx.webkit.WebSettingsCompat;
import androidx.webkit.WebViewFeature;
@ -47,6 +48,8 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
private IWebView intf;
private Runnable onPageLoaded;
private static String userAgent = null;
private static final long PAGE_LOADED_FALLBACK_DELAY = 1500L; // milliseconds
public WebViewEx(Context context) {
@ -352,24 +355,37 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
}
}
@NonNull
static String getUserAgent(Context context) {
return getUserAgent(context, null);
}
@NonNull
static String getUserAgent(Context context, WebView webView) {
// https://developer.chrome.com/docs/multidevice/user-agent/#chrome-for-android
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean generic_ua = prefs.getBoolean("generic_ua", false);
if (generic_ua) {
boolean large = context.getResources().getConfiguration()
.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
return (large ? "Mozilla/5.0" : "Mozilla/5.0 (Mobile)");
} else
try {
boolean generic_ua = prefs.getBoolean("generic_ua", true);
if (generic_ua)
return getGenericUserAgent(context);
try {
if (userAgent == null) {
if (webView == null)
webView = new WebView(context);
return webView.getSettings().getUserAgentString();
} catch (Throwable ex) {
Log.e(ex);
return null;
userAgent = webView.getSettings().getUserAgentString();
}
return userAgent;
} catch (Throwable ex) {
Log.w(ex);
return getGenericUserAgent(context);
}
}
@NonNull
private static String getGenericUserAgent(Context context) {
boolean large = context.getResources().getConfiguration()
.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
return (large ? "Mozilla/5.0" : "Mozilla/5.0 (Mobile)");
}
interface IWebView {

Write Preview
Loading…
Cancel
Save