Skip to content

Remove unneeded nullable annotations #581

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
davidliu merged 2 commits into from
Jan 10, 2025
Merged

Remove unneeded nullable annotations #581

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
53ccff1
Remove unneeded nullable annotations
davidliu Jan 10, 2025
5fe29e7
spotless
davidliu Jan 10, 2025
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
8 changes: 1 addition & 7 deletions livekit-android-sdk/src/main/java/io/livekit/android/dagger/RTCModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 LiveKit, Inc.
* Copyright 2023-2025 LiveKit, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,6 @@ import android.javax.sdp.SdpFactory
import android.media.AudioAttributes
import android.media.MediaRecorder
import android.os.Build
import androidx.annotation.Nullable
import dagger.Module
import dagger.Provides
import io.livekit.android.LiveKit
Expand Down Expand Up @@ -148,10 +147,8 @@ internal object RTCModule {
@JvmSuppressWildcards
fun audioModule(
@Named(InjectionNames.OVERRIDE_AUDIO_DEVICE_MODULE)
@Nullable
audioDeviceModuleOverride: AudioDeviceModule?,
@Named(InjectionNames.OVERRIDE_JAVA_AUDIO_DEVICE_MODULE_CUSTOMIZER)
@Nullable
moduleCustomizer: ((builder: JavaAudioDeviceModule.Builder) -> Unit)?,
audioOutputAttributes: AudioAttributes,
appContext: Context,
Expand Down Expand Up @@ -250,7 +247,6 @@ internal object RTCModule {
@Singleton
fun eglBase(
@Named(InjectionNames.OVERRIDE_EGL_BASE)
@Nullable
eglBaseOverride: EglBase?,
memoryManager: CloseableManager,
): EglBase {
Expand All @@ -271,7 +267,6 @@ internal object RTCModule {
videoHwAccel: Boolean,
eglContext: EglBase.Context,
@Named(InjectionNames.OVERRIDE_VIDEO_ENCODER_FACTORY)
@Nullable
videoEncoderFactoryOverride: VideoEncoderFactory?,
): VideoEncoderFactory {
return videoEncoderFactoryOverride ?: if (videoHwAccel) {
Expand Down Expand Up @@ -316,7 +311,6 @@ internal object RTCModule {
videoHwAccel: Boolean,
eglContext: EglBase.Context,
@Named(InjectionNames.OVERRIDE_VIDEO_DECODER_FACTORY)
@Nullable
videoDecoderFactoryOverride: VideoDecoderFactory?,
): VideoDecoderFactory {
return videoDecoderFactoryOverride ?: if (videoHwAccel) {
Expand Down
4 changes: 1 addition & 3 deletions livekit-android-sdk/src/main/java/io/livekit/android/dagger/WebModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 LiveKit, Inc.
* Copyright 2023-2025 LiveKit, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,6 @@ package io.livekit.android.dagger

import android.content.Context
import android.net.ConnectivityManager
import androidx.annotation.Nullable
import dagger.Module
import dagger.Provides
import dagger.Reusable
Expand All @@ -42,7 +41,6 @@ internal object WebModule {
@Singleton
fun okHttpClient(
@Named(InjectionNames.OVERRIDE_OKHTTP)
@Nullable
okHttpClientOverride: OkHttpClient?,
): OkHttpClient {
return okHttpClientOverride ?: OkHttpClient()
Expand Down
Loading