archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fixes to file display

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent a10a3c6620
commit 65fd2492b9
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
Unescape Escape View File

@ -1149,7 +1149,7 @@ public final class ActFmSyncService {
} }
} catch (JSONException e) { } catch (JSONException e) {
// Ignored e.printStackTrace();
} finally { } finally {
attachments.close(); attachments.close();
} }

15
astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
Unescape Escape View File

@ -141,7 +141,7 @@ public class FilesControlSet extends PopupControlSet {
} }
private void setupFileClickListener(View view, final Metadata m) { private void setupFileClickListener(View view, final Metadata m) {
String fileType = m.containsNonNullValue(FileMetadata.FILE_TYPE) ? m.getValue(FileMetadata.FILE_TYPE) : FileMetadata.FILE_TYPE_OTHER; final String fileType = m.containsNonNullValue(FileMetadata.FILE_TYPE) ? m.getValue(FileMetadata.FILE_TYPE) : FileMetadata.FILE_TYPE_OTHER;
final String filePath = m.containsNonNullValue(FileMetadata.FILE_PATH) ? m.getValue(FileMetadata.FILE_PATH) : null; final String filePath = m.containsNonNullValue(FileMetadata.FILE_PATH) ? m.getValue(FileMetadata.FILE_PATH) : null;
if (TextUtils.isEmpty(filePath)) { if (TextUtils.isEmpty(filePath)) {
view.setOnClickListener(new OnClickListener() { view.setOnClickListener(new OnClickListener() {
@ -283,13 +283,14 @@ public class FilesControlSet extends PopupControlSet {
} }
} }
}.start(); }.start();
pd.show();
} }
private void setUpFileRow(Metadata m, View row, LinearLayout parent, LayoutParams lp) { private void setUpFileRow(Metadata m, View row, LinearLayout parent, LayoutParams lp) {
TextView nameView = (TextView) row.findViewById(R.id.file_text); TextView nameView = (TextView) row.findViewById(R.id.file_text);
TextView typeView = (TextView) row.findViewById(R.id.file_type); TextView typeView = (TextView) row.findViewById(R.id.file_type);
String name = getNameString(m); String name = getNameString(m);
String type = getTypeString(m); String type = getTypeString(name);
nameView.setText(name); nameView.setText(name);
if (TextUtils.isEmpty(type)) if (TextUtils.isEmpty(type))
@ -309,15 +310,7 @@ public class FilesControlSet extends PopupControlSet {
} }
@SuppressWarnings("nls") @SuppressWarnings("nls")
private String getTypeString(Metadata metadata) { private String getTypeString(String name) {
String name;
if (metadata.containsNonNullValue(FileMetadata.FILE_PATH)) {
File f = new File(metadata.getValue(FileMetadata.FILE_PATH));
name = f.getName();
} else {
name = metadata.getValue(FileMetadata.URL);
}
int extension = name.lastIndexOf('.'); int extension = name.lastIndexOf('.');
if (extension < 0 || extension + 1 >= name.length()) if (extension < 0 || extension + 1 >= name.length())
return ""; return "";

Write Preview
Loading…
Cancel
Save