From bb877b57e8c298cf33351d2a7490a7be9af77bba Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 13 Dec 2012 14:49:20 -0800
Subject: [PATCH] Use real style GCM sender id, remove C2DM receiver from the
 manifest

---
 astrid/AndroidManifest.xml                               | 9 +--------
 astrid/plugin-src/com/timsu/astrid/GCMIntentService.java | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 4482d9033..f5df82329 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -411,14 +411,7 @@
               android:windowSoftInputMode="stateHidden"
               android:theme="@style/Theme.Dialog"/>
     <activity android:name="com.todoroo.astrid.actfm.CommentsActivity"
-              android:windowSoftInputMode="stateHidden"/>
-    <receiver android:name="com.timsu.astrid.C2DMReceiver" permission="com.google.android.c2dm.permission.SEND">
-      <!-- Receive the actual message -->
-      <intent-filter>
-          <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-          <category android:name="com.timsu.astrid" />
-      </intent-filter>
-    </receiver>                
+              android:windowSoftInputMode="stateHidden"/>            
 
     <receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
 	  <intent-filter>
diff --git a/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java b/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
index e9a2f0ab2..2d03b232a 100644
--- a/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
+++ b/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
@@ -18,7 +18,7 @@ import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 @SuppressWarnings("nls")
 public class GCMIntentService extends GCMBaseIntentService {
 
-    public static final String SENDER_ID = "gcm@astrid.com"; //$NON-NLS-1$
+    public static final String SENDER_ID = "1003855277730"; //$NON-NLS-1$
     public static final String PREF_REGISTRATION = "gcm_id";
     public static final String PREF_NEEDS_REGISTRATION = "gcm_needs_reg";