зеркало из https://github.com/mozilla/gecko-dev.git
Bug 742120 - History records incorrectly reconciled by title + URI, not just URI. r=nalexander
This commit is contained in:
Родитель
b76eb7a5ec
Коммит
f221eb05b1
|
@ -56,7 +56,7 @@ public class AndroidBrowserHistoryRepositorySession extends AndroidBrowserReposi
|
|||
@Override
|
||||
protected String buildRecordString(Record record) {
|
||||
HistoryRecord hist = (HistoryRecord) record;
|
||||
return hist.title + hist.histURI;
|
||||
return hist.histURI;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -98,7 +98,8 @@ public class HistoryRecord extends Record {
|
|||
|
||||
/**
|
||||
* We consider two history records to be congruent if they represent the
|
||||
* same history record regardless of visits.
|
||||
* same history record regardless of visits. Titles are allowed to differ,
|
||||
* but the URI must be the same.
|
||||
*/
|
||||
@Override
|
||||
public boolean congruentWith(Object o) {
|
||||
|
@ -109,8 +110,7 @@ public class HistoryRecord extends Record {
|
|||
if (!super.congruentWith(other)) {
|
||||
return false;
|
||||
}
|
||||
return RepoUtils.stringsEqual(this.title, other.title) &&
|
||||
RepoUtils.stringsEqual(this.histURI, other.histURI);
|
||||
return RepoUtils.stringsEqual(this.histURI, other.histURI);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Загрузка…
Ссылка в новой задаче