Integrate Latest @ 118726261

Stewart Miles · Stewart Miles · commit e816bb5ae7b5 · 2016-03-31T15:59:56.000-07:00
Changes to messaging/testapp ...
- Making the iOS implementation of Initialization run on the main thread.

CL: 118726261
diff --git a/messaging/testapp/AndroidManifest.xml b/messaging/testapp/AndroidManifest.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.codelab.friendlychat"
+          package="com.google.android.messaging.testapp"
           android:versionCode="1"
           android:versionName="1.0">
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
   <permission
-      android:name="com.google.firebase.codelab.friendlychat.permission.C2D_MESSAGE"
+      android:name="com.google.android.messaging.testapp.permission.C2D_MESSAGE"
       android:protectionLevel="signature" />
   <uses-permission
-      android:name="com.google.firebase.codelab.friendlychat.permission.C2D_MESSAGE" />
+      android:name="com.google.android.messaging.testapp.permission.C2D_MESSAGE" />
 
   <application android:label="@string/app_name">
 
@@ -29,7 +29,7 @@
               android:permission="com.google.android.c2dm.permission.SEND" >
       <intent-filter>
         <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-        <category android:name="com.google.firebase.codelab.friendlychat" />
+        <category android:name="com.google.android.messaging.testapp" />
       </intent-filter>
     </receiver>
 
diff --git a/messaging/testapp/src/common_main.cc b/messaging/testapp/src/common_main.cc
@@ -72,11 +72,9 @@ extern "C" int common_main(int argc, const char* argv[]) {
   ::firebase::messaging::Subscribe("/topics/TestTopic");
   LogMessage("Subscribed to TestTopic");
 
-#if defined(__ANDROID__)
   while (!ProcessEvents(1000)) {
     // Process events so that the client doesn't hang.
     LogMessage("Main tick");
   }
-#endif  // defined(__ANDROID__)
   return 0;
 }
diff --git a/messaging/testapp/src/ios/ios_main.mm b/messaging/testapp/src/ios/ios_main.mm
@@ -53,7 +53,7 @@ - (BOOL)application:(UIApplication *)application
   // Override point for customization after application launch.
   // TOOD(smiles): This needs to run on a separate thread so UIApplicationMain() can
   // notify our app delegate with events.
-  dispatch_async(dispatch_get_main_queue(), ^{
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     const char *argv[] = {FIREBASE_TESTAPP_NAME};
     exit_status = common_main(1, argv);
   });
diff --git a/messaging/testapp/testapp/Info.plist b/messaging/testapp/testapp/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.google.GCMSample.dev</string>
+	<string>com.google.ios.messaging.testapp</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,9 @@ extern "C" int common_main(int argc, const char* argv[]) {`
`72`	`72`	`::firebase::messaging::Subscribe("/topics/TestTopic");`
`73`	`73`	`LogMessage("Subscribed to TestTopic");`
`74`	`74`
`75`		`-#if defined(__ANDROID__)`
`76`	`75`	`while (!ProcessEvents(1000)) {`
`77`	`76`	`// Process events so that the client doesn't hang.`
`78`	`77`	`LogMessage("Main tick");`
`79`	`78`	`}`
`80`		`-#endif // defined(__ANDROID__)`
`81`	`79`	`return 0;`
`82`	`80`	`}`