Skip to content

Fix android build errors with RN 0.74 #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −10
Open

Fix android build errors with RN 0.74 #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.6.4'
}
}

Expand Down
30 changes: 21 additions & 9 deletions android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,9 @@ public void startCall(String uuid, String number, String callerName, boolean has

Log.d(TAG, "[RNCallKeepModule] startCall, uuid: " + uuid);
this.listenToNativeCallsState();
telecomManager.placeCall(uri, extras);
try {
telecomManager.placeCall(uri, extras);
} catch (SecurityException ignored) {}
}

@ReactMethod
Expand All @@ -530,7 +532,7 @@ public void endCall(String uuid) {
}
Context context = this.getAppContext();
AudioManager audioManager = (AudioManager) context.getSystemService(context.AUDIO_SERVICE);
audioManager.setMode(0);
audioManager.setMode(AudioManager.MODE_NORMAL);
conn.onDisconnect();
this.stopListenToNativeCallsState();
this.hasActiveCall = false;
Expand Down Expand Up @@ -673,7 +675,11 @@ public void checkDefaultPhoneAccount(Promise promise) {
}

boolean hasSim = telephonyManager.getSimState() != TelephonyManager.SIM_STATE_ABSENT;
boolean hasDefaultAccount = telecomManager.getDefaultOutgoingPhoneAccount("tel") != null;

boolean hasDefaultAccount = false;
try {
hasDefaultAccount = telecomManager.getDefaultOutgoingPhoneAccount("tel") != null;
} catch (SecurityException ignored) {}

promise.resolve(!hasSim || hasDefaultAccount);
}
Expand Down Expand Up @@ -1078,14 +1084,20 @@ public void backToForeground() {
if (isOpened) {
focusIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
activity.startActivity(focusIntent);
} else {
focusIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK +
WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED +
WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD +
WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
return;
}

getReactApplicationContext().startActivity(focusIntent);
focusIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
activity.setShowWhenLocked(true);
activity.setTurnScreenOn(true);
} else {
activity.getWindow().addFlags(
WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED +
WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
}

getReactApplicationContext().startActivity(focusIntent);
}

public static void onRequestPermissionsResult(int requestCode, String[] grantedPermissions, int[] grantResults) {
Expand Down