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

Prevent crash

This commit is contained in:
M66B 2019-04-05 14:12:56 +02:00
parent 2bfee5ff6e
commit 5bb959448c
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2431,13 +2431,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override @Override
public void onPageFinished(WebView view, String url) { public void onPageFinished(WebView view, String url) {
PrintManager printManager = (PrintManager) context.getSystemService(Context.PRINT_SERVICE); try {
String jobName = context.getString(R.string.app_name); PrintManager printManager = (PrintManager) context.getSystemService(Context.PRINT_SERVICE);
if (!TextUtils.isEmpty(data.message.subject)) String jobName = context.getString(R.string.app_name);
jobName += " - " + data.message.subject; if (!TextUtils.isEmpty(data.message.subject))
PrintDocumentAdapter adapter = printWebView.createPrintDocumentAdapter(jobName); jobName += " - " + data.message.subject;
printManager.print(jobName, adapter, new PrintAttributes.Builder().build()); PrintDocumentAdapter adapter = printWebView.createPrintDocumentAdapter(jobName);
printWebView = null; printManager.print(jobName, adapter, new PrintAttributes.Builder().build());
} catch (Throwable ex) {
Log.e(ex);
} finally {
printWebView = null;
}
} }
}); });
@ -2557,6 +2562,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.getMenu().findItem(R.id.menu_share).setEnabled(data.message.content); popupMenu.getMenu().findItem(R.id.menu_share).setEnabled(data.message.content);
popupMenu.getMenu().findItem(R.id.menu_print).setEnabled(hasWebView && data.message.content); popupMenu.getMenu().findItem(R.id.menu_print).setEnabled(hasWebView && data.message.content);
popupMenu.getMenu().findItem(R.id.menu_print).setVisible(Helper.canPrint(context));
popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers); popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers);
popupMenu.getMenu().findItem(R.id.menu_show_headers).setEnabled(data.message.uid != null); popupMenu.getMenu().findItem(R.id.menu_show_headers).setEnabled(data.message.uid != null);

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

@ -1035,6 +1035,11 @@ public class Helper {
return false; return false;
} }
static boolean canPrint(Context context) {
PackageManager pm = context.getPackageManager();
return pm.hasSystemFeature("android.software.print");
}
public static String getFingerprint(Context context) { public static String getFingerprint(Context context) {
try { try {
PackageManager pm = context.getPackageManager(); PackageManager pm = context.getPackageManager();