use startdate as lower bound when querying archive with after=x

This commit is contained in:
Daniel Gultsch 2016-04-09 12:31:08 +02:00
parent b99d70bfe7
commit 65548ddccb

View File

@ -61,11 +61,8 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
} }
query = new Query(account, startCatchup, endCatchup); query = new Query(account, startCatchup, endCatchup);
} else { } else {
if (pair.second == null) { query = new Query(account, startCatchup, endCatchup);
query = new Query(account, startCatchup, endCatchup); query.reference = pair.second;
} else {
query = new Query(account, pair.second, endCatchup);
}
} }
this.queries.add(query); this.queries.add(query);
this.execute(query); this.execute(query);
@ -286,13 +283,6 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
this.queryId = new BigInteger(50, mXmppConnectionService.getRNG()).toString(32); this.queryId = new BigInteger(50, mXmppConnectionService.getRNG()).toString(32);
} }
public Query(Account account, String reference, long end) {
this.account = account;
this.reference = reference;
this.end = end;
this.queryId = new BigInteger(50, mXmppConnectionService.getRNG()).toString(32);
}
private Query page(String reference) { private Query page(String reference) {
Query query = new Query(this.account,this.start,this.end); Query query = new Query(this.account,this.start,this.end);
query.reference = reference; query.reference = reference;