1 files changed, 53 insertions, 44 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index 9b0f02696..534eaafe3 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -12,6 +12,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.support.v4.content.FileProvider;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -774,54 +775,62 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		return view;
 	}
 
-    public void openDownloadable(Message message) {
-        DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
-        if (!file.exists()) {
-            Toast.makeText(activity, R.string.file_deleted, Toast.LENGTH_SHORT).show();
-            return;
-        }
-        String mime = file.getMimeType();
-
-        if (mime.startsWith("image/")) {
-            Intent intent = new Intent(getContext(), ShowFullscreenMessageActivity.class);
-            intent.putExtra("image", Uri.fromFile(file));
-            try {
-                activity.startActivity(intent);
-                return;
-            } catch (ActivityNotFoundException e) {
-                //ignored
-            }
-        } else if (mime.startsWith("video/")) {
-            Intent intent = new Intent(getContext(), ShowFullscreenMessageActivity.class);
-            intent.putExtra("video", Uri.fromFile(file));
-            try {
-                activity.startActivity(intent);
-                return;
-            } catch (ActivityNotFoundException e) {
-                //ignored
-            }
-        }
-        Intent openIntent = new Intent(Intent.ACTION_VIEW);
-        if (mime == null) {
-            mime = "*/*";
+  public void openDownloadable(Message message) {
+      DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
+      if (!file.exists()) {
+          Toast.makeText(activity, R.string.file_deleted, Toast.LENGTH_SHORT).show();
+          return;
+      }
+      String mime = file.getMimeType();
+      if (mime.startsWith("image/")) {
+          Intent intent = new Intent(getContext(), ShowFullscreenMessageActivity.class);
+          intent.putExtra("image", Uri.fromFile(file));
+          try {
+              activity.startActivity(intent);
+              return;
+          } catch (ActivityNotFoundException e) {
+              //ignored
+          }
+      } else if (mime.startsWith("video/")) {
+          Intent intent = new Intent(getContext(), ShowFullscreenMessageActivity.class);
+          intent.putExtra("video", Uri.fromFile(file));
+          try {
+              activity.startActivity(intent);
+              return;
+          } catch (ActivityNotFoundException e) {
+              //ignored
+          }
+      }
+      Intent openIntent = new Intent(Intent.ACTION_VIEW);
+      if (mime == null) {
+          mime = "*/*";
+      }
+      Uri uri;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        try {
+          uri = FileProvider.getUriForFile(activity, "de.pixart.messenger.files", file);
+        } catch (IllegalArgumentException e) {
+          Toast.makeText(activity,activity.getString(R.string.no_permission_to_access_x,file.getAbsolutePath()), Toast.LENGTH_SHORT).show();
+          return;
         }
-        Uri uri = FileProvider.getUriForFile(activity,"de.pixart.messenger.files",file);
         openIntent.setDataAndType(uri, mime);
         openIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        PackageManager manager = activity.getPackageManager();
-        List<ResolveInfo> infos = manager.queryIntentActivities(openIntent, 0);
-        if (infos.size() == 0) {
-            openIntent.setDataAndType(Uri.fromFile(file), "*/*");
-        }
-        try {
-            getContext().startActivity(openIntent);
-            return;
-        } catch (ActivityNotFoundException e) {
-            //ignored
-        }
-        Toast.makeText(activity, R.string.no_application_found_to_open_file, Toast.LENGTH_SHORT).show();
-
+      } else {
+        uri = Uri.fromFile(file);
+      }
+      openIntent.setDataAndType(uri, mime);
+      PackageManager manager = activity.getPackageManager();
+      List<ResolveInfo> info = manager.queryIntentActivities(openIntent, 0);
+      if (info.size() == 0) {
+        openIntent.setDataAndType(Uri.fromFile(file),"*/*");
+      }
+      try {
+        getContext().startActivity(openIntent);
+      }  catch (ActivityNotFoundException e) {
+        Toast.makeText(activity,R.string.no_application_found_to_open_file,Toast.LENGTH_SHORT).show();
+      }
     }
+  }
 
 	public void showLocation(Message message) {
 		for(Intent intent : GeoHelper.createGeoIntentsFromMessage(message)) {