|
|
|
@ -5,55 +5,43 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
package com.todoroo.astrid.files;
|
|
|
|
package com.todoroo.astrid.files;
|
|
|
|
|
|
|
|
|
|
|
|
import static android.app.Activity.RESULT_OK;
|
|
|
|
|
|
|
|
import static com.google.common.base.Strings.isNullOrEmpty;
|
|
|
|
|
|
|
|
import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_STORAGE;
|
|
|
|
|
|
|
|
import static org.tasks.dialogs.AddAttachmentDialog.newAddAttachmentDialog;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import android.annotation.SuppressLint;
|
|
|
|
import android.annotation.SuppressLint;
|
|
|
|
import android.app.Activity;
|
|
|
|
|
|
|
|
import android.content.ActivityNotFoundException;
|
|
|
|
|
|
|
|
import android.content.ContentResolver;
|
|
|
|
|
|
|
|
import android.content.Context;
|
|
|
|
import android.content.Context;
|
|
|
|
import android.content.Intent;
|
|
|
|
import android.content.Intent;
|
|
|
|
import android.media.MediaPlayer;
|
|
|
|
|
|
|
|
import android.net.Uri;
|
|
|
|
import android.net.Uri;
|
|
|
|
import android.os.Bundle;
|
|
|
|
import android.os.Bundle;
|
|
|
|
import androidx.annotation.Nullable;
|
|
|
|
|
|
|
|
import android.text.TextUtils;
|
|
|
|
|
|
|
|
import android.view.LayoutInflater;
|
|
|
|
import android.view.LayoutInflater;
|
|
|
|
import android.view.View;
|
|
|
|
import android.view.View;
|
|
|
|
import android.view.ViewGroup;
|
|
|
|
import android.view.ViewGroup;
|
|
|
|
import android.webkit.MimeTypeMap;
|
|
|
|
|
|
|
|
import android.widget.LinearLayout;
|
|
|
|
import android.widget.LinearLayout;
|
|
|
|
import android.widget.TextView;
|
|
|
|
import android.widget.TextView;
|
|
|
|
import android.widget.Toast;
|
|
|
|
|
|
|
|
import butterknife.BindView;
|
|
|
|
|
|
|
|
import butterknife.OnClick;
|
|
|
|
|
|
|
|
import com.google.common.base.Strings;
|
|
|
|
|
|
|
|
import com.todoroo.andlib.utility.AndroidUtilities;
|
|
|
|
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import java.io.File;
|
|
|
|
|
|
|
|
import java.io.FileOutputStream;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
|
|
|
import java.io.InputStream;
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
|
|
|
|
import javax.inject.Inject;
|
|
|
|
|
|
|
|
import org.tasks.R;
|
|
|
|
import org.tasks.R;
|
|
|
|
import org.tasks.activities.CameraActivity;
|
|
|
|
|
|
|
|
import org.tasks.data.TaskAttachment;
|
|
|
|
import org.tasks.data.TaskAttachment;
|
|
|
|
import org.tasks.data.TaskAttachmentDao;
|
|
|
|
import org.tasks.data.TaskAttachmentDao;
|
|
|
|
import org.tasks.dialogs.AddAttachmentDialog;
|
|
|
|
|
|
|
|
import org.tasks.dialogs.DialogBuilder;
|
|
|
|
import org.tasks.dialogs.DialogBuilder;
|
|
|
|
import org.tasks.files.FileExplore;
|
|
|
|
|
|
|
|
import org.tasks.files.FileHelper;
|
|
|
|
import org.tasks.files.FileHelper;
|
|
|
|
import org.tasks.injection.ForActivity;
|
|
|
|
import org.tasks.injection.ForActivity;
|
|
|
|
import org.tasks.injection.FragmentComponent;
|
|
|
|
import org.tasks.injection.FragmentComponent;
|
|
|
|
import org.tasks.preferences.Preferences;
|
|
|
|
import org.tasks.preferences.Preferences;
|
|
|
|
import org.tasks.ui.TaskEditControlFragment;
|
|
|
|
import org.tasks.ui.TaskEditControlFragment;
|
|
|
|
import timber.log.Timber;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.inject.Inject;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import androidx.annotation.Nullable;
|
|
|
|
|
|
|
|
import butterknife.BindView;
|
|
|
|
|
|
|
|
import butterknife.OnClick;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import static android.app.Activity.RESULT_OK;
|
|
|
|
|
|
|
|
import static org.tasks.data.TaskAttachment.createNewAttachment;
|
|
|
|
|
|
|
|
import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_AUDIO;
|
|
|
|
|
|
|
|
import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_CAMERA;
|
|
|
|
|
|
|
|
import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_GALLERY;
|
|
|
|
|
|
|
|
import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_STORAGE;
|
|
|
|
|
|
|
|
import static org.tasks.dialogs.AddAttachmentDialog.newAddAttachmentDialog;
|
|
|
|
|
|
|
|
import static org.tasks.files.FileHelper.copyToUri;
|
|
|
|
|
|
|
|
|
|
|
|
public class FilesControlSet extends TaskEditControlFragment {
|
|
|
|
public class FilesControlSet extends TaskEditControlFragment {
|
|
|
|
|
|
|
|
|
|
|
|
@ -75,19 +63,6 @@ public class FilesControlSet extends TaskEditControlFragment {
|
|
|
|
|
|
|
|
|
|
|
|
private String taskUuid;
|
|
|
|
private String taskUuid;
|
|
|
|
|
|
|
|
|
|
|
|
private static void play(String file, PlaybackExceptionHandler handler) {
|
|
|
|
|
|
|
|
MediaPlayer mediaPlayer = new MediaPlayer();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
mediaPlayer.setDataSource(file);
|
|
|
|
|
|
|
|
mediaPlayer.prepare();
|
|
|
|
|
|
|
|
mediaPlayer.start();
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
|
|
Timber.e(e);
|
|
|
|
|
|
|
|
handler.playbackFailed();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Nullable
|
|
|
|
@Nullable
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public View onCreateView(
|
|
|
|
public View onCreateView(
|
|
|
|
@ -96,12 +71,9 @@ public class FilesControlSet extends TaskEditControlFragment {
|
|
|
|
|
|
|
|
|
|
|
|
taskUuid = task.getUuid();
|
|
|
|
taskUuid = task.getUuid();
|
|
|
|
|
|
|
|
|
|
|
|
final List<TaskAttachment> files = new ArrayList<>();
|
|
|
|
|
|
|
|
for (TaskAttachment attachment : taskAttachmentDao.getAttachments(taskUuid)) {
|
|
|
|
for (TaskAttachment attachment : taskAttachmentDao.getAttachments(taskUuid)) {
|
|
|
|
files.add(attachment);
|
|
|
|
|
|
|
|
addAttachment(attachment);
|
|
|
|
addAttachment(attachment);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
validateFiles(files);
|
|
|
|
|
|
|
|
return view;
|
|
|
|
return view;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -131,46 +103,12 @@ public class FilesControlSet extends TaskEditControlFragment {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
|
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
|
|
if (requestCode == AddAttachmentDialog.REQUEST_CAMERA) {
|
|
|
|
if (requestCode == REQUEST_CAMERA
|
|
|
|
if (resultCode == RESULT_OK) {
|
|
|
|
|| requestCode == REQUEST_STORAGE
|
|
|
|
Uri uri = data.getParcelableExtra(CameraActivity.EXTRA_URI);
|
|
|
|
|| requestCode == REQUEST_GALLERY
|
|
|
|
final File file = new File(uri.getPath());
|
|
|
|
|| requestCode == REQUEST_AUDIO) {
|
|
|
|
String path = file.getPath();
|
|
|
|
|
|
|
|
Timber.i("Saved %s", file.getAbsolutePath());
|
|
|
|
|
|
|
|
final String extension = path.substring(path.lastIndexOf('.') + 1);
|
|
|
|
|
|
|
|
createNewFileAttachment(file, TaskAttachment.FILE_TYPE_IMAGE + extension);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (requestCode == AddAttachmentDialog.REQUEST_AUDIO) {
|
|
|
|
|
|
|
|
if (resultCode == Activity.RESULT_OK) {
|
|
|
|
|
|
|
|
String path = data.getStringExtra(AddAttachmentDialog.EXTRA_PATH);
|
|
|
|
|
|
|
|
String type = data.getStringExtra(AddAttachmentDialog.EXTRA_TYPE);
|
|
|
|
|
|
|
|
createNewFileAttachment(new File(path), type);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (requestCode == AddAttachmentDialog.REQUEST_GALLERY) {
|
|
|
|
|
|
|
|
if (resultCode == RESULT_OK) {
|
|
|
|
|
|
|
|
Uri uri = data.getData();
|
|
|
|
|
|
|
|
ContentResolver contentResolver = context.getContentResolver();
|
|
|
|
|
|
|
|
MimeTypeMap mime = MimeTypeMap.getSingleton();
|
|
|
|
|
|
|
|
final String extension = mime.getExtensionFromMimeType(contentResolver.getType(uri));
|
|
|
|
|
|
|
|
final File tempFile = getFilename(extension);
|
|
|
|
|
|
|
|
Timber.i("Writing %s to %s", uri, tempFile);
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
InputStream inputStream = contentResolver.openInputStream(uri);
|
|
|
|
|
|
|
|
copyFile(inputStream, tempFile.getPath());
|
|
|
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
|
|
|
throw new RuntimeException(e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
createNewFileAttachment(tempFile, TaskAttachment.FILE_TYPE_IMAGE + extension);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (requestCode == REQUEST_STORAGE) {
|
|
|
|
|
|
|
|
if (resultCode == RESULT_OK) {
|
|
|
|
if (resultCode == RESULT_OK) {
|
|
|
|
String path = data.getStringExtra(FileExplore.EXTRA_FILE);
|
|
|
|
copyToAttachmentDirectory(data.getData());
|
|
|
|
final String destination = copyToAttachmentDirectory(path);
|
|
|
|
|
|
|
|
if (destination != null) {
|
|
|
|
|
|
|
|
Timber.i("Copied %s to %s", path, destination);
|
|
|
|
|
|
|
|
final String extension = destination.substring(path.lastIndexOf('.') + 1);
|
|
|
|
|
|
|
|
createNewFileAttachment(new File(path), TaskAttachment.FILE_TYPE_IMAGE + extension);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
|
|
@ -199,32 +137,13 @@ public class FilesControlSet extends TaskEditControlFragment {
|
|
|
|
android.R.string.ok,
|
|
|
|
android.R.string.ok,
|
|
|
|
(dialog, which) -> {
|
|
|
|
(dialog, which) -> {
|
|
|
|
taskAttachmentDao.delete(taskAttachment);
|
|
|
|
taskAttachmentDao.delete(taskAttachment);
|
|
|
|
if (!Strings.isNullOrEmpty(taskAttachment.getPath())) {
|
|
|
|
FileHelper.delete(context, taskAttachment.parseUri());
|
|
|
|
File f = new File(taskAttachment.getPath());
|
|
|
|
|
|
|
|
f.delete();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
attachmentContainer.removeView(fileRow);
|
|
|
|
attachmentContainer.removeView(fileRow);
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.setNegativeButton(android.R.string.cancel, null)
|
|
|
|
.setNegativeButton(android.R.string.cancel, null)
|
|
|
|
.show());
|
|
|
|
.show());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void validateFiles(List<TaskAttachment> files) {
|
|
|
|
|
|
|
|
for (int i = 0; i < files.size(); i++) {
|
|
|
|
|
|
|
|
TaskAttachment m = files.get(i);
|
|
|
|
|
|
|
|
if (!Strings.isNullOrEmpty(m.getPath())) {
|
|
|
|
|
|
|
|
File f = new File(m.getPath());
|
|
|
|
|
|
|
|
if (!f.exists()) {
|
|
|
|
|
|
|
|
m.setPath(""); // $NON-NLS-1$
|
|
|
|
|
|
|
|
// No local file and no url -- delete the metadata
|
|
|
|
|
|
|
|
taskAttachmentDao.delete(m);
|
|
|
|
|
|
|
|
files.remove(i);
|
|
|
|
|
|
|
|
i--;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
protected void inject(FragmentComponent component) {
|
|
|
|
protected void inject(FragmentComponent component) {
|
|
|
|
component.inject(this);
|
|
|
|
component.inject(this);
|
|
|
|
@ -232,113 +151,17 @@ public class FilesControlSet extends TaskEditControlFragment {
|
|
|
|
|
|
|
|
|
|
|
|
@SuppressLint("NewApi")
|
|
|
|
@SuppressLint("NewApi")
|
|
|
|
private void showFile(final TaskAttachment m) {
|
|
|
|
private void showFile(final TaskAttachment m) {
|
|
|
|
final String fileType =
|
|
|
|
final Uri uri = m.parseUri();
|
|
|
|
!Strings.isNullOrEmpty(m.getContentType())
|
|
|
|
if (uri != null) {
|
|
|
|
? m.getContentType()
|
|
|
|
FileHelper.startActionView(getActivity(), uri);
|
|
|
|
: TaskAttachment.FILE_TYPE_OTHER;
|
|
|
|
|
|
|
|
final String filePath = m.getPath();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (fileType.startsWith(TaskAttachment.FILE_TYPE_AUDIO)) {
|
|
|
|
|
|
|
|
play(m.getPath(), () -> showFromIntent(filePath, fileType));
|
|
|
|
|
|
|
|
} else if (fileType.startsWith(TaskAttachment.FILE_TYPE_IMAGE)) {
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
Intent intent =
|
|
|
|
|
|
|
|
FileHelper.getReadableActionView(
|
|
|
|
|
|
|
|
context, filePath, TaskAttachment.FILE_TYPE_IMAGE + "*");
|
|
|
|
|
|
|
|
getActivity().startActivity(intent);
|
|
|
|
|
|
|
|
} catch (ActivityNotFoundException e) {
|
|
|
|
|
|
|
|
Timber.e(e);
|
|
|
|
|
|
|
|
Toast.makeText(context, R.string.no_application_found, Toast.LENGTH_SHORT).show();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
String useType = fileType;
|
|
|
|
|
|
|
|
if (fileType.equals(TaskAttachment.FILE_TYPE_OTHER)) {
|
|
|
|
|
|
|
|
String extension = AndroidUtilities.getFileExtension(filePath);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MimeTypeMap map = MimeTypeMap.getSingleton();
|
|
|
|
|
|
|
|
String guessedType = map.getMimeTypeFromExtension(extension);
|
|
|
|
|
|
|
|
if (!TextUtils.isEmpty(guessedType)) {
|
|
|
|
|
|
|
|
useType = guessedType;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!useType.equals(guessedType)) {
|
|
|
|
|
|
|
|
m.setContentType(useType);
|
|
|
|
|
|
|
|
taskAttachmentDao.update(m);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
showFromIntent(filePath, useType);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void showFromIntent(String file, String type) {
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
Intent intent = FileHelper.getReadableActionView(context, file, type);
|
|
|
|
|
|
|
|
getActivity().startActivity(intent);
|
|
|
|
|
|
|
|
} catch (ActivityNotFoundException e) {
|
|
|
|
|
|
|
|
Timber.e(e);
|
|
|
|
|
|
|
|
Toast.makeText(context, R.string.file_type_unhandled, Toast.LENGTH_LONG).show();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void createNewFileAttachment(File file, String fileType) {
|
|
|
|
private void copyToAttachmentDirectory(Uri input) {
|
|
|
|
|
|
|
|
Uri output = copyToUri(context, preferences.getAttachmentsDirectory(), input);
|
|
|
|
TaskAttachment attachment =
|
|
|
|
TaskAttachment attachment =
|
|
|
|
TaskAttachment.createNewAttachment(
|
|
|
|
createNewAttachment(taskUuid, output, FileHelper.getFilename(context, output));
|
|
|
|
taskUuid, file.getAbsolutePath(), file.getName(), fileType);
|
|
|
|
|
|
|
|
taskAttachmentDao.createNew(attachment);
|
|
|
|
taskAttachmentDao.createNew(attachment);
|
|
|
|
addAttachment(attachment);
|
|
|
|
addAttachment(attachment);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private File getFilename(String extension) {
|
|
|
|
|
|
|
|
AtomicReference<String> nameRef = new AtomicReference<>();
|
|
|
|
|
|
|
|
if (isNullOrEmpty(extension)) {
|
|
|
|
|
|
|
|
extension = "";
|
|
|
|
|
|
|
|
} else if (!extension.startsWith(".")) {
|
|
|
|
|
|
|
|
extension = "." + extension;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
String path = preferences.getNewAttachmentPath(extension, nameRef);
|
|
|
|
|
|
|
|
File file = new File(path);
|
|
|
|
|
|
|
|
file.getParentFile().mkdirs();
|
|
|
|
|
|
|
|
if (!file.createNewFile()) {
|
|
|
|
|
|
|
|
throw new RuntimeException("Failed to create " + file.getPath());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return file;
|
|
|
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
|
|
|
Timber.e(e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void copyFile(InputStream inputStream, String to) throws IOException {
|
|
|
|
|
|
|
|
FileOutputStream fos = new FileOutputStream(to);
|
|
|
|
|
|
|
|
byte[] buf = new byte[1024];
|
|
|
|
|
|
|
|
int len;
|
|
|
|
|
|
|
|
while ((len = inputStream.read(buf)) != -1) {
|
|
|
|
|
|
|
|
fos.write(buf, 0, len);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
fos.close();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private String copyToAttachmentDirectory(String file) {
|
|
|
|
|
|
|
|
File src = new File(file);
|
|
|
|
|
|
|
|
if (!src.exists()) {
|
|
|
|
|
|
|
|
Toast.makeText(context, R.string.file_err_copy, Toast.LENGTH_LONG).show();
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
File dst = new File(preferences.getAttachmentsDirectory() + File.separator + src.getName());
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
AndroidUtilities.copyFile(src, dst);
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
|
|
Timber.e(e);
|
|
|
|
|
|
|
|
Toast.makeText(context, R.string.file_err_copy, Toast.LENGTH_LONG).show();
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return dst.getAbsolutePath();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
interface PlaybackExceptionHandler {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void playbackFailed();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Alex Baker
7 years ago