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

Bug 709311 - Handle changed meta/global. r=rnewman, a=blocking-fennec

Browse Source
This commit is contained in:
Nick Alexander
2012-05-17 13:20:49 -07:00
parent 1048d1306e
commit 8ab7748c6a
9 changed files with 351 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/android/base/sync/SynchronizerConfiguration.java
View File

@@ -44,7 +44,6 @@ import org.mozilla.gecko.sync.SyncConfiguration.ConfigurationBranch;
import org.mozilla.gecko.sync.repositories.RepositorySessionBundle;
import android.content.SharedPreferences.Editor;
import android.util.Log;
public class SynchronizerConfiguration {
private static final String LOG_TAG = "SynczrConfiguration";
@@ -63,14 +62,6 @@ public class SynchronizerConfiguration {
this.localBundle = localBundle;
}
public String[] toStringValues() {
String[] out = new String[3];
out[0] = syncID;
out[1] = remoteBundle.toJSONString();
out[2] = localBundle.toJSONString();
return out;
}
// This should get partly shuffled back into SyncConfiguration, I think.
public void load(ConfigurationBranch config) throws NonObjectJSONException, IOException, ParseException {
if (config == null) {
@@ -89,7 +80,7 @@ public class SynchronizerConfiguration {
syncID = config.getString("syncID", null);
remoteBundle = rB;
localBundle = lB;
Log.i(LOG_TAG, "Initialized SynchronizerConfiguration. syncID: " + syncID + ", remoteBundle: " + remoteBundle + ", localBundle: " + localBundle);
Logger.debug(LOG_TAG, "Loaded SynchronizerConfiguration. syncID: " + syncID + ", remoteBundle: " + remoteBundle + ", localBundle: " + localBundle);
}
public void persist(ConfigurationBranch config) {
@@ -105,5 +96,6 @@ public class SynchronizerConfiguration {
// Synchronous.
editor.commit();
Logger.debug(LOG_TAG, "Persisted SynchronizerConfiguration. syncID: " + syncID + ", remoteBundle: " + remoteBundle + ", localBundle: " + localBundle);
}
}