Implemented DownloadAuthenticationActivity

3 files changed, 197 insertions, 173 deletions

diff --git a/src/de/danoeh/antennapod/service/download/DownloadRequest.java b/src/de/danoeh/antennapod/service/download/DownloadRequest.java
index 320936cf1..be22bbebb 100644
--- a/src/de/danoeh/antennapod/service/download/DownloadRequest.java
+++ b/src/de/danoeh/antennapod/service/download/DownloadRequest.java
@@ -5,191 +5,200 @@ import android.os.Parcelable;
 
 public class DownloadRequest implements Parcelable {
 
-	private final String destination;
-	private final String source;
-	private final String title;
-    private final String username;
-    private final String password;
-	private final long feedfileId;
-	private final int feedfileType;
-
-	protected int progressPercent;
-	protected long soFar;
-	protected long size;
-	protected int statusMsg;
-
-	public DownloadRequest(String destination, String source, String title,
-			long feedfileId, int feedfileType, String username, String password) {
-		if (destination == null) {
-			throw new IllegalArgumentException("Destination must not be null");
-		}
-		if (source == null) {
-			throw new IllegalArgumentException("Source must not be null");
-		}
-		if (title == null) {
-			throw new IllegalArgumentException("Title must not be null");
-		}
-
-		this.destination = destination;
-		this.source = source;
-		this.title = title;
-		this.feedfileId = feedfileId;
-		this.feedfileType = feedfileType;
+    private final String destination;
+    private final String source;
+    private final String title;
+    private String username;
+    private String password;
+    private final long feedfileId;
+    private final int feedfileType;
+
+    protected int progressPercent;
+    protected long soFar;
+    protected long size;
+    protected int statusMsg;
+
+    public DownloadRequest(String destination, String source, String title,
+                           long feedfileId, int feedfileType, String username, String password) {
+        if (destination == null) {
+            throw new IllegalArgumentException("Destination must not be null");
+        }
+        if (source == null) {
+            throw new IllegalArgumentException("Source must not be null");
+        }
+        if (title == null) {
+            throw new IllegalArgumentException("Title must not be null");
+        }
+
+        this.destination = destination;
+        this.source = source;
+        this.title = title;
+        this.feedfileId = feedfileId;
+        this.feedfileType = feedfileType;
         this.username = username;
         this.password = password;
-	}
+    }
 
     public DownloadRequest(String destination, String source, String title,
                            long feedfileId, int feedfileType) {
         this(destination, source, title, feedfileId, feedfileType, null, null);
     }
 
-	private DownloadRequest(Parcel in) {
-		destination = in.readString();
-		source = in.readString();
-		title = in.readString();
-		feedfileId = in.readLong();
-		feedfileType = in.readInt();
+    private DownloadRequest(Parcel in) {
+        destination = in.readString();
+        source = in.readString();
+        title = in.readString();
+        feedfileId = in.readLong();
+        feedfileType = in.readInt();
         if (in.dataAvail() > 0) {
             username = in.readString();
-            password = in.readString();
         } else {
             username = null;
+        }
+        if (in.dataAvail() > 0) {
+            password = in.readString();
+        } else {
             password = null;
         }
-	}
-
-	@Override
-	public int describeContents() {
-		return 0;
-	}
-
-	@Override
-	public void writeToParcel(Parcel dest, int flags) {
-		dest.writeString(destination);
-		dest.writeString(source);
-		dest.writeString(title);
-		dest.writeLong(feedfileId);
-		dest.writeInt(feedfileType);
-	}
-
-	public static final Parcelable.Creator<DownloadRequest> CREATOR = new Parcelable.Creator<DownloadRequest>() {
-		public DownloadRequest createFromParcel(Parcel in) {
-			return new DownloadRequest(in);
-		}
-
-		public DownloadRequest[] newArray(int size) {
-			return new DownloadRequest[size];
-		}
-	};
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ((destination == null) ? 0 : destination.hashCode());
-		result = prime * result + (int) (feedfileId ^ (feedfileId >>> 32));
-		result = prime * result + feedfileType;
-		result = prime * result + progressPercent;
-		result = prime * result + (int) (size ^ (size >>> 32));
-		result = prime * result + (int) (soFar ^ (soFar >>> 32));
-		result = prime * result + ((source == null) ? 0 : source.hashCode());
-		result = prime * result + statusMsg;
-		result = prime * result + ((title == null) ? 0 : title.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		DownloadRequest other = (DownloadRequest) obj;
-		if (destination == null) {
-			if (other.destination != null)
-				return false;
-		} else if (!destination.equals(other.destination))
-			return false;
-		if (feedfileId != other.feedfileId)
-			return false;
-		if (feedfileType != other.feedfileType)
-			return false;
-		if (progressPercent != other.progressPercent)
-			return false;
-		if (size != other.size)
-			return false;
-		if (soFar != other.soFar)
-			return false;
-		if (source == null) {
-			if (other.source != null)
-				return false;
-		} else if (!source.equals(other.source))
-			return false;
-		if (statusMsg != other.statusMsg)
-			return false;
-		if (title == null) {
-			if (other.title != null)
-				return false;
-		} else if (!title.equals(other.title))
-			return false;
-		return true;
-	}
-
-	public String getDestination() {
-		return destination;
-	}
-
-	public String getSource() {
-		return source;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public long getFeedfileId() {
-		return feedfileId;
-	}
-
-	public int getFeedfileType() {
-		return feedfileType;
-	}
-
-	public int getProgressPercent() {
-		return progressPercent;
-	}
-
-	public void setProgressPercent(int progressPercent) {
-		this.progressPercent = progressPercent;
-	}
-
-	public long getSoFar() {
-		return soFar;
-	}
-
-	public void setSoFar(long soFar) {
-		this.soFar = soFar;
-	}
-
-	public long getSize() {
-		return size;
-	}
-
-	public void setSize(long size) {
-		this.size = size;
-	}
-
-	public int getStatusMsg() {
-		return statusMsg;
-	}
-
-	public void setStatusMsg(int statusMsg) {
-		this.statusMsg = statusMsg;
-	}
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(destination);
+        dest.writeString(source);
+        dest.writeString(title);
+        dest.writeLong(feedfileId);
+        dest.writeInt(feedfileType);
+        if (username != null) {
+            dest.writeString(username);
+        }
+        if (password != null) {
+            dest.writeString(password);
+        }
+    }
+
+    public static final Parcelable.Creator<DownloadRequest> CREATOR = new Parcelable.Creator<DownloadRequest>() {
+        public DownloadRequest createFromParcel(Parcel in) {
+            return new DownloadRequest(in);
+        }
+
+        public DownloadRequest[] newArray(int size) {
+            return new DownloadRequest[size];
+        }
+    };
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((destination == null) ? 0 : destination.hashCode());
+        result = prime * result + (int) (feedfileId ^ (feedfileId >>> 32));
+        result = prime * result + feedfileType;
+        result = prime * result + progressPercent;
+        result = prime * result + (int) (size ^ (size >>> 32));
+        result = prime * result + (int) (soFar ^ (soFar >>> 32));
+        result = prime * result + ((source == null) ? 0 : source.hashCode());
+        result = prime * result + statusMsg;
+        result = prime * result + ((title == null) ? 0 : title.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        DownloadRequest other = (DownloadRequest) obj;
+        if (destination == null) {
+            if (other.destination != null)
+                return false;
+        } else if (!destination.equals(other.destination))
+            return false;
+        if (feedfileId != other.feedfileId)
+            return false;
+        if (feedfileType != other.feedfileType)
+            return false;
+        if (progressPercent != other.progressPercent)
+            return false;
+        if (size != other.size)
+            return false;
+        if (soFar != other.soFar)
+            return false;
+        if (source == null) {
+            if (other.source != null)
+                return false;
+        } else if (!source.equals(other.source))
+            return false;
+        if (statusMsg != other.statusMsg)
+            return false;
+        if (title == null) {
+            if (other.title != null)
+                return false;
+        } else if (!title.equals(other.title))
+            return false;
+        return true;
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public long getFeedfileId() {
+        return feedfileId;
+    }
+
+    public int getFeedfileType() {
+        return feedfileType;
+    }
+
+    public int getProgressPercent() {
+        return progressPercent;
+    }
+
+    public void setProgressPercent(int progressPercent) {
+        this.progressPercent = progressPercent;
+    }
+
+    public long getSoFar() {
+        return soFar;
+    }
+
+    public void setSoFar(long soFar) {
+        this.soFar = soFar;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public void setSize(long size) {
+        this.size = size;
+    }
+
+    public int getStatusMsg() {
+        return statusMsg;
+    }
+
+    public void setStatusMsg(int statusMsg) {
+        this.statusMsg = statusMsg;
+    }
 
     public String getUsername() {
         return username;
@@ -198,4 +207,12 @@ public class DownloadRequest implements Parcelable {
     public String getPassword() {
         return password;
     }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
 }
diff --git a/src/de/danoeh/antennapod/service/download/DownloadService.java b/src/de/danoeh/antennapod/service/download/DownloadService.java
index 962fce747..5e1d29ecc 100644
--- a/src/de/danoeh/antennapod/service/download/DownloadService.java
+++ b/src/de/danoeh/antennapod/service/download/DownloadService.java
@@ -21,6 +21,7 @@ import android.webkit.URLUtil;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.DownloadActivity;
+import de.danoeh.antennapod.activity.DownloadAuthenticationActivity;
 import de.danoeh.antennapod.activity.DownloadLogActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.feed.*;
@@ -557,6 +558,11 @@ public class DownloadService extends Service {
                 final String resourceTitle = (downloadRequest.getTitle() != null)
                         ? downloadRequest.getTitle() : downloadRequest.getSource();
 
+                final Intent activityIntent = new Intent(getApplicationContext(), DownloadAuthenticationActivity.class);
+                activityIntent.putExtra(DownloadAuthenticationActivity.ARG_DOWNLOAD_REQUEST, downloadRequest);
+                activityIntent.putExtra(DownloadAuthenticationActivity.ARG_SEND_TO_DOWNLOAD_REQUESTER_BOOL, true);
+                final PendingIntent contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, activityIntent, PendingIntent.FLAG_ONE_SHOT);
+
                 NotificationCompat.Builder builder = new NotificationCompat.Builder(DownloadService.this);
                 builder.setTicker(getText(R.string.authentication_notification_title))
                         .setContentTitle(getText(R.string.authentication_notification_title))
@@ -566,7 +572,7 @@ public class DownloadService extends Service {
                         .setSmallIcon(R.drawable.ic_stat_authentication)
                         .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.ic_stat_authentication))
                         .setAutoCancel(true)
-                        .setContentIntent(PendingIntent.getActivity(getApplicationContext(), 0, new Intent(getApplicationContext(), MainActivity.class), 0));
+                        .setContentIntent(contentIntent);
                 Notification n = builder.build();
                 NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
                 nm.notify(downloadRequest.getSource().hashCode(), n);
@@ -628,6 +634,7 @@ public class DownloadService extends Service {
             Feed feed = new Feed(request.getSource(), new Date());
             feed.setFile_url(request.getDestination());
             feed.setDownloaded(true);
+            feed.setPreferences(new FeedPreferences(0, true, request.getUsername(), request.getPassword()));
 
             reason = null;
             String reasonDetailed = null;
diff --git a/src/de/danoeh/antennapod/service/download/HttpDownloader.java b/src/de/danoeh/antennapod/service/download/HttpDownloader.java
index 4b6455343..442b57c0b 100644
--- a/src/de/danoeh/antennapod/service/download/HttpDownloader.java
+++ b/src/de/danoeh/antennapod/service/download/HttpDownloader.java
@@ -55,7 +55,7 @@ public class HttpDownloader extends Downloader {
                             new UsernamePasswordCredentials(parts[0], parts[1]),
                             "UTF-8", false));
                 }
-            } else if (StringUtils.isEmpty(request.getUsername()) && request.getPassword() != null) {
+            } else if (!StringUtils.isEmpty(request.getUsername()) && request.getPassword() != null) {
                 httpGet.addHeader(BasicScheme.authenticate(new UsernamePasswordCredentials(request.getUsername(),
                         request.getPassword()), "UTF-8", false));
             }