Merge pull request #777 from mfietz/feature/download-log-retry

Retry failed downloads in the download log

1 files changed, 91 insertions, 11 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index f982e86ce..f29cfdf2f 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -2,20 +2,34 @@ package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
 import android.text.format.DateUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import com.joanzapata.android.iconify.Iconify;
+
+import java.util.Date;
+
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
 
 /** Displays a list of DownloadStatus entries. */
 public class DownloadLogAdapter extends BaseAdapter {
 
+	private final String TAG = "DownloadLogAdapter";
+
 	private Context context;
 
     private ItemAccess itemAccess;
@@ -35,11 +49,11 @@ public class DownloadLogAdapter extends BaseAdapter {
 			LayoutInflater inflater = (LayoutInflater) context
 					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 			convertView = inflater.inflate(R.layout.downloadlog_item, parent, false);
+			holder.icon = (TextView) convertView.findViewById(R.id.txtvIcon);
+			holder.retry = (Button) convertView.findViewById(R.id.btnRetry);
+			holder.date = (TextView) convertView.findViewById(R.id.txtvDate);
 			holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
 			holder.type = (TextView) convertView.findViewById(R.id.txtvType);
-			holder.date = (TextView) convertView.findViewById(R.id.txtvDate);
-			holder.successful = (TextView) convertView
-					.findViewById(R.id.txtvStatus);
 			holder.reason = (TextView) convertView
 					.findViewById(R.id.txtvReason);
 			convertView.setTag(holder);
@@ -62,33 +76,99 @@ public class DownloadLogAdapter extends BaseAdapter {
 				status.getCompletionDate().getTime(),
 				System.currentTimeMillis(), 0, 0));
 		if (status.isSuccessful()) {
-			holder.successful.setTextColor(convertView.getResources().getColor(
+			holder.icon.setTextColor(convertView.getResources().getColor(
 					R.color.download_success_green));
-			holder.successful.setText(R.string.download_successful);
+			holder.icon.setText("{fa-check-circle}");
+			Iconify.addIcons(holder.icon);
+			holder.retry.setVisibility(View.GONE);
 			holder.reason.setVisibility(View.GONE);
 		} else {
-			holder.successful.setTextColor(convertView.getResources().getColor(
+			holder.icon.setTextColor(convertView.getResources().getColor(
 					R.color.download_failed_red));
-			holder.successful.setText(R.string.download_failed);
+			holder.icon.setText("{fa-times-circle}");
+			Iconify.addIcons(holder.icon);
 			String reasonText = status.getReason().getErrorString(context);
 			if (status.getReasonDetailed() != null) {
 				reasonText += ": " + status.getReasonDetailed();
 			}
 			holder.reason.setText(reasonText);
 			holder.reason.setVisibility(View.VISIBLE);
+			if(status.getFeedfileType() != FeedImage.FEEDFILETYPE_FEEDIMAGE &&
+					!newerWasSuccessful(position, status.getFeedfileType(), status.getFeedfileId())) {
+				holder.retry.setVisibility(View.VISIBLE);
+				holder.retry.setText("{fa-repeat}");
+				Iconify.addIcons(holder.retry);
+				holder.retry.setOnClickListener(clickListener);
+				ButtonHolder btnHolder;
+				if(holder.retry.getTag() != null) {
+					btnHolder = (ButtonHolder) holder.retry.getTag();
+				}  else {
+					btnHolder = new ButtonHolder();
+				}
+				btnHolder.typeId = status.getFeedfileType();
+				btnHolder.id = status.getFeedfileId();
+				holder.retry.setTag(btnHolder);
+			} else {
+				holder.retry.setVisibility(View.GONE);
+				holder.retry.setOnClickListener(null);
+				holder.retry.setTag(null);
+			}
 		}
 
 		return convertView;
 	}
 
+	private final View.OnClickListener clickListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View v) {
+			ButtonHolder holder = (ButtonHolder) v.getTag();
+			if(holder.typeId == Feed.FEEDFILETYPE_FEED) {
+				Feed feed = DBReader.getFeed(context, holder.id);
+				feed.setLastUpdate(new Date(0)); // force refresh
+				try {
+					DBTasks.refreshFeed(context, feed);
+				} catch (DownloadRequestException e) {
+					e.printStackTrace();
+				}
+			} else if(holder.typeId == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
+				FeedMedia media = DBReader.getFeedMedia(context, holder.id);
+				try {
+					DBTasks.downloadFeedItems(context, media.getItem());
+					Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show();
+				} catch (DownloadRequestException e) {
+					e.printStackTrace();
+					DownloadRequestErrorDialogCreator.newRequestErrorDialog(context, e.getMessage());
+				}
+			} else {
+				Log.wtf(TAG, "Unexpected type id: " + holder.typeId);
+			}
+			v.setVisibility(View.GONE);
+		}
+	};
+
+	private boolean newerWasSuccessful(int position, int feedTypeId, long id) {
+		for (int i = 0; i < position; i++) {
+			DownloadStatus status = getItem(i);
+			if (status.getFeedfileType() == feedTypeId && status.getFeedfileId() == id &&
+					status.isSuccessful()) return true;
+		}
+		return false;
+	}
+
 	static class Holder {
+		TextView icon;
+		Button retry;
 		TextView title;
 		TextView type;
 		TextView date;
-		TextView successful;
 		TextView reason;
 	}
 
+	static class ButtonHolder {
+		int typeId;
+		long id;
+	}
+
 	@Override
 	public int getCount() {
         return itemAccess.getCount();
@@ -104,9 +184,9 @@ public class DownloadLogAdapter extends BaseAdapter {
 		return position;
 	}
 
-    public static interface ItemAccess {
-        public int getCount();
-        public DownloadStatus getItem(int position);
+    public interface ItemAccess {
+		int getCount();
+		DownloadStatus getItem(int position);
     }
 
 }