|
|
@ -28,8 +28,10 @@ import com.todoroo.aacenc.RecognizerApi;
|
|
|
|
import com.todoroo.andlib.data.TodorooCursor;
|
|
|
|
import com.todoroo.andlib.data.TodorooCursor;
|
|
|
|
import com.todoroo.andlib.service.Autowired;
|
|
|
|
import com.todoroo.andlib.service.Autowired;
|
|
|
|
import com.todoroo.andlib.service.DependencyInjectionService;
|
|
|
|
import com.todoroo.andlib.service.DependencyInjectionService;
|
|
|
|
|
|
|
|
import com.todoroo.andlib.sql.Criterion;
|
|
|
|
import com.todoroo.andlib.sql.Query;
|
|
|
|
import com.todoroo.andlib.sql.Query;
|
|
|
|
import com.todoroo.andlib.utility.AndroidUtilities;
|
|
|
|
import com.todoroo.andlib.utility.AndroidUtilities;
|
|
|
|
|
|
|
|
import com.todoroo.andlib.utility.DateUtilities;
|
|
|
|
import com.todoroo.andlib.utility.DialogUtilities;
|
|
|
|
import com.todoroo.andlib.utility.DialogUtilities;
|
|
|
|
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
|
|
|
|
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
|
|
|
|
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
|
|
|
|
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
|
|
|
@ -80,7 +82,8 @@ public class FilesControlSet extends PopupControlSet {
|
|
|
|
if (model != null) {
|
|
|
|
if (model != null) {
|
|
|
|
TodorooCursor<Metadata> cursor = metadataService.query(
|
|
|
|
TodorooCursor<Metadata> cursor = metadataService.query(
|
|
|
|
Query.select(Metadata.PROPERTIES)
|
|
|
|
Query.select(Metadata.PROPERTIES)
|
|
|
|
.where(MetadataCriteria.byTaskAndwithKey(model.getId(), FileMetadata.METADATA_KEY)));
|
|
|
|
.where(Criterion.and(MetadataCriteria.byTaskAndwithKey(model.getId(), FileMetadata.METADATA_KEY),
|
|
|
|
|
|
|
|
FileMetadata.DELETION_DATE.eq(0))));
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
files.clear();
|
|
|
|
files.clear();
|
|
|
|
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
|
|
|
|
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
|
|
|
@ -91,11 +94,32 @@ public class FilesControlSet extends PopupControlSet {
|
|
|
|
} finally {
|
|
|
|
} finally {
|
|
|
|
cursor.close();
|
|
|
|
cursor.close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
validateFiles();
|
|
|
|
if (initialized)
|
|
|
|
if (initialized)
|
|
|
|
afterInflate();
|
|
|
|
afterInflate();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void validateFiles() {
|
|
|
|
|
|
|
|
for (int i = 0; i < files.size(); i++) {
|
|
|
|
|
|
|
|
Metadata m = files.get(i);
|
|
|
|
|
|
|
|
if (m.containsNonNullValue(FileMetadata.FILE_PATH)) {
|
|
|
|
|
|
|
|
File f = new File(m.getValue(FileMetadata.FILE_PATH));
|
|
|
|
|
|
|
|
if (!f.exists()) {
|
|
|
|
|
|
|
|
m.setValue(FileMetadata.FILE_PATH, null);
|
|
|
|
|
|
|
|
if (m.containsNonNullValue(FileMetadata.URL)) { // We're ok, just the local file was deleted
|
|
|
|
|
|
|
|
metadataService.save(m);
|
|
|
|
|
|
|
|
} else { // No local file and no url -- delete the metadata
|
|
|
|
|
|
|
|
metadataService.delete(m);
|
|
|
|
|
|
|
|
files.remove(i);
|
|
|
|
|
|
|
|
i--;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
protected void readFromTaskOnInitialize() {
|
|
|
|
protected void readFromTaskOnInitialize() {
|
|
|
|
// TODO Auto-generated method stub
|
|
|
|
// TODO Auto-generated method stub
|
|
|
@ -131,16 +155,21 @@ public class FilesControlSet extends PopupControlSet {
|
|
|
|
new DialogInterface.OnClickListener() {
|
|
|
|
new DialogInterface.OnClickListener() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onClick(DialogInterface d, int which) {
|
|
|
|
public void onClick(DialogInterface d, int which) {
|
|
|
|
|
|
|
|
if (m.getValue(FileMetadata.REMOTE_ID) > 0) {
|
|
|
|
|
|
|
|
m.setValue(FileMetadata.DELETION_DATE, DateUtilities.now());
|
|
|
|
|
|
|
|
metadataService.save(m);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
metadataService.delete(m);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (m.containsNonNullValue(FileMetadata.FILE_PATH)) {
|
|
|
|
if (m.containsNonNullValue(FileMetadata.FILE_PATH)) {
|
|
|
|
File f = new File(m.getValue(FileMetadata.FILE_PATH));
|
|
|
|
File f = new File(m.getValue(FileMetadata.FILE_PATH));
|
|
|
|
if (f.delete()) {
|
|
|
|
f.delete();
|
|
|
|
metadataService.delete(m);
|
|
|
|
}
|
|
|
|
files.remove(m);
|
|
|
|
files.remove(m);
|
|
|
|
refreshDisplayView();
|
|
|
|
refreshDisplayView();
|
|
|
|
finalList.removeView(fileRow);
|
|
|
|
finalList.removeView(fileRow);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}, null);
|
|
|
|
}, null);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|