From c41a61752f89a3430548b271b6c463decffe5815 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sun, 17 Jun 2012 16:47:26 +0200
Subject: Moved DownloadStatus class into separate file

---
 src/de/podfetcher/activity/AddFeedActivity.java    |  6 ++-
 src/de/podfetcher/activity/DownloadActivity.java   |  3 +-
 src/de/podfetcher/activity/ItemviewActivity.java   |  3 +-
 src/de/podfetcher/adapter/DownloadlistAdapter.java |  7 +--
 src/de/podfetcher/service/DownloadObserver.java    | 50 ++--------------------
 src/de/podfetcher/service/DownloadStatus.java      | 48 +++++++++++++++++++++
 6 files changed, 64 insertions(+), 53 deletions(-)
 create mode 100644 src/de/podfetcher/service/DownloadStatus.java

(limited to 'src')

diff --git a/src/de/podfetcher/activity/AddFeedActivity.java b/src/de/podfetcher/activity/AddFeedActivity.java
index b4c9ddb3f..53c81c0e3 100644
--- a/src/de/podfetcher/activity/AddFeedActivity.java
+++ b/src/de/podfetcher/activity/AddFeedActivity.java
@@ -11,6 +11,8 @@ import de.podfetcher.feed.Feed;
 import de.podfetcher.storage.DownloadRequester;
 import de.podfetcher.util.URLChecker;
 import de.podfetcher.service.DownloadObserver;
+import de.podfetcher.service.DownloadStatus;
+
 import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
@@ -83,8 +85,8 @@ public class AddFeedActivity extends SherlockActivity {
 			}
 
 			@Override
-			protected void onProgressUpdate(DownloadObserver.DownloadStatus... values) {
-				DownloadObserver.DownloadStatus progr = values[0];
+			protected void onProgressUpdate(DownloadStatus... values) {
+				DownloadStatus progr = values[0];
 				progDialog.setMessage(getContext().getString(progr.getStatusMsg())
 						+ " (" + progr.getProgressPercent() + "%)");
 			}
diff --git a/src/de/podfetcher/activity/DownloadActivity.java b/src/de/podfetcher/activity/DownloadActivity.java
index 0da47053a..0b22ce561 100644
--- a/src/de/podfetcher/activity/DownloadActivity.java
+++ b/src/de/podfetcher/activity/DownloadActivity.java
@@ -4,6 +4,7 @@ package de.podfetcher.activity;
 import de.podfetcher.storage.DownloadRequester;
 import de.podfetcher.adapter.DownloadlistAdapter;
 import de.podfetcher.service.DownloadObserver;
+import de.podfetcher.service.DownloadStatus;
 import de.podfetcher.feed.FeedMedia;
 import de.podfetcher.feed.FeedFile;
 import com.actionbarsherlock.app.SherlockListActivity;
@@ -36,7 +37,7 @@ public class DownloadActivity extends SherlockListActivity {
 
     private final DownloadObserver observer = new DownloadObserver(this) {
         @Override
-        protected void onProgressUpdate(DownloadObserver.DownloadStatus... values) {
+        protected void onProgressUpdate(DownloadStatus... values) {
             if (dla != null) {
                 dla.notifyDataSetChanged();
             } else {
diff --git a/src/de/podfetcher/activity/ItemviewActivity.java b/src/de/podfetcher/activity/ItemviewActivity.java
index a3fe92f35..ad3fbd127 100644
--- a/src/de/podfetcher/activity/ItemviewActivity.java
+++ b/src/de/podfetcher/activity/ItemviewActivity.java
@@ -22,6 +22,7 @@ import de.podfetcher.feed.FeedMedia;
 import de.podfetcher.fragment.FeedItemlistFragment;
 import de.podfetcher.fragment.FeedlistFragment;
 import de.podfetcher.service.DownloadObserver;
+import de.podfetcher.service.DownloadStatus;
 import de.podfetcher.service.PlaybackService;
 import de.podfetcher.storage.DownloadRequester;
 
@@ -138,7 +139,7 @@ public class ItemviewActivity extends SherlockActivity {
 	final DownloadObserver downloadObserver = new DownloadObserver(this) {
 		@Override
 		protected void onProgressUpdate(
-				DownloadObserver.DownloadStatus... values) {
+				DownloadStatus... values) {
 
 		}
 
diff --git a/src/de/podfetcher/adapter/DownloadlistAdapter.java b/src/de/podfetcher/adapter/DownloadlistAdapter.java
index a13e3be8b..8b11c13ef 100644
--- a/src/de/podfetcher/adapter/DownloadlistAdapter.java
+++ b/src/de/podfetcher/adapter/DownloadlistAdapter.java
@@ -14,10 +14,11 @@ import de.podfetcher.feed.FeedFile;
 import de.podfetcher.feed.FeedImage;
 import de.podfetcher.feed.FeedMedia;
 import de.podfetcher.service.DownloadObserver;
+import de.podfetcher.service.DownloadStatus;
 
-public class DownloadlistAdapter extends ArrayAdapter<DownloadObserver.DownloadStatus> {
+public class DownloadlistAdapter extends ArrayAdapter<DownloadStatus> {
     public DownloadlistAdapter(Context context,
-            int textViewResourceId, DownloadObserver.DownloadStatus[] objects) {
+            int textViewResourceId, DownloadStatus[] objects) {
         super(context, textViewResourceId, objects);
     }
 
@@ -25,7 +26,7 @@ public class DownloadlistAdapter extends ArrayAdapter<DownloadObserver.DownloadS
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         Holder holder;
-        DownloadObserver.DownloadStatus status = getItem(position);
+        DownloadStatus status = getItem(position);
         FeedFile feedFile = status.getFeedFile();
         // Inflate layout
         if (convertView == null) {
diff --git a/src/de/podfetcher/service/DownloadObserver.java b/src/de/podfetcher/service/DownloadObserver.java
index 049283204..021c2a210 100644
--- a/src/de/podfetcher/service/DownloadObserver.java
+++ b/src/de/podfetcher/service/DownloadObserver.java
@@ -11,7 +11,7 @@ import java.util.concurrent.Callable;
 import android.os.AsyncTask;
 
 /** Observes the status of a specific Download */
-public class DownloadObserver extends AsyncTask<FeedFile, DownloadObserver.DownloadStatus, Boolean> {
+public class DownloadObserver extends AsyncTask<FeedFile, DownloadStatus, Boolean> {
 	private static final String TAG = "DownloadObserver";
 
 	/** Types of downloads to observe. */
@@ -79,8 +79,9 @@ public class DownloadObserver extends AsyncTask<FeedFile, DownloadObserver.Downl
                         case DownloadManager.STATUS_FAILED:
                             status.statusMsg = R.string.download_failed;
                             requester.notifyDownloadService(context);
-                            status.successful = Boolean.valueOf(false);
+                            status.successful = false;
                             status.done = true;
+                            status.reason = getDownloadStatus(cursor, DownloadManager.COLUMN_REASON);
                         case DownloadManager.STATUS_PENDING:
                             status.statusMsg = R.string.download_pending;
                             break;
@@ -151,48 +152,5 @@ public class DownloadObserver extends AsyncTask<FeedFile, DownloadObserver.Downl
         return result;
     }
 
-    /** Contains status attributes for one download*/
-    public class DownloadStatus {
-
-        protected FeedFile feedfile;
-        protected int progressPercent;
-        protected long soFar;
-        protected long size;
-        protected int statusMsg;
-        protected int reason;
-        protected boolean successful;
-        protected boolean done;
-
-        public DownloadStatus(FeedFile feedfile) {
-            this.feedfile = feedfile;
-        }
-
-        public FeedFile getFeedFile() {
-            return feedfile;
-        }
-
-        public int getProgressPercent() {
-            return progressPercent;
-        }
-
-        public long getSoFar() {
-            return soFar;
-        }
-
-        public long getSize() {
-            return size;
-        }
-
-        public int getStatusMsg() {
-            return statusMsg;
-        }
-
-        public int getReason() {
-            return reason;
-        }
-
-        public boolean isSuccessful() {
-            return successful;
-        }
-    }
+    
 }
diff --git a/src/de/podfetcher/service/DownloadStatus.java b/src/de/podfetcher/service/DownloadStatus.java
new file mode 100644
index 000000000..3c9f3c9de
--- /dev/null
+++ b/src/de/podfetcher/service/DownloadStatus.java
@@ -0,0 +1,48 @@
+package de.podfetcher.service;
+
+import de.podfetcher.feed.FeedFile;
+
+/** Contains status attributes for one download*/
+public class DownloadStatus {
+
+    protected FeedFile feedfile;
+    protected int progressPercent;
+    protected long soFar;
+    protected long size;
+    protected int statusMsg;
+    protected int reason;
+    protected boolean successful;
+    protected boolean done;
+
+    public DownloadStatus(FeedFile feedfile) {
+        this.feedfile = feedfile;
+    }
+
+    public FeedFile getFeedFile() {
+        return feedfile;
+    }
+
+    public int getProgressPercent() {
+        return progressPercent;
+    }
+
+    public long getSoFar() {
+        return soFar;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public int getStatusMsg() {
+        return statusMsg;
+    }
+
+    public int getReason() {
+        return reason;
+    }
+
+    public boolean isSuccessful() {
+        return successful;
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3