Merge pull request #1048 from TomHennen/merge1.2.2_to_develop
merged 1.2.2 changes to develop
This commit is contained in:
commit
ca40c6e7ab
|
@ -170,7 +170,7 @@ public class DownloadRequester {
|
||||||
if (feedFileValid(feed)) {
|
if (feedFileValid(feed)) {
|
||||||
String username = (feed.getPreferences() != null) ? feed.getPreferences().getUsername() : null;
|
String username = (feed.getPreferences() != null) ? feed.getPreferences().getUsername() : null;
|
||||||
String password = (feed.getPreferences() != null) ? feed.getPreferences().getPassword() : null;
|
String password = (feed.getPreferences() != null) ? feed.getPreferences().getPassword() : null;
|
||||||
long ifModifiedSince = feed.getLastUpdate().getTime();
|
long ifModifiedSince = feed.isPaged() ? 0 : feed.getLastUpdate().getTime();
|
||||||
|
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
args.putInt(REQUEST_ARG_PAGE_NR, feed.getPageNr());
|
args.putInt(REQUEST_ARG_PAGE_NR, feed.getPageNr());
|
||||||
|
|
Loading…
Reference in New Issue