now using 'multi-get' reports to pull down up to 50 objects with one …

…http request. reworked some exception handling. improved logging in sync workers. reduced code duplication. general cleanup of some code the aforementioned things touched.
signalapp · Sep 27, 2014 · 6c7e344 · 6c7e344 · WhisperBTC · Sep 27, 2014
1 parent 021ed47
commit 6c7e344
Show file tree

Hide file tree

Showing 25 changed files with 1,138 additions and 687 deletions.
diff --git a/flock/src/main/java/org/anhonesteffort/flock/ContactCopyService.java b/flock/src/main/java/org/anhonesteffort/flock/ContactCopyService.java
@@ -39,7 +39,6 @@
 import org.anhonesteffort.flock.sync.addressbook.AddressbookSyncScheduler;
 import org.anhonesteffort.flock.sync.addressbook.ContactCopiedListener;
 import org.anhonesteffort.flock.sync.addressbook.LocalContactCollection;
-import org.anhonesteffort.flock.webdav.InvalidComponentException;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -199,9 +198,6 @@ private void handleStartCopy() {
 
         fromCollection.copyToAccount(copyPair.second, this);
 
-      } catch (InvalidComponentException e) {
-        ErrorToaster.handleShowError(getBaseContext(), e);
-        return;
       } catch (RemoteException e) {
         ErrorToaster.handleShowError(getBaseContext(), e);
         return;

diff --git a/flock/src/main/java/org/anhonesteffort/flock/ErrorToaster.java b/flock/src/main/java/org/anhonesteffort/flock/ErrorToaster.java
@@ -33,6 +33,7 @@
 import org.anhonesteffort.flock.registration.AuthorizationException;
 import org.anhonesteffort.flock.registration.RegistrationApiClientException;
 import org.anhonesteffort.flock.registration.RegistrationApiException;
+import org.anhonesteffort.flock.sync.InvalidRemoteComponentException;
 import org.anhonesteffort.flock.sync.OwsWebDav;
 import org.anhonesteffort.flock.webdav.InvalidComponentException;
 import org.anhonesteffort.flock.webdav.PropertyParseException;
@@ -119,7 +120,7 @@ else if (e instanceof PropertyParseException) {
 
     else if (e instanceof InvalidComponentException) {
       InvalidComponentException ex = (InvalidComponentException) e;
-      if (ex.isServersFault())
+      if (ex instanceof InvalidRemoteComponentException)
         bundle.putInt(KEY_STATUS_CODE, CODE_DAV_SERVER_ERROR);
       else
         bundle.putInt(KEY_STATUS_CODE, CODE_DAV_CLIENT_ERROR);