mirror of https://github.com/M66B/FairEmail.git
Fixed no viewer message
This commit is contained in:
parent
1d97c90968
commit
28d93cf785
|
@ -98,15 +98,26 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
// Build file name
|
||||||
|
File dir = new File(context.getCacheDir(), "attachments");
|
||||||
|
dir.mkdir();
|
||||||
|
final File file = new File(dir, TextUtils.isEmpty(attachment.name) ? "noname" : attachment.name);
|
||||||
|
|
||||||
|
// Check if viewer available
|
||||||
|
Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||||
|
intent.setData(Uri.fromFile(file));
|
||||||
|
PackageManager pm = context.getPackageManager();
|
||||||
|
if (pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) == null) {
|
||||||
|
Toast.makeText(context, R.string.title_no_viewer, Toast.LENGTH_LONG).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// View
|
// View
|
||||||
executor.submit(new Runnable() {
|
executor.submit(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
// Build file name
|
// Create file
|
||||||
File dir = new File(context.getCacheDir(), "attachments");
|
|
||||||
dir.mkdir();
|
|
||||||
File file = new File(dir, TextUtils.isEmpty(attachment.name) ? "" : attachment.name);
|
|
||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
file.createNewFile();
|
file.createNewFile();
|
||||||
|
|
||||||
|
@ -135,12 +146,8 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
|
||||||
for (ResolveInfo resolveInfo : targets)
|
for (ResolveInfo resolveInfo : targets)
|
||||||
context.grantUriPermission(resolveInfo.activityInfo.packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
context.grantUriPermission(resolveInfo.activityInfo.packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||||
|
|
||||||
// Start view
|
// Start viewer
|
||||||
Log.i(Helper.TAG, "Targets=" + targets.size());
|
context.startActivity(intent);
|
||||||
if (targets.size() > 0)
|
|
||||||
context.startActivity(intent);
|
|
||||||
else
|
|
||||||
Toast.makeText(context, R.string.title_no_viewer, Toast.LENGTH_LONG).show();
|
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
Log.i(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
|
Log.i(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue