Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 14:46:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Select browser on opening link

Browse Source
This commit is contained in:
M66B
2022-06-15 15:36:29 +02:00
parent 00b04423de
commit d494c31e3c
15 changed files with 209 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/Helper.java
View File

@@ -410,7 +410,7 @@ public class Helper {
return permissions.toArray(new String[0]);
}
static boolean hasCustomTabs(Context context, Uri uri) {
private static boolean hasCustomTabs(Context context, Uri uri, String pkg) {
String scheme = (uri == null ? null : uri.getScheme());
if (!"http".equals(scheme) && !"https".equals(scheme))
return false;
@@ -423,6 +423,8 @@ public class Helper {
Intent intent = new Intent();
intent.setAction(ACTION_CUSTOM_TABS_CONNECTION);
intent.setPackage(info.activityInfo.packageName);
if (pkg != null && !pkg.equals(info.activityInfo.packageName))
continue;
if (pm.resolveService(intent, 0) != null)
return true;
}
@@ -821,8 +823,12 @@ public class Helper {
return;
}
boolean has = hasCustomTabs(context, uri);
Log.i("View=" + uri + " browse=" + browse + " task=" + task + " has=" + has);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String open_with_pkg = prefs.getString("open_with_pkg", null);
boolean has = hasCustomTabs(context, uri, open_with_pkg);
Log.i("View=" + uri + " browse=" + browse + " task=" + task + " pkg=" + open_with_pkg + " has=" + has);
if (browse || !has) {
try {
@@ -833,12 +839,14 @@ public class Helper {
view.setDataAndType(uri, mimeType);
if (task)
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (UriHelper.isHyperLink(uri) &&
open_with_pkg != null && isInstalled(context, open_with_pkg))
view.setPackage(open_with_pkg);
context.startActivity(view);
} catch (Throwable ex) {
reportNoViewer(context, uri, ex);
}
} else {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean navbar_colorize = prefs.getBoolean("navbar_colorize", false);
int colorPrimary = resolveColor(context, R.attr.colorPrimary);
int colorPrimaryDark = resolveColor(context, R.attr.colorPrimaryDark);
@@ -881,6 +889,10 @@ public class Helper {
CustomTabsIntent customTabsIntent = builder.build();
customTabsIntent.intent.putExtra(Browser.EXTRA_HEADERS, headers);
if (open_with_pkg != null && isInstalled(context, open_with_pkg))
customTabsIntent.intent.setPackage(open_with_pkg);
try {
customTabsIntent.launchUrl(context, uri);
} catch (Throwable ex) {