corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 709329 - 401 node reassignment. r=rnewman

Browse Source
This commit is contained in:
Nick Alexander
2012-03-12 19:17:56 -07:00
parent 794570e968
commit 6e28a6aaad
14 changed files with 451 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/sync/SyncConfiguration.java
View File

@@ -10,6 +10,9 @@ import java.util.Map;
import java.util.Set;
import org.mozilla.gecko.sync.crypto.KeyBundle;
import org.mozilla.gecko.sync.stage.EnsureClusterURLStage;
import ch.boye.httpclientandroidlib.HttpResponse;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
@@ -332,7 +335,7 @@ public class SyncConfiguration implements CredentialsSource {
return clusterURL.toASCIIString();
}
public void setAndPersistClusterURL(URI u, SharedPreferences prefs) {
protected void setAndPersistClusterURL(URI u, SharedPreferences prefs) {
boolean shouldPersist = (prefs != null) && (clusterURL == null);
Logger.debug(LOG_TAG, "Setting cluster URL to " + u.toASCIIString() +
@@ -345,11 +348,7 @@ public class SyncConfiguration implements CredentialsSource {
}
}
public void setClusterURL(URI u) {
setClusterURL(u, this.getPrefs());
}
public void setClusterURL(URI u, SharedPreferences prefs) {
protected void setClusterURL(URI u, SharedPreferences prefs) {
if (u == null) {
Logger.warn(LOG_TAG, "Refusing to set cluster URL to null.");
return;
@@ -363,8 +362,8 @@ public class SyncConfiguration implements CredentialsSource {
Logger.info(LOG_TAG, "Set cluster URL to " + clusterURL.toASCIIString() + ", given input " + u.toASCIIString());
}
public void setClusterURL(String url) throws URISyntaxException {
this.setClusterURL(new URI(url));
public void setClusterURL(URI u) {
setClusterURL(u, this.getPrefs());
}
/**