feat: use Android 5.1.0

Apply Twilio Quickstart fixes.
Set attributes and content type for ringtone.

Author: fabriziomoscon

README.md

@@ -16,7 +16,7 @@ Tested with:
 
 The most updated branch is [feat/twilio-android-sdk-5](https://github.com/hoxfon/react-native-twilio-programmable-voice/tree/feat/twilio-android-sdk-5) which is aligned with:
 
-- Android 5.0.2
+- Android 5.1.0
 - iOS 5.2.0
 
 It contains breaking changes from `react-native-twilio-programmable-voice` v4, and it will be released as v5.
@@ -74,6 +74,15 @@ To allow the library to show heads up notifications you must add the following l
     <application
         ...
     >
+        <!-- Twilio Voice -->
+        <!-- [START fcm_listener] -->
+        <service
+            android:name="com.hoxfon.react.RNTwilioVoice.fcm.VoiceFirebaseMessagingService"
+            android:stopWithTask="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
         <service
             android:enabled="true"
             android:name="com.hoxfon.react.RNTwilioVoice.IncomingCallNotificationService"
@@ -83,7 +92,8 @@ To allow the library to show heads up notifications you must add the following l
                 <action android:name="com.hoxfon.react.RNTwilioVoice.ACTION_REJECT" />
             </intent-filter>
         </service>
-        ...
+        <!-- [END fcm_listener] -->
+        <!-- Twilio Voice -->
     </application>
 ```
 
@@ -311,7 +321,8 @@ apply plugin: 'com.google.gms.google-services'
         <!-- Twilio Voice -->
         <!-- [START fcm_listener] -->
         <service
-            android:name="com.hoxfon.react.RNTwilioVoice.fcm.VoiceFirebaseMessagingService">
+            android:name="com.hoxfon.react.RNTwilioVoice.fcm.VoiceFirebaseMessagingService"
+            android:stopWithTask="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>

android/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     def supportLibVersion = rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPORT_LIB_VERSION
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.twilio:voice-android:5.0.2'
+    implementation 'com.twilio:voice-android:5.1.0'
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.google.firebase:firebase-messaging:19.0.+'

android/src/main/java/com/hoxfon/react/RNTwilioVoice/IncomingCallNotificationService.java

@@ -12,9 +12,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-//import android.media.AudioAttributes;
-//import android.media.RingtoneManager;
-//import android.net.Uri;
+
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -269,6 +267,7 @@ private void endForeground() {
         stopForeground(true);
     }
 
+    @TargetApi(Build.VERSION_CODES.O)
     private void setCallInProgressNotification(CallInvite callInvite, int notificationId) {
         if (BuildConfig.DEBUG) {
             Log.d(TAG, "setCallInProgressNotification()");

android/src/main/java/com/hoxfon/react/RNTwilioVoice/SoundPoolManager.java

@@ -1,6 +1,8 @@
 package com.hoxfon.react.RNTwilioVoice;
 
 import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioManager;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
@@ -14,6 +16,11 @@ public class SoundPoolManager {
     private SoundPoolManager(Context context) {
         Uri ringtoneSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
         ringtone = RingtoneManager.getRingtone(context, ringtoneSound);
+        AudioAttributes alarmAttribute = new AudioAttributes.Builder()
+                .setUsage(AudioAttributes.USAGE_ALARM)
+                .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                .build();
+        ringtone.setAudioAttributes(alarmAttribute);
     }
 
     public static SoundPoolManager getInstance(Context context) {

android/src/main/java/com/hoxfon/react/RNTwilioVoice/TwilioVoiceModule.java

@@ -204,15 +204,17 @@ public void onNewIntent(Intent intent) {
     private RegistrationListener registrationListener() {
         return new RegistrationListener() {
             @Override
-            public void onRegistered(String accessToken, String fcmToken) {
+            public void onRegistered(@NonNull String accessToken, @NonNull String fcmToken) {
                 if (BuildConfig.DEBUG) {
                     Log.d(TAG, "RegistrationListener().onRegistered(). FCM registered.");
                 }
                 eventManager.sendEvent(EVENT_DEVICE_READY, null);
             }
 
             @Override
-            public void onError(RegistrationException error, String accessToken, String fcmToken) {
+            public void onError(@NonNull RegistrationException error,
+                                @NonNull String accessToken,
+                                @NonNull String fcmToken) {
                 Log.e(TAG, String.format("RegistrationListener().onError(). Code: %d. %s", error.getErrorCode(), error.getMessage()));
                 WritableMap params = Arguments.createMap();
                 params.putString(Constants.ERROR, error.getMessage());
@@ -407,13 +409,13 @@ private class VoiceBroadcastReceiver extends BroadcastReceiver {
 
         @Override
         public void onReceive(Context context, Intent intent) {
+            if (intent == null || intent.getAction() == null) {
+                return;
+            }
             String action = intent.getAction();
             if (BuildConfig.DEBUG) {
                 Log.d(TAG, "VoiceBroadcastReceiver.onReceive() action: " + action + ". Intent extra: " + intent.getExtras());
             }
-            if (intent == null || intent.getAction() == null) {
-                return;
-            }
             activeCallInvite = intent.getParcelableExtra(Constants.INCOMING_CALL_INVITE);
 
             switch (action) {
@@ -595,7 +597,7 @@ public void initWithAccessToken(final String accessToken, Promise promise) {
      *
      */
     private void registerForCallInvites() {
-        final String fcmToken = FirebaseInstanceId.getInstance().getToken();
+        String fcmToken = FirebaseInstanceId.getInstance().getToken();
         if (fcmToken == null) {
             return;
         }

android/src/main/java/com/hoxfon/react/RNTwilioVoice/fcm/VoiceFirebaseMessagingService.java

@@ -40,11 +40,9 @@ public void onCreate() {
 
     @Override
     public void onNewToken(String token) {
-        Log.d(TAG, "Refreshed token: " + token);
-
-        // Notify Activity of FCM token
+        super.onNewToken(token);
         Intent intent = new Intent(Constants.ACTION_FCM_TOKEN);
-        LocalBroadcastManager.getInstance(this.getBaseContext()).sendBroadcast(intent);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
     }
 
     /**