moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-25 08:58:55 -05:00
Code Issues Releases Wiki Activity

Revert "use file provider on android M as well"

Browse Source 
This reverts commit a4020e85f6.
This commit is contained in:
Daniel Gultsch 2016-10-30 20:27:39 +01:00
parent a44f35ed69
commit ffebb4677a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View File

@ -440,7 +440,7 @@ public class FileBackend {
public Uri getTakePhotoUri() { public Uri getTakePhotoUri() {
File file = new File(getTakePhotoPath()+"IMG_" + this.IMAGE_DATE_FORMAT.format(new Date()) + ".jpg"); File file = new File(getTakePhotoPath()+"IMG_" + this.IMAGE_DATE_FORMAT.format(new Date()) + ".jpg");
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return FileProvider.getUriForFile(mXmppConnectionService, CONVERSATIONS_FILE_PROVIDER, file); return FileProvider.getUriForFile(mXmppConnectionService, CONVERSATIONS_FILE_PROVIDER, file);
} else { } else {
return Uri.fromFile(file); return Uri.fromFile(file);

2
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View File

@ -703,7 +703,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
mime = "*/*"; mime = "*/*";
} }
Uri uri; Uri uri;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
try { try {
uri = FileProvider.getUriForFile(activity, FileBackend.CONVERSATIONS_FILE_PROVIDER, file); uri = FileProvider.getUriForFile(activity, FileBackend.CONVERSATIONS_FILE_PROVIDER, file);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {