From ef58bb1cdae4c4ab2e21fb84902d446a3b3feb65 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 21 Mar 2012 15:23:29 -0700
Subject: [PATCH] Bug fixes to sync isOngoing display, better error messages

---
 api/res/values/strings.xml                                 | 7 ++++---
 .../com/todoroo/astrid/sync/SyncProviderPreferences.java   | 1 +
 .../com/todoroo/astrid/actfm/sync/ActFmSyncService.java    | 5 +++--
 .../com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java | 3 +++
 .../todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java   | 1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/api/res/values/strings.xml b/api/res/values/strings.xml
index dad2a5599..efc641443 100644
--- a/api/res/values/strings.xml
+++ b/api/res/values/strings.xml
@@ -201,7 +201,8 @@
   <string name="sync_SPr_logged_in_prefix">Logged in as:</string>
   
   <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Last Error</string>
+  <string name="sync_SPr_last_error">Status Report</string>
+  
   <!-- Sync: last error click for more -->
   <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
   <!-- Sync: send error report button -->
@@ -216,8 +217,8 @@
   <string name="sync_forget_confirm">Log out / clear synchronization data?</string>
   
   <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">It looks like you had some network connectivity problems
-      the last time you tried to sync with %s. Please try again later!</string>
+  <string name="sync_error_offline">There was a problem connecting to the network
+      during the last sync with %s. Please try again later.</string>
   
   <string-array name="sync_SPr_interval_entries">
       <!-- sync_SPr_interval_entries: Synchronization Intervals -->
diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java
index 61730910d..ac801f460 100644
--- a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java
+++ b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java
@@ -252,6 +252,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
             exceptionsToDisplayMessages = new HashMap<String, Integer>();
             exceptionsToDisplayMessages.put("java.net.ConnectionException", R.string.sync_error_offline);
             exceptionsToDisplayMessages.put("java.net.UnknownHostException", R.string.sync_error_offline);
+            exceptionsToDisplayMessages.put("org.apache.http.conn.HttpHostConnectionException", R.string.sync_error_offline);
         }
         return exceptionsToDisplayMessages;
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index 691985617..0ee2ba211 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -1079,8 +1079,6 @@ public final class ActFmSyncService {
                     Preferences.setLong("actfm_time_" + lastSyncKey, serverTime);
                     Preferences.setLong("actfm_last_" + lastSyncKey, DateUtilities.now());
 
-                    if(done != null)
-                        done.run();
                 } catch (IOException e) {
                     if (handler != null)
                         handler.handleException("io-exception-list-" + model, e);
@@ -1088,6 +1086,9 @@ public final class ActFmSyncService {
                         handleException("io-exception-list-" + model, e);
                 } catch (JSONException e) {
                     handleException("json: " + result.toString(), e);
+                } finally {
+                    if(done != null)
+                        done.run();
                 }
             }
         }).start();
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
index d3fd33499..d3b4f085d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -142,6 +142,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
                     callback.incrementProgress(20);
                     if(finisher.decrementAndGet() == 0) {
                         actFmPreferenceService.recordSuccessfulSync();
+                        actFmPreferenceService.stopOngoing();
                         callback.finished();
                     }
                 }
@@ -160,6 +161,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
                 callback.incrementProgress(30);
                 if(finisher.decrementAndGet() == 0) {
                     actFmPreferenceService.recordSuccessfulSync();
+                    actFmPreferenceService.stopOngoing();
                     callback.finished();
                 }
             }
@@ -190,6 +192,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
                             callback.incrementProgress(20);
                             if(finisher.decrementAndGet() == 0) {
                                 actFmPreferenceService.recordSuccessfulSync();
+                                actFmPreferenceService.stopOngoing();
                                 callback.finished();
                             }
                         }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
index a7d67d559..948211b92 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@@ -130,6 +130,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
                             callback.incrementProgress(25);
                             if (finisher.decrementAndGet() == 0) {
                                 gtasksPreferenceService.recordSuccessfulSync();
+                                gtasksPreferenceService.stopOngoing();
                                 callback.finished();
                             }
                         }