mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed view/package in some cases

This commit is contained in:
M66B 2022-06-17 15:54:50 +02:00
parent 88ea3f56c3
commit 353a38ca2f
2 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/ActivityBase.java
View File

@ -534,7 +534,16 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
} catch (Throwable ex) {
if (this instanceof ActivityMain)
throw ex;
Helper.reportNoViewer(this, intent, ex);
if (intent.getPackage() == null)
Helper.reportNoViewer(this, intent, ex);
else {
intent.setPackage(null);
try {
super.startActivity(intent);
} catch (Throwable exex) {
Helper.reportNoViewer(this, intent, exex);
}
}
}
}
@ -545,7 +554,16 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
Log.logExtras(intent);
super.startActivityForResult(intent, requestCode);
} catch (Throwable ex) {
Helper.reportNoViewer(this, intent, ex);
if (intent.getPackage() == null)
Helper.reportNoViewer(this, intent, ex);
else {
intent.setPackage(null);
try {
super.startActivityForResult(intent, requestCode);
} catch (Throwable exex) {
Helper.reportNoViewer(this, intent, exex);
}
}
}
}

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

@ -412,10 +412,6 @@ public class Helper {
}
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;
PackageManager pm = context.getPackageManager();
Intent view = new Intent(Intent.ACTION_VIEW, uri);
@ -826,12 +822,27 @@ public class Helper {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String open_with_pkg = prefs.getString("open_with_pkg", null);
boolean open_with_tabs = prefs.getBoolean("open_with_tabs", true);
boolean has = hasCustomTabs(context, uri, open_with_pkg);
if (!UriHelper.isHyperLink(uri)) {
open_with_pkg = null;
open_with_tabs = false;
}
Log.i("View=" + uri + " browse=" + browse + " task=" + task + " pkg=" + open_with_pkg + " has=" + has);
if (open_with_pkg != null && !isInstalled(context, open_with_pkg)) {
open_with_pkg = null;
open_with_tabs = false;
}
if (browse || !has) {
if (open_with_tabs && !hasCustomTabs(context, uri, open_with_pkg))
open_with_tabs = false;
Log.i("View=" + uri +
" browse=" + browse +
" task=" + task +
" pkg=" + open_with_pkg + ":" + open_with_tabs);
if (browse || !open_with_tabs) {
try {
Intent view = new Intent(Intent.ACTION_VIEW);
if (mimeType == null)
@ -840,9 +851,7 @@ 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);
view.setPackage(open_with_pkg);
context.startActivity(view);
} catch (Throwable ex) {
reportNoViewer(context, uri, ex);
@ -890,9 +899,7 @@ 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);
customTabsIntent.intent.setPackage(open_with_pkg);
try {
customTabsIntent.launchUrl(context, uri);