wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 742120 - History records incorrectly reconciled by title + URI, not just URI. r=nalexander

Browse Source
This commit is contained in:
Richard Newman 2012-04-04 13:13:24 -07:00
parent 9ef46f2106
commit 2d90b862c2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java
View File

@ -56,7 +56,7 @@ public class AndroidBrowserHistoryRepositorySession extends AndroidBrowserReposi
@Override @Override
protected String buildRecordString(Record record) { protected String buildRecordString(Record record) {
HistoryRecord hist = (HistoryRecord) record; HistoryRecord hist = (HistoryRecord) record;
return hist.title + hist.histURI; return hist.histURI;
} }
@Override @Override

6
mobile/android/base/sync/repositories/domain/HistoryRecord.java
View File

@ -98,7 +98,8 @@ public class HistoryRecord extends Record {
/** /**
* We consider two history records to be congruent if they represent the * 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 @Override
public boolean congruentWith(Object o) { public boolean congruentWith(Object o) {
@ -109,8 +110,7 @@ public class HistoryRecord extends Record {
if (!super.congruentWith(other)) { if (!super.congruentWith(other)) {
return false; return false;
} }
return RepoUtils.stringsEqual(this.title, other.title) && return RepoUtils.stringsEqual(this.histURI, other.histURI);
RepoUtils.stringsEqual(this.histURI, other.histURI);
} }
@Override @Override