Skip to content

Commit a221bb2

Browse files
committed
Merge pull request #215 from ParsePlatform/grantland.gcm
Remove GET_ACCOUNTS requirement in Parse
2 parents eeb4203 + e494151 commit a221bb2

File tree

1 file changed

+33
-34
lines changed

1 file changed

+33
-34
lines changed

Parse/src/main/java/com/parse/ManifestInfo.java

+33-34
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,6 @@ private static ManifestCheckResult gcmSupportLevel() {
473473
"android.permission.INTERNET",
474474
"android.permission.ACCESS_NETWORK_STATE",
475475
"android.permission.WAKE_LOCK",
476-
"android.permission.GET_ACCOUNTS",
477476
"com.google.android.c2dm.permission.RECEIVE",
478477
context.getPackageName() + ".permission.C2D_MESSAGE"
479478
};
@@ -549,27 +548,27 @@ private static String getGcmManifestMessage() {
549548
return "make sure that these permissions are declared as children " +
550549
"of the root <manifest> element:\n" +
551550
"\n" +
552-
"<uses-permission android:name=\"android.permission.INTERNET\" />\n" +
553-
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />\n" +
554-
"<uses-permission android:name=\"android.permission.VIBRATE\" />\n" +
555-
"<uses-permission android:name=\"android.permission.WAKE_LOCK\" />\n" +
556-
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\" />\n" +
557-
"<uses-permission android:name=\"com.google.android.c2dm.permission.RECEIVE\" />\n" +
551+
"<uses-permission android:name=\"android.permission.INTERNET\" />\n" +
552+
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />\n" +
553+
"<uses-permission android:name=\"android.permission.VIBRATE\" />\n" +
554+
"<uses-permission android:name=\"android.permission.WAKE_LOCK\" />\n" +
555+
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\" />\n" +
556+
"<uses-permission android:name=\"com.google.android.c2dm.permission.RECEIVE\" />\n" +
558557
"<permission android:name=\"" + gcmPackagePermission + "\" " +
559-
"android:protectionLevel=\"signature\" />\n" +
560-
"<uses-permission android:name=\"" + gcmPackagePermission + "\" />\n" +
561-
"\n" +
558+
"android:protectionLevel=\"signature\" />\n" +
559+
"<uses-permission android:name=\"" + gcmPackagePermission + "\" />\n" +
560+
"\n" +
562561
"Also, please make sure that these services and broadcast receivers are declared as " +
563-
"children of the <application> element:\n" +
564-
"\n" +
565-
"<service android:name=\"com.parse.PushService\" />\n" +
562+
"children of the <application> element:\n" +
563+
"\n" +
564+
"<service android:name=\"com.parse.PushService\" />\n" +
566565
"<receiver android:name=\"com.parse.GcmBroadcastReceiver\" " +
567-
"android:permission=\"com.google.android.c2dm.permission.SEND\">\n" +
568-
" <intent-filter>\n" +
569-
" <action android:name=\"com.google.android.c2dm.intent.RECEIVE\" />\n" +
570-
" <action android:name=\"com.google.android.c2dm.intent.REGISTRATION\" />\n" +
566+
"android:permission=\"com.google.android.c2dm.permission.SEND\">\n" +
567+
" <intent-filter>\n" +
568+
" <action android:name=\"com.google.android.c2dm.intent.RECEIVE\" />\n" +
569+
" <action android:name=\"com.google.android.c2dm.intent.REGISTRATION\" />\n" +
571570
" <category android:name=\"" + packageName + "\" />\n" +
572-
" </intent-filter>\n" +
571+
" </intent-filter>\n" +
573572
"</receiver>\n" +
574573
"<receiver android:name=\"com.parse.ParsePushBroadcastReceiver\"" +
575574
" android:exported=false>\n" +
@@ -583,23 +582,23 @@ private static String getGcmManifestMessage() {
583582

584583
private static String getPpnsManifestMessage() {
585584
return "make sure that these permissions are declared as children of the root " +
586-
"<manifest> element:\n" +
587-
"\n" +
588-
"<uses-permission android:name=\"android.permission.INTERNET\" />\n" +
589-
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />\n" +
590-
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\" />\n" +
591-
"<uses-permission android:name=\"android.permission.VIBRATE\" />\n" +
592-
"<uses-permission android:name=\"android.permission.WAKE_LOCK\" />\n" +
593-
"\n" +
585+
"<manifest> element:\n" +
586+
"\n" +
587+
"<uses-permission android:name=\"android.permission.INTERNET\" />\n" +
588+
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />\n" +
589+
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\" />\n" +
590+
"<uses-permission android:name=\"android.permission.VIBRATE\" />\n" +
591+
"<uses-permission android:name=\"android.permission.WAKE_LOCK\" />\n" +
592+
"\n" +
594593
"Also, please make sure that these services and broadcast receivers are declared as " +
595-
"children of the <application> element:\n" +
596-
"\n" +
597-
"<service android:name=\"com.parse.PushService\" />\n" +
598-
"<receiver android:name=\"com.parse.ParseBroadcastReceiver\">\n" +
599-
" <intent-filter>\n" +
600-
" <action android:name=\"android.intent.action.BOOT_COMPLETED\" />\n" +
601-
" <action android:name=\"android.intent.action.USER_PRESENT\" />\n" +
602-
" </intent-filter>\n" +
594+
"children of the <application> element:\n" +
595+
"\n" +
596+
"<service android:name=\"com.parse.PushService\" />\n" +
597+
"<receiver android:name=\"com.parse.ParseBroadcastReceiver\">\n" +
598+
" <intent-filter>\n" +
599+
" <action android:name=\"android.intent.action.BOOT_COMPLETED\" />\n" +
600+
" <action android:name=\"android.intent.action.USER_PRESENT\" />\n" +
601+
" </intent-filter>\n" +
603602
"</receiver>\n" +
604603
"<receiver android:name=\"com.parse.ParsePushBroadcastReceiver\"" +
605604
" android:exported=false>\n" +

0 commit comments

Comments
 (0)