Bug 1244944 - Remove old and crufty defer{Get,Put}. r?rnewman
This is safe because the single consumer of `MetaGlobal.fetch` is
`FetchMetaGlobalStage.execute`, which already expects to be called on
a thread and have another thread waiting for the callback.
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/MetaGlobal.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/sync/MetaGlobal.java
@@ -51,17 +51,17 @@ public class MetaGlobal implements SyncS
}
public void fetch(MetaGlobalDelegate delegate) {
this.callback = delegate;
try {
this.isUploading = false;
SyncStorageRecordRequest r = new SyncStorageRecordRequest(this.metaURL);
r.delegate = this;
- r.deferGet();
+ r.get();
} catch (URISyntaxException e) {
this.callback.handleError(e);
}
}
public void upload(MetaGlobalDelegate callback) {
try {
this.isUploading = true;
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageRecordRequest.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageRecordRequest.java
@@ -1,23 +1,22 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.sync.net;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.mozilla.gecko.sync.CryptoRecord;
+
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.mozilla.gecko.sync.CryptoRecord;
-import org.mozilla.gecko.sync.ThreadPool;
-
/**
* Resource class that implements expected headers and processing for Sync.
* Accepts a simplified delegate.
*
* Includes:
* * Basic Auth headers (via Resource)
* * Error responses:
* * 401
@@ -88,27 +87,9 @@ public class SyncStorageRecordRequest ex
public void post(CryptoRecord record) {
this.post(record.toJSONObject());
}
public void put(CryptoRecord record) {
this.put(record.toJSONObject());
}
-
- public void deferGet() {
- final SyncStorageRecordRequest self = this;
- ThreadPool.run(new Runnable() {
- @Override
- public void run() {
- self.get();
- }});
- }
-
- public void deferPut(final JSONObject body) {
- final SyncStorageRecordRequest self = this;
- ThreadPool.run(new Runnable() {
- @Override
- public void run() {
- self.put(body);
- }});
- }
}