yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 2.6-master

Browse source
This commit is contained in:
Nikolay Pultsin 2015-10-27 02:20:40 +00:00
commit d82bccfa35
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
View file

@ -71,9 +71,13 @@ class OPDSFeedHandler extends AbstractOPDSFeedHandler implements OPDSConstants {
myIndex = feed.OpensearchStartIndex - 1; myIndex = feed.OpensearchStartIndex - 1;
if (feed.OpensearchItemsPerPage > 0) { if (feed.OpensearchItemsPerPage > 0) {
myItemsToLoad = feed.OpensearchItemsPerPage; myItemsToLoad = feed.OpensearchItemsPerPage;
final int len = feed.OpensearchTotalResults - myIndex; if (feed.OpensearchTotalResults >= 0) {
if (len > 0 && len < myItemsToLoad) { myItemsToLoad =
myItemsToLoad = len; Math.min(Math.max(0, feed.OpensearchTotalResults - myIndex), myItemsToLoad);
}
if (myItemsToLoad == 0) {
myData.ResumeURI = null;
return true;
} }
} }
if ("series".equals(feed.ViewType)) { if ("series".equals(feed.ViewType)) {

2
fbreader/app/src/main/java/org/geometerplus/fbreader/network/opds/OPDSFeedMetadata.java
View file

@ -24,7 +24,7 @@ import org.geometerplus.zlibrary.core.xml.ZLStringMap;
import org.geometerplus.fbreader.network.atom.*; import org.geometerplus.fbreader.network.atom.*;
class OPDSFeedMetadata extends ATOMFeedMetadata { class OPDSFeedMetadata extends ATOMFeedMetadata {
public int OpensearchTotalResults; public int OpensearchTotalResults = -1;
public int OpensearchItemsPerPage; public int OpensearchItemsPerPage;
public int OpensearchStartIndex = 1; public int OpensearchStartIndex = 1;