summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java30
1 files changed, 19 insertions, 11 deletions
diff --git a/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index adf522290..eae163231 100644
--- a/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -44,29 +44,37 @@ public class DownloadLogAdapter extends ArrayAdapter<DownloadStatus> {
.findViewById(R.id.txtvStatus);
holder.reason = (TextView) convertView
.findViewById(R.id.txtvReason);
+
if (feedfile.getClass() == Feed.class) {
- holder.title.setText(((Feed) feedfile).getTitle());
- holder.type.setText("Feed");
+ holder.type.setText(R.string.download_type_feed);
} else if (feedfile.getClass() == FeedMedia.class) {
- holder.title.setText(((FeedMedia) feedfile).getItem()
- .getTitle());
- holder.type.setText(((FeedMedia) feedfile).getMime_type());
+ holder.type.setText(R.string.download_type_media);
} else if (feedfile.getClass() == FeedImage.class) {
- holder.title.setText(((FeedImage) feedfile).getTitle());
- holder.type.setText("Image");
+ holder.type.setText(R.string.download_type_image);
+ }
+ if (status.getTitle() != null) {
+ holder.title.setText(status.getTitle());
+ } else {
+ holder.title.setText(R.string.download_log_title_unknown);
}
holder.date.setText(DateUtils.formatSameDayTime(status
.getCompletionDate().getTime(), System.currentTimeMillis(),
DateFormat.SHORT, DateFormat.SHORT));
if (status.isSuccessful()) {
- holder.successful.setTextColor(Color.parseColor("green"));
+ holder.successful.setTextColor(convertView.getResources()
+ .getColor(R.color.download_success_green));
holder.successful.setText(R.string.download_successful);
holder.reason.setVisibility(View.GONE);
} else {
- holder.successful.setTextColor(Color.parseColor("red"));
+ holder.successful.setTextColor(convertView.getResources()
+ .getColor(R.color.download_failed_red));
holder.successful.setText(R.string.download_failed);
- holder.reason.setText(DownloadError.getErrorString(
- getContext(), status.getReason()));
+ String reasonText = DownloadError.getErrorString(
+ getContext(), status.getReason());
+ if (status.getReasonDetailed() != null) {
+ reasonText += ": " + status.getReasonDetailed();
+ }
+ holder.reason.setText(reasonText);
}
} else {
holder = (Holder) convertView.getTag();