[android] Updates for react-native-push-notification.

crownstone · Nov 25, 2021 · fc1bc65 · fc1bc65
1 parent e6ad34c
commit fc1bc65
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 41 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -74,61 +74,48 @@
 		<!-- required for react-native-push-notification -->
 		<!-- =========================================== -->
 
-		<meta-data  android:name="com.dieam.reactnativepushnotification.notification_channel_name"
-			android:value="rocks.crownstone.consumerapp"/>
-		<meta-data  android:name="com.dieam.reactnativepushnotification.notification_channel_description"
-			android:value="Crownstone"/>
+		<!-- Change the value to true to enable pop-up for in foreground on receiving remote notifications (for prevent duplicating while showing local notifications set this to false) -->
+		<meta-data  android:name="com.dieam.reactnativepushnotification.notification_foreground"
+			android:value="false"/>
 		<!-- Change the resource name to your App's accent color - or any other color you want -->
 		<meta-data  android:name="com.dieam.reactnativepushnotification.notification_color"
-			android:resource="@android:color/white"/>
-
-		<!-- required for react-native-maps -->
-		<meta-data android:name="com.google.android.geo.API_KEY"
-			android:value="AIzaSyCeK-7-wFdqPsgn-eG7MV-7cH-7Y-HFPuI"/>
-
-		<!-- Bugsnag -->
-		<meta-data android:name="com.bugsnag.android.API_KEY"
-			android:value="948eaede21917addd2315fde2a9c834d"/>
-
-		<!-- < Only if you're using GCM or localNotificationSchedule() > -->
-		<receiver
-			android:name="com.google.android.gms.gcm.GcmReceiver"
-			android:exported="true"
-			android:permission="com.google.android.c2dm.permission.SEND" >
-			<intent-filter>
-				<action android:name="com.google.android.c2dm.intent.RECEIVE" />
-				<category android:name="${applicationId}" />
-			</intent-filter>
-		</receiver>
-		<!-- < Only if you're using GCM or localNotificationSchedule() > -->
+			android:resource="@android:color/white"/> <!-- or @android:color/{name} to use a standard color -->
 
+		<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
 		<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
 		<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
 			<intent-filter>
 				<action android:name="android.intent.action.BOOT_COMPLETED" />
+				<action android:name="android.intent.action.QUICKBOOT_POWERON" />
+				<action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
 			</intent-filter>
 		</receiver>
-		<service android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationRegistrationService"/>
-
-		<!-- < Only if you're using GCM or localNotificationSchedule() > -->
-		<service
-			android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerServiceGcm"
-			android:exported="false" >
-			<intent-filter>
-				<action android:name="com.google.android.c2dm.intent.RECEIVE" />
-			</intent-filter>
-		</service>
-		<!-- </ Only if you're using GCM or localNotificationSchedule() > -->
 
-		<!-- < Else > -->
 		<service
 			android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"
 			android:exported="false" >
 			<intent-filter>
 				<action android:name="com.google.firebase.MESSAGING_EVENT" />
 			</intent-filter>
 		</service>
-		<!-- </Else> -->
+
+		<!-- Are these still needed? -->
+		<meta-data  android:name="com.dieam.reactnativepushnotification.notification_channel_name"
+			android:value="rocks.crownstone.consumerapp"/>
+		<meta-data  android:name="com.dieam.reactnativepushnotification.notification_channel_description"
+			android:value="Crownstone"/>
+
+		<!-- ===================================== -->
+		<!-- end of react-native-push-notification -->
+		<!-- ===================================== -->
+
+		<!-- required for react-native-maps -->
+		<meta-data android:name="com.google.android.geo.API_KEY"
+			android:value="AIzaSyCeK-7-wFdqPsgn-eG7MV-7cH-7Y-HFPuI"/>
+
+		<!-- Bugsnag -->
+		<meta-data android:name="com.bugsnag.android.API_KEY"
+			android:value="948eaede21917addd2315fde2a9c834d"/>
 
 	</application>
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -12,9 +12,9 @@ buildscript {
         supportLibVersion = "28.0.0" // Used by bluenet
 
         RNNKotlinVersion = ext.kotlin_version  // Used by react-native-navigation
-        RNNKotlinStdlib = "kotlin-stdlib-jdk8" // Used by react-native-navigation
-        firebaseIidVersion = "19.0.1" // Used by react-native-device-info
-        firebaseVersion = "19.0.1" // Used by react-native-push-notification
+//        RNNKotlinStdlib = "kotlin-stdlib-jdk8" // Used by react-native-navigation
+        firebaseIidVersion = "21.1.0" // Used by react-native-device-info
+        firebaseMessagingVersion = "21.1.0" // Used by react-native-push-notification
         googlePlayServicesVersion = "17.0.0" // Used by react-native-push-notification
         googlePlayServicesVisionVersion = "17.0.2" // Used by camera module
         androidMapsUtilsVersion = "0.5+"