Skip to content

Commit 47a926a

Browse files
fabriziomosconfabriziomoscon
committed
fix: default compile Android SDK version 31
Twilio lib v6.0.0
1 parent ca3468b commit 47a926a

File tree

5 files changed

+44
-47
lines changed

5 files changed

+44
-47
lines changed

‎android/build.gradle

+29-23
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
5+
ext.versions = [
6+
'java' : JavaVersion.VERSION_1_8,
7+
'androidGradlePlugin': '4.1.3',
8+
'googleServices' : '4.3.4',
9+
'compileSdk' : 31,
10+
'buildTools' : '30.0.2',
11+
'minSdk' : 23,
12+
'targetSdk' : 30,
13+
'firebase' : '19.0.+',
14+
'voiceAndroid' : '6.0.0',
15+
'audioSwitch' : '1.1.2',
16+
'androidxLifecycle' : '2.2.0',
17+
]
18+
419
repositories {
520
google()
621
jcenter()
722
mavenCentral()
823
}
924
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.1.3'
11-
classpath 'com.google.gms:google-services:4.3.4'
25+
classpath "com.android.tools.build:gradle:${versions.androidGradlePlugin}"
26+
classpath "com.google.gms:google-services:${versions.googleServices}"
1227

1328
// NOTE: Do not place your application dependencies here; they belong
1429
// in the individual module build.gradle files
@@ -24,22 +39,16 @@ allprojects {
2439

2540
apply plugin: 'com.android.library'
2641

27-
def DEFAULT_MIN_SDK_VERSION = 23
28-
def DEFAULT_COMPILE_SDK_VERSION = 30
29-
def DEFAULT_BUILD_TOOLS_VERSION = "29.0.3"
30-
def DEFAULT_TARGET_SDK_VERSION = 29
31-
def DEFAULT_SUPPORT_LIB_VERSION = "29.0.3"
32-
3342
android {
34-
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
35-
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
43+
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : versions.compileSdk
44+
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : versions.buildTools
3645
compileOptions {
37-
sourceCompatibility 1.8
38-
targetCompatibility 1.8
46+
sourceCompatibility versions.java
47+
targetCompatibility versions.java
3948
}
4049
defaultConfig {
41-
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
42-
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
50+
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : versions.minSdk
51+
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : versions.targetSdk
4352
versionCode 1
4453
versionName "1.0"
4554
vectorDrawables.useSupportLibrary = true
@@ -53,14 +62,11 @@ android {
5362
}
5463

5564
dependencies {
56-
def supportLibVersion = rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPORT_LIB_VERSION
57-
5865
implementation fileTree(include: ['*.jar'], dir: 'libs')
59-
implementation 'com.twilio:audioswitch:1.1.2'
60-
implementation 'com.twilio:voice-android:5.4.2'
61-
implementation "com.android.support:appcompat-v7:$supportLibVersion"
62-
implementation 'com.facebook.react:react-native:+'
63-
implementation 'com.google.firebase:firebase-messaging:19.0.+'
64-
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
65-
testImplementation 'junit:junit:4.12'
66+
implementation "com.twilio:audioswitch:${versions.audioSwitch}"
67+
implementation "com.twilio:voice-android:${versions.voiceAndroid}"
68+
implementation "com.facebook.react:react-native:+"
69+
implementation "com.google.firebase:firebase-messaging:${versions.firebase}"
70+
implementation "androidx.lifecycle:lifecycle-extensions:${versions.androidxLifecycle}"
71+
testImplementation "junit:junit:4.12"
6672
}

‎android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

‎android/src/main/java/com/hoxfon/react/RNTwilioVoice/CallNotificationManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void createMissedCallNotification(ReactApplicationContext context, String
8181
context,
8282
0,
8383
intent,
84-
PendingIntent.FLAG_UPDATE_CURRENT
84+
PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
8585
);
8686

8787
PendingIntent clearMissedCallsCountPendingIntent = PendingIntent.getBroadcast(
@@ -155,15 +155,15 @@ public void createHangupNotification(ReactApplicationContext context, String cal
155155
context,
156156
0,
157157
intent,
158-
PendingIntent.FLAG_UPDATE_CURRENT
158+
PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
159159
);
160160

161161
PendingIntent hangupPendingIntent = PendingIntent.getBroadcast(
162162
context,
163163
0,
164164
new Intent(Constants.ACTION_HANGUP_CALL)
165165
.putExtra(Constants.INCOMING_CALL_NOTIFICATION_ID, Constants.HANGUP_NOTIFICATION_ID),
166-
PendingIntent.FLAG_UPDATE_CURRENT
166+
PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
167167
);
168168

169169
Bundle extras = new Bundle();

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

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.Context;
44
import android.media.AudioAttributes;
5-
import android.media.AudioManager;
65
import android.media.Ringtone;
76
import android.media.RingtoneManager;
87
import android.net.Uri;

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

+11-19
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import android.content.SharedPreferences;
1111
import android.content.pm.PackageManager;
1212
import android.media.AudioManager;
13-
import android.os.Build;
1413

1514
import androidx.annotation.NonNull;
1615
import androidx.core.app.ActivityCompat;
@@ -37,10 +36,7 @@
3736
import com.facebook.react.bridge.ReactContextBaseJavaModule;
3837
import com.facebook.react.bridge.ReactMethod;
3938

40-
import com.google.android.gms.tasks.OnCompleteListener;
41-
import com.google.android.gms.tasks.Task;
4239
import com.google.firebase.iid.FirebaseInstanceId;
43-
import com.google.firebase.iid.InstanceIdResult;
4440

4541
import com.twilio.audioswitch.AudioDevice;
4642
import com.twilio.audioswitch.AudioSwitch;
@@ -693,22 +689,18 @@ public void unregister(Promise promise) {
693689

694690
private void unregisterForCallInvites() {
695691
FirebaseInstanceId.getInstance().getInstanceId()
696-
.addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
697-
@Override
698-
public void onComplete(@NonNull Task<InstanceIdResult> task) {
699-
if (!task.isSuccessful()) {
700-
Log.w(TAG, "FCM unregistration failed", task.getException());
701-
return;
702-
}
703-
704-
// Get new Instance ID token
705-
String fcmToken = task.getResult().getToken();
706-
if (fcmToken != null) {
707-
if (BuildConfig.DEBUG) {
708-
Log.d(TAG, "Unregistering with FCM");
709-
}
710-
Voice.unregister(accessToken, Voice.RegistrationChannel.FCM, fcmToken, unregistrationListener);
692+
.addOnCompleteListener(task -> {
693+
if (!task.isSuccessful()) {
694+
Log.w(TAG, "FCM unregistration failed", task.getException());
695+
return;
696+
}
697+
// Get new Instance ID token
698+
String fcmToken = task.getResult().getToken();
699+
if (fcmToken != null) {
700+
if (BuildConfig.DEBUG) {
701+
Log.d(TAG, "Unregistering with FCM");
711702
}
703+
Voice.unregister(accessToken, Voice.RegistrationChannel.FCM, fcmToken, unregistrationListener);
712704
}
713705
});
714706
}

0 commit comments

Comments
 (0)