From 3f2e3921a4de2e91af6b5b399c1d1b1ec3c81419 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 14 Jan 2013 15:10:38 -0800
Subject: [PATCH] Migrate to GCM alongside other 4.6 migrations

---
 astrid/src/com/todoroo/astrid/service/UpgradeService.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index ded54cfbc..e22a9f024 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -233,11 +233,10 @@ public final class UpgradeService {
                             if (from < V4_4_2)
                                 new SubtasksMetadataMigration().performMigration();
 
-                            if (from < V4_5_1)
+                            if (from < V4_6_0) {
                                 new GCMIntentService.GCMMigration().performMigration(UpgradeActivity.this);
-
-                            if (from < V4_6_0)
                                 new AstridNewSyncMigrator().performMigration();
+                            }
 
                         } finally {
                             finished = true;