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 727725 - Incorrect assertion in GlobalSession.

Browse Source
This commit is contained in:
Richard Newman 2012-02-16 14:58:31 -08:00
parent 229f1fa610
commit 2e559f3eca
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/base/sync/GlobalSession.java
View File

@ -148,7 +148,7 @@ public class GlobalSession implements CredentialsSource, PrefsSource {
KeyBundle syncKeyBundle,
GlobalSessionCallback callback,
Context context,
Bundle persisted)
Bundle extras)
throws SyncConfigurationException, IllegalArgumentException, IOException, ParseException, NonObjectJSONException {
if (callback == null) {
throw new IllegalArgumentException("Must provide a callback to GlobalSession constructor.");
@ -158,7 +158,7 @@ public class GlobalSession implements CredentialsSource, PrefsSource {
throw new SyncConfigurationException();
}
Log.i(LOG_TAG, "GlobalSession initialized with bundle " + persisted);
Log.i(LOG_TAG, "GlobalSession initialized with bundle " + extras);
URI serverURI;
try {
serverURI = (serverURL == null) ? null : new URI(serverURL);
@ -181,9 +181,7 @@ public class GlobalSession implements CredentialsSource, PrefsSource {
config.username = username;
config.password = password;
config.syncKeyBundle = syncKeyBundle;
// clusterURL and syncID are set through `persisted`, or fetched from the server.
assert(null == persisted);
prepareStages();
}