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 745302 - Passwords synced to Fennec database, but don't autocomplete in UI. r=nalexander,rnewman a=blocking-fennec

Browse Source
This commit is contained in:
Chenxia Liu 2012-04-17 15:56:28 -07:00
parent c29ceb0a68
commit 2ef9f73069
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
View File

@ -570,10 +570,9 @@ public class PasswordsRepositorySession extends
return null;
}
// TODO: Bug 738347 - SQLiteBridge does not check for nulls in ContentValues.
// Passwords.HTTP_REALM + " = ? AND " +
private static final String WHERE_RECORD_DATA =
Passwords.HOSTNAME + " = ? AND " +
Passwords.HTTP_REALM + " = ? AND " +
Passwords.FORM_SUBMIT_URL + " = ? AND " +
Passwords.USERNAME_FIELD + " = ? AND " +
Passwords.PASSWORD_FIELD + " = ?";
@ -585,12 +584,10 @@ public class PasswordsRepositorySession extends
// We can't encrypt username directly for query, so run a more general query and then filter.
final String[] whereArgs = new String[] {
record.hostname,
record.httpRealm,
record.formSubmitURL,
record.usernameField,
record.passwordField
// TODO: Bug 738347 - SQLiteBridge does not check for nulls in ContentValues.
// record.httpRealm
};
try {
@ -688,17 +685,13 @@ public class PasswordsRepositorySession extends
ContentValues cv = new ContentValues();
cv.put(BrowserContract.Passwords.GUID, rec.guid);
cv.put(BrowserContract.Passwords.HOSTNAME, rec.hostname);
// TODO: Bug 738347 - SQLiteBridge does not check for nulls in ContentValues.
// For now, don't set httpRealm, because it can be null and Fennec SQLite doesn't handle null CV.
// cv.put(BrowserContract.Passwords.HTTP_REALM, rec.httpRealm);
cv.put(BrowserContract.Passwords.HTTP_REALM, rec.httpRealm);
cv.put(BrowserContract.Passwords.FORM_SUBMIT_URL, rec.formSubmitURL);
cv.put(BrowserContract.Passwords.USERNAME_FIELD, rec.usernameField);
cv.put(BrowserContract.Passwords.PASSWORD_FIELD, rec.passwordField);
// TODO Do encryption of username/password here. Bug 711636
// TODO: Bug 738347 - SQLiteBridge does not check for nulls in ContentValues.
// For now, don't set encType. (same as httpRealm)
// cv.put(BrowserContract.Passwords.ENC_TYPE, rec.encType);
cv.put(BrowserContract.Passwords.ENC_TYPE, rec.encType);
cv.put(BrowserContract.Passwords.ENCRYPTED_USERNAME, rec.encryptedUsername);
cv.put(BrowserContract.Passwords.ENCRYPTED_PASSWORD, rec.encryptedPassword);