pulled in upstream

jasongaare · jasongaare · commit a314122abc36 · 2017-04-27T16:31:11.000-05:00
diff --git a/ReactNativePermissions.js b/ReactNativePermissions.js
@@ -24,9 +24,9 @@ const RNPTypes = {
 		'microphone',
 		'contacts',
 		'event',
-		'notification',
 		'photo',
 		'storage'
+		'notification',
 	]
 }
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -31,5 +31,4 @@ repositories {
 
 dependencies {
     compile 'com.facebook.react:react-native:+'
-    compile 'com.android.support:support-v4:24.1.1'
 }
diff --git a/android/src/main/java/com/joshblour/reactnativepermissions/ReactNativePermissionsModule.java b/android/src/main/java/com/joshblour/reactnativepermissions/ReactNativePermissionsModule.java
@@ -144,8 +144,10 @@ private String permissionForString(String permission) {
       case STORAGE:
       case PHOTO:
         return Manifest.permission.READ_EXTERNAL_STORAGE;
-      default:
+      case NOTIFICATION:
         return permission;
+      default:
+        return null;
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
`3`		`- mavenCentral()`
	`3`	`+ jcenter()`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`@@ -31,5 +31,4 @@ repositories {`
`31`	`31`
`32`	`32`	`dependencies {`
`33`	`33`	`compile 'com.facebook.react:react-native:+'`
`34`		`- compile 'com.android.support:support-v4:24.1.1'`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,10 @@ private String permissionForString(String permission) {`
`144`	`144`	`case STORAGE:`
`145`	`145`	`case PHOTO:`
`146`	`146`	`return Manifest.permission.READ_EXTERNAL_STORAGE;`
`147`		`- default:`
	`147`	`+ case NOTIFICATION:`
`148`	`148`	`return permission;`
	`149`	`+ default:`
	`150`	`+ return null;`
`149`	`151`	`}`
`150`	`152`	`}`
`151`	`153`