Skip to content

fix(android): specify export mode on BroadcastReceivers #238

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

Merged
merged 2 commits into from
Feb 19, 2024
Merged

fix(android): specify export mode on BroadcastReceivers #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28e764d
fix(android): specify export mode on BroadcastReceivers
santhoshvai Feb 16, 2024
a649084
Merge branch 'master' into fix-android-34
zxcpoiu Feb 19, 2024
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 @@ -10,7 +10,7 @@ android {
namespace "com.zxcpoiu.incallmanager"
}

compileSdkVersion safeExtGet('compileSdkVersion', 30)
compileSdkVersion safeExtGet('compileSdkVersion', 33)
buildToolsVersion safeExtGet('buildToolsVersion', "30.0.2")

defaultConfig {
Expand Down
6 changes: 5 additions & 1 deletion android/src/main/java/com/zxcpoiu/incallmanager/AppRTC/AppRTCBluetoothManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,11 @@ protected AudioManager getAudioManager(Context context) {
return (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
}
protected void registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
apprtcContext.registerReceiver(receiver, filter);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
apprtcContext.registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED);
} else {
apprtcContext.registerReceiver(receiver, filter);
}
}
protected void unregisterReceiver(BroadcastReceiver receiver) {
apprtcContext.unregisterReceiver(receiver);
Expand Down
33 changes: 14 additions & 19 deletions android/src/main/java/com/zxcpoiu/incallmanager/InCallManagerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,7 @@ public void onReceive(Context context, Intent intent) {
}
}
};
ReactContext reactContext = getReactApplicationContext();
if (reactContext != null) {
reactContext.registerReceiver(wiredHeadsetReceiver, filter);
} else {
Log.d(TAG, "startWiredHeadsetEvent() reactContext is null");
}
this.registerReceiver(wiredHeadsetReceiver, filter);
}
}

Expand All @@ -322,12 +317,7 @@ public void onReceive(Context context, Intent intent) {
}
}
};
ReactContext reactContext = getReactApplicationContext();
if (reactContext != null) {
reactContext.registerReceiver(noisyAudioReceiver, filter);
} else {
Log.d(TAG, "startNoisyAudioEvent() reactContext is null");
}
this.registerReceiver(noisyAudioReceiver, filter);
}
}

Expand Down Expand Up @@ -389,12 +379,8 @@ public void onReceive(Context context, Intent intent) {
}
}
};
ReactContext reactContext = getReactApplicationContext();
if (reactContext != null) {
reactContext.registerReceiver(mediaButtonReceiver, filter);
} else {
Log.d(TAG, "startMediaButtonEvent() reactContext is null");
}

this.registerReceiver(mediaButtonReceiver, filter);
}
}

Expand Down Expand Up @@ -1669,7 +1655,16 @@ public AudioDevice getSelectedAudioDevice() {

/** Helper method for receiver registration. */
private void registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
getReactApplicationContext().registerReceiver(receiver, filter);
final ReactContext reactContext = getReactApplicationContext();
if (reactContext != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
reactContext.registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED);
} else {
reactContext.registerReceiver(receiver, filter);
}
} else {
Log.d(TAG, "registerReceiver() reactContext is null");
}
}

/** Helper method for unregistration of an existing receiver. */
Expand Down