From 963ceb5d133a2a4404b834fddcff3cf0652cfeb7 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 21 Sep 2016 18:20:53 +0200 Subject: Don't use file provider for photo uris on android < N. fixes #2030 --- src/main/java/de/pixart/messenger/persistance/FileBackend.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/persistance') diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java index cb586b935..771bdddbd 100644 --- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java @@ -462,10 +462,14 @@ public class FileBackend { pathBuilder.append('/'); pathBuilder.append("Camera"); pathBuilder.append('/'); - pathBuilder.append(this.fileDateFormat.format(new Date()) + ".jpg"); + pathBuilder.append("IMG_" + this.fileDateFormat.format(new Date()) + ".jpg"); File file = new File(pathBuilder.toString()); file.getParentFile().mkdirs(); - return FileProvider.getUriForFile(mXmppConnectionService,"de.pixart.messenger.files",file); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + return FileProvider.getUriForFile(mXmppConnectionService,"de.pixart.messenger.files",file); + } else { + return Uri.fromFile(file); + } } public Avatar getPepAvatar(Uri image, int size, Bitmap.CompressFormat format) { -- cgit v1.2.3