Remove references of humbughq from GCM messaging

Author: niftynei

app/build.gradle

@@ -41,16 +41,14 @@ android {
     buildTypes {
         debug {
             applicationIdSuffix '.dev'
-            manifestPlaceholders = [ permissionPackage : "com.humbughq.mobile.dev"]
-            manifestPlaceholders += [ fabricKey : ""]
+            manifestPlaceholders = [ fabricKey : ""]
             ext.enableCrashlytics = false
             buildConfigField "String", "GOOGLE_CLIENT_ID", "\"659545034376-78hg5hmrvqr50nn53t0nme97ndhqjmvs.apps.googleusercontent.com\""
         }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            manifestPlaceholders = [ permissionPackage : "com.humbughq.mobile"]
-            manifestPlaceholders += [ fabricKey : project.property("fabricKey")]
+            manifestPlaceholders = [ fabricKey : project.property("fabricKey")]
             buildConfigField "String", "GOOGLE_CLIENT_ID", "TODO: FILL THIS IN"
         }
     }

app/src/main/AndroidManifest.xml

@@ -9,10 +9,10 @@
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
     <permission
-        android:name="${permissionPackage}.permission.C2D_MESSAGE"
+        android:name="${applicationId}.permission.C2D_MESSAGE"
         android:protectionLevel="signature" />
 
-    <uses-permission android:name="${permissionPackage}.permission.C2D_MESSAGE" />
+    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
 
@@ -49,14 +49,14 @@
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
 
-                <category android:name="com.humbughq.mobile" />
+                <category android:name="${applicationId}" />
             </intent-filter>
         </receiver>
         <receiver
             android:name=".gcm.GcmShowNotificationReceiver"
             android:exported="false" >
             <intent-filter>
-                <action android:name="com.humbughq.mobile.PushMessage.BROADCAST" />
+                <action android:name="${applicationId}.PushMessage.BROADCAST" />
             </intent-filter>
         </receiver>
 

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -1426,7 +1426,7 @@ protected void onResume() {
 
         // Set up the BroadcastReceiver to trap GCM messages so notifications
         // don't show while in the app
-        IntentFilter filter = new IntentFilter(GcmBroadcastReceiver.BROADCAST);
+        IntentFilter filter = new IntentFilter(GcmBroadcastReceiver.getGCMReceiverAction(getApplicationContext()));
         filter.setPriority(2);
         registerReceiver(onGcmMessage, filter);
 

app/src/main/java/com/zulip/android/gcm/GcmBroadcastReceiver.java

@@ -14,16 +14,18 @@
 // http://commonsware.com/blog/2010/08/11/activity-notification-ordered-broadcast.html
 // for the inspiration for the dispatch strategy.
 
-// A com.humbughq.mobile.PushMessage.BROADCAST is broadcast to ordered receivers. If the
+// A com.zulip.android.PushMessage.BROADCAST is broadcast to ordered receivers. If the
 // HumbugActivity is active, its receiver gets the message first and inhibits it. Otherwise,
 // it is received by GcmShowNotificationReceiver. That launches a GcmIntentService that
 // displays the notification.
 
 public class GcmBroadcastReceiver extends BroadcastReceiver {
 
     private static final String TAG = "GCM";
-    // FIXME Not sure if this is safe to change to a Zulip string
-    public static final String BROADCAST = "com.humbughq.mobile.PushMessage.BROADCAST";
+
+    public static String getGCMReceiverAction(Context appContext) {
+        return appContext.getPackageName() + ".PushMessage.BROADCAST";
+    }
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -49,7 +51,7 @@ public void onReceive(Context context, Intent intent) {
 
                 Log.i(TAG, "Received: " + extras.toString());
                 if (extras.getString("event").equals("message")) {
-                    Intent broadcast = new Intent(BROADCAST);
+                    Intent broadcast = new Intent(getGCMReceiverAction(context.getApplicationContext()));
                     broadcast.putExtras(extras);
                     context.sendOrderedBroadcast(broadcast, null);
                 }