diff --git a/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleClientMock.java b/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleClientMock.java index fd4c314c2..c92b140e6 100644 --- a/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleClientMock.java +++ b/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleClientMock.java @@ -24,9 +24,9 @@ import java.util.Set; import java.util.UUID; -import io.reactivex.Observable; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; import io.reactivex.subjects.ReplaySubject; /** diff --git a/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleConnectionMock.java b/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleConnectionMock.java index e83576461..fa29758a5 100644 --- a/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleConnectionMock.java +++ b/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleConnectionMock.java @@ -36,17 +36,17 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.Completable; -import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.functions.Functions; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleSource; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.functions.Functions; import io.reactivex.subjects.CompletableSubject; import io.reactivex.subjects.SingleSubject; diff --git a/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleDeviceMock.java b/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleDeviceMock.java index 03a6a1e0b..509d157a5 100644 --- a/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleDeviceMock.java +++ b/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleDeviceMock.java @@ -26,11 +26,11 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.Observable; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; -import io.reactivex.subjects.BehaviorSubject; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.subjects.BehaviorSubject; import io.reactivex.subjects.ReplaySubject; import static io.nrbtech.rxandroidble.RxBleConnection.RxBleConnectionState.CONNECTED; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/ClientComponent.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/ClientComponent.java index f961d5b08..d47244ba3 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/ClientComponent.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/ClientComponent.java @@ -52,11 +52,11 @@ import bleshadow.dagger.Provides; import bleshadow.javax.inject.Named; import bleshadow.javax.inject.Provider; -import io.reactivex.Observable; -import io.reactivex.Scheduler; -import io.reactivex.functions.Function; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; @ClientScope @Component(modules = {ClientComponent.ClientModule.class}) diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleClient.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleClient.java index d7af4f962..4205b86e3 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleClient.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleClient.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.UUID; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; public abstract class RxBleClient { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleConnection.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleConnection.java index 3c3a0b0de..d41b584b9 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleConnection.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleConnection.java @@ -24,11 +24,11 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import io.reactivex.Completable; -import io.reactivex.Observable; -import io.reactivex.ObservableTransformer; -import io.reactivex.Scheduler; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableTransformer; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; /** * The BLE connection handle, supporting GATT operations. Operations are enqueued and the library makes sure that they are not diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleCustomOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleCustomOperation.java index da012b2cb..2d3f55a7f 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleCustomOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleCustomOperation.java @@ -6,9 +6,9 @@ import io.nrbtech.rxandroidble.internal.connection.RxBleGattCallback; import io.nrbtech.rxandroidble.internal.serialization.ConnectionOperationQueue; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.core.Scheduler; /** * Represents a custom operation that will be enqueued for future execution within the client instance. diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDevice.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDevice.java index 20c9b9d9d..5d2e56125 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDevice.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDevice.java @@ -11,7 +11,7 @@ import io.nrbtech.rxandroidble.exceptions.BleGattCallbackTimeoutException; import io.nrbtech.rxandroidble.exceptions.BleGattException; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; public interface RxBleDevice { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDeviceServices.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDeviceServices.java index 484ffb89f..c7b435e50 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDeviceServices.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDeviceServices.java @@ -13,10 +13,10 @@ import java.util.UUID; import java.util.concurrent.Callable; -import io.reactivex.Observable; -import io.reactivex.Single; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; /** * Service discovery result containing list of services and characteristics within the services. diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleRadioOperationCustom.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleRadioOperationCustom.java index 75a378581..0de652a08 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleRadioOperationCustom.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleRadioOperationCustom.java @@ -6,9 +6,9 @@ import io.nrbtech.rxandroidble.internal.connection.RxBleGattCallback; import io.nrbtech.rxandroidble.internal.serialization.ConnectionOperationQueue; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.core.Scheduler; /** * @inheritDoc diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/ByteArrayBatchObservable.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/ByteArrayBatchObservable.java index ada4858a6..3d8e43299 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/ByteArrayBatchObservable.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/ByteArrayBatchObservable.java @@ -7,9 +7,9 @@ import java.nio.ByteBuffer; -import io.reactivex.Emitter; -import io.reactivex.Flowable; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.core.Emitter; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Consumer; /** * TODO It may be possible to introduce backpressure here. diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/LocationServicesOkObservable.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/LocationServicesOkObservable.java index 5c5abfc7b..bd07a8152 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/LocationServicesOkObservable.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/LocationServicesOkObservable.java @@ -10,8 +10,8 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Observable; -import io.reactivex.Observer; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; /** * An Observable that emits false if an attempt to scan with {@link io.nrbtech.rxandroidble.RxBleClient#scanBleDevices(UUID...)} diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/QueueOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/QueueOperation.java index 8f4fe41c4..2e043f228 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/QueueOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/QueueOperation.java @@ -8,9 +8,9 @@ import io.nrbtech.rxandroidble.internal.serialization.QueueReleaseInterface; import io.nrbtech.rxandroidble.internal.util.QueueReleasingEmitterWrapper; -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.ObservableOnSubscribe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.ObservableOnSubscribe; /** * The base class for all operations that are executed on the Bluetooth Queue. diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/SingleResponseOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/SingleResponseOperation.java index 5fa145b0a..c44b535a6 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/SingleResponseOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/SingleResponseOperation.java @@ -16,10 +16,10 @@ import java.util.concurrent.TimeUnit; -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.Scheduler; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; /** * A convenience class intended to use with {@link BluetoothGatt} functions that fire one-time actions. diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectionModule.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectionModule.java index c9eeb2b1d..d30c32f61 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectionModule.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectionModule.java @@ -19,7 +19,7 @@ import bleshadow.dagger.multibindings.IntoSet; import bleshadow.javax.inject.Named; import bleshadow.javax.inject.Provider; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; import static io.nrbtech.rxandroidble.internal.connection.ConnectionComponent.NamedBooleans.SUPPRESS_OPERATION_CHECKS; import static io.nrbtech.rxandroidble.internal.connection.ConnectionComponent.NamedInts.GATT_MTU_MINIMUM; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectorImpl.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectorImpl.java index 2d524480e..fb4ad7593 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectorImpl.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectorImpl.java @@ -12,12 +12,13 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.functions.Supplier; public class ConnectorImpl implements Connector { @@ -37,9 +38,9 @@ public ConnectorImpl( @Override public Observable prepareConnection(final ConnectionSetup options) { - return Observable.defer(new Callable>() { + return Observable.defer(new Supplier>() { @Override - public ObservableSource call() { + public ObservableSource get() { final ConnectionComponent connectionComponent = connectionComponentBuilder .autoConnect(options.autoConnect) .suppressOperationChecks(options.suppressOperationCheck) diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DescriptorWriter.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DescriptorWriter.java index 4fd104b05..135f5d488 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DescriptorWriter.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DescriptorWriter.java @@ -7,7 +7,7 @@ import io.nrbtech.rxandroidble.internal.serialization.ConnectionOperationQueue; import bleshadow.javax.inject.Inject; -import io.reactivex.Completable; +import io.reactivex.rxjava3.core.Completable; @ConnectionScope class DescriptorWriter { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectAction.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectAction.java index a44bad64f..9788c50c6 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectAction.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectAction.java @@ -5,7 +5,7 @@ import bleshadow.javax.inject.Inject; -import io.reactivex.internal.functions.Functions; +import io.reactivex.rxjava3.internal.functions.Functions; @ConnectionScope class DisconnectAction implements ConnectionSubscriptionWatcher { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectionRouterOutput.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectionRouterOutput.java index 08d585b76..2578b849f 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectionRouterOutput.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectionRouterOutput.java @@ -3,7 +3,7 @@ import io.nrbtech.rxandroidble.exceptions.BleException; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; /** * Interface to output disconnection error causes. It is used for instance to notify when the diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/IllegalOperationChecker.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/IllegalOperationChecker.java index 88cd6223a..caa311d17 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/IllegalOperationChecker.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/IllegalOperationChecker.java @@ -7,8 +7,8 @@ import bleshadow.javax.inject.Inject; -import io.reactivex.Completable; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.functions.Action; /** * Class for checking whether the requested operation is legal on chosen characteristic. diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ImmediateSerializedBatchAckStrategy.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ImmediateSerializedBatchAckStrategy.java index 265f2a223..753f8a454 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ImmediateSerializedBatchAckStrategy.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ImmediateSerializedBatchAckStrategy.java @@ -2,7 +2,7 @@ import io.nrbtech.rxandroidble.RxBleConnection; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; public class ImmediateSerializedBatchAckStrategy implements RxBleConnection.WriteOperationAckStrategy { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/LongWriteOperationBuilderImpl.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/LongWriteOperationBuilderImpl.java index ce80c4206..16700568e 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/LongWriteOperationBuilderImpl.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/LongWriteOperationBuilderImpl.java @@ -11,10 +11,10 @@ import java.util.UUID; import bleshadow.javax.inject.Inject; -import io.reactivex.Observable; -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleSource; +import io.reactivex.rxjava3.functions.Function; public final class LongWriteOperationBuilderImpl implements RxBleConnection.LongWriteOperationBuilder { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/MtuWatcher.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/MtuWatcher.java index b542774e4..6af02ea6b 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/MtuWatcher.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/MtuWatcher.java @@ -6,11 +6,11 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Observable; -import io.reactivex.disposables.SerialDisposable; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.functions.Functions; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.disposables.SerialDisposable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.functions.Functions; @ConnectionScope class MtuWatcher implements ConnectionSubscriptionWatcher, MtuProvider, Consumer { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NoRetryStrategy.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NoRetryStrategy.java index 316450376..99c031149 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NoRetryStrategy.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NoRetryStrategy.java @@ -2,8 +2,8 @@ import io.nrbtech.rxandroidble.RxBleConnection; -import io.reactivex.Observable; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.Function; public class NoRetryStrategy implements RxBleConnection.WriteOperationRetryStrategy { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NotificationAndIndicationManager.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NotificationAndIndicationManager.java index 5dc438944..265cf8902 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NotificationAndIndicationManager.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NotificationAndIndicationManager.java @@ -16,26 +16,26 @@ import io.nrbtech.rxandroidble.internal.util.CharacteristicNotificationId; import io.nrbtech.rxandroidble.internal.util.ObservableUtil; +import io.reactivex.rxjava3.functions.Supplier; import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import java.util.concurrent.Callable; import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Completable; -import io.reactivex.CompletableSource; -import io.reactivex.CompletableTransformer; -import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.ObservableTransformer; -import io.reactivex.functions.Action; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.functions.Functions; -import io.reactivex.subjects.PublishSubject; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.CompletableSource; +import io.reactivex.rxjava3.core.CompletableTransformer; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.ObservableTransformer; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.subjects.PublishSubject; @ConnectionScope class NotificationAndIndicationManager { @@ -71,9 +71,9 @@ class NotificationAndIndicationManager { Observable> setupServerInitiatedCharacteristicRead( @NonNull final BluetoothGattCharacteristic characteristic, final NotificationSetupMode setupMode, final boolean isIndication ) { - return Observable.defer(new Callable>>() { + return Observable.defer(new Supplier>>() { @Override - public ObservableSource> call() { + public ObservableSource> get() { synchronized (activeNotificationObservableMap) { final CharacteristicNotificationId id = new CharacteristicNotificationId(characteristic.getUuid(), characteristic.getInstanceId()); diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/RxBleConnectionImpl.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/RxBleConnectionImpl.java index 33b44885a..824bf5107 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/RxBleConnectionImpl.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/RxBleConnectionImpl.java @@ -29,16 +29,16 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; import bleshadow.javax.inject.Provider; -import io.reactivex.Completable; -import io.reactivex.CompletableSource; -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.ObservableSource; -import io.reactivex.Scheduler; -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Action; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.CompletableSource; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleSource; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.functions.Function; import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_INDICATE; import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_NOTIFY; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ServiceDiscoveryManager.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ServiceDiscoveryManager.java index 84fac66d3..a176fe1b8 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ServiceDiscoveryManager.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ServiceDiscoveryManager.java @@ -16,17 +16,17 @@ import java.util.concurrent.TimeUnit; import bleshadow.javax.inject.Inject; -import io.reactivex.Maybe; -import io.reactivex.Single; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.functions.Functions; -import io.reactivex.schedulers.Schedulers; -import io.reactivex.subjects.BehaviorSubject; -import io.reactivex.subjects.Subject; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.schedulers.Schedulers; +import io.reactivex.rxjava3.subjects.BehaviorSubject; +import io.reactivex.rxjava3.subjects.Subject; @ConnectionScope class ServiceDiscoveryManager { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicLongWriteOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicLongWriteOperation.java index 87c11843e..7b4a40e42 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicLongWriteOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicLongWriteOperation.java @@ -30,17 +30,17 @@ import java.util.UUID; import bleshadow.javax.inject.Named; -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.ObservableOnSubscribe; -import io.reactivex.ObservableSource; -import io.reactivex.Observer; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; -import io.reactivex.observers.DisposableObserver; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.ObservableOnSubscribe; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.observers.DisposableObserver; import static io.nrbtech.rxandroidble.internal.util.DisposableUtil.disposableObserverFromEmitter; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicReadOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicReadOperation.java index 2e9258f91..1209a4c5d 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicReadOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicReadOperation.java @@ -11,7 +11,7 @@ import bleshadow.javax.inject.Named; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; import static io.nrbtech.rxandroidble.internal.util.ByteAssociationUtil.characteristicUUIDPredicate; import static io.nrbtech.rxandroidble.internal.util.ByteAssociationUtil.getBytesFromAssociation; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicWriteOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicWriteOperation.java index 694cae123..a12bf94c6 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicWriteOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/CharacteristicWriteOperation.java @@ -10,7 +10,7 @@ import io.nrbtech.rxandroidble.internal.logger.LoggerUtil; import bleshadow.javax.inject.Named; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; import static io.nrbtech.rxandroidble.internal.util.ByteAssociationUtil.characteristicUUIDPredicate; import static io.nrbtech.rxandroidble.internal.util.ByteAssociationUtil.getBytesFromAssociation; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ConnectOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ConnectOperation.java index 9c7eccdbc..e1c882de5 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ConnectOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ConnectOperation.java @@ -22,14 +22,14 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.ObservableEmitter; -import io.reactivex.Single; -import io.reactivex.SingleEmitter; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.SingleTransformer; -import io.reactivex.functions.Action; -import io.reactivex.functions.Predicate; -import io.reactivex.observers.DisposableSingleObserver; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleEmitter; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.core.SingleTransformer; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.observers.DisposableSingleObserver; import static io.nrbtech.rxandroidble.RxBleConnection.RxBleConnectionState.CONNECTED; import static io.nrbtech.rxandroidble.RxBleConnection.RxBleConnectionState.CONNECTING; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ConnectionPriorityChangeOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ConnectionPriorityChangeOperation.java index 72833c418..262097147 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ConnectionPriorityChangeOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ConnectionPriorityChangeOperation.java @@ -10,7 +10,7 @@ import bleshadow.javax.inject.Inject; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; public class ConnectionPriorityChangeOperation extends SingleResponseOperation { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/DescriptorReadOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/DescriptorReadOperation.java index 8807048cc..a18bbf410 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/DescriptorReadOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/DescriptorReadOperation.java @@ -13,7 +13,7 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; import static io.nrbtech.rxandroidble.internal.util.ByteAssociationUtil.descriptorPredicate; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/DisconnectOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/DisconnectOperation.java index 7ff199839..90b80b611 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/DisconnectOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/DisconnectOperation.java @@ -21,14 +21,14 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Emitter; -import io.reactivex.ObservableEmitter; -import io.reactivex.Scheduler; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; +import io.reactivex.rxjava3.core.Emitter; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; import static io.nrbtech.rxandroidble.RxBleConnection.RxBleConnectionState.DISCONNECTED; import static io.nrbtech.rxandroidble.RxBleConnection.RxBleConnectionState.DISCONNECTING; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/LegacyScanOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/LegacyScanOperation.java index fd4b7ea06..13c99ad56 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/LegacyScanOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/LegacyScanOperation.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.UUID; -import io.reactivex.ObservableEmitter; +import io.reactivex.rxjava3.core.ObservableEmitter; public class LegacyScanOperation extends ScanOperation { @Nullable diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/MtuRequestOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/MtuRequestOperation.java index d34409667..4bc11dc75 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/MtuRequestOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/MtuRequestOperation.java @@ -9,7 +9,7 @@ import bleshadow.javax.inject.Inject; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; @RequiresApi(21 /* Build.VERSION_CODES.LOLLIPOP */) public class MtuRequestOperation extends SingleResponseOperation { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/Operation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/Operation.java index 927b6d45f..552fbe4cd 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/Operation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/Operation.java @@ -6,7 +6,7 @@ import io.nrbtech.rxandroidble.internal.Priority; import io.nrbtech.rxandroidble.internal.serialization.QueueReleaseInterface; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public interface Operation extends Comparable> { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/OperationsProviderImpl.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/OperationsProviderImpl.java index 8a80833f2..22bf79f88 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/OperationsProviderImpl.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/OperationsProviderImpl.java @@ -18,7 +18,7 @@ import bleshadow.javax.inject.Named; import bleshadow.javax.inject.Provider; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; public class OperationsProviderImpl implements OperationsProvider { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ReadRssiOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ReadRssiOperation.java index 810e6348c..4b0596fb3 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ReadRssiOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ReadRssiOperation.java @@ -10,7 +10,7 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; public class ReadRssiOperation extends SingleResponseOperation { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperation.java index f5e7e50d8..705fc5184 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperation.java @@ -9,8 +9,8 @@ import io.nrbtech.rxandroidble.internal.serialization.QueueReleaseInterface; import io.nrbtech.rxandroidble.internal.util.RxBleAdapterWrapper; -import io.reactivex.ObservableEmitter; -import io.reactivex.functions.Cancellable; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.functions.Cancellable; /** * A class that handles starting and stopping BLE scans. diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperationApi18.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperationApi18.java index c737514ec..33e40f724 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperationApi18.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperationApi18.java @@ -13,7 +13,7 @@ import io.nrbtech.rxandroidble.internal.scan.RxBleInternalScanResult; import io.nrbtech.rxandroidble.internal.util.RxBleAdapterWrapper; -import io.reactivex.ObservableEmitter; +import io.reactivex.rxjava3.core.ObservableEmitter; public class ScanOperationApi18 extends ScanOperation { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperationApi21.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperationApi21.java index cbd2df3cf..f5e120dc5 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperationApi21.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ScanOperationApi21.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; -import io.reactivex.ObservableEmitter; +import io.reactivex.rxjava3.core.ObservableEmitter; @RequiresApi(21 /* Build.VERSION_CODES.LOLLIPOP */) public class ScanOperationApi21 extends ScanOperation { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ServiceDiscoveryOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ServiceDiscoveryOperation.java index 66f078b20..13c1d746c 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ServiceDiscoveryOperation.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/ServiceDiscoveryOperation.java @@ -16,11 +16,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import io.reactivex.Scheduler; -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleSource; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Supplier; public class ServiceDiscoveryOperation extends SingleResponseOperation { @@ -74,9 +75,9 @@ protected Single timeoutFallbackProcedure( final RxBleGattCallback rxBleGattCallback, final Scheduler timeoutScheduler ) { - return Single.defer(new Callable>() { + return Single.defer(new Supplier>() { @Override - public SingleSource call() { + public SingleSource get() { final List services = bluetoothGatt.getServices(); if (services.size() == 0) { // if after the timeout services are empty we have no other option to declare a failed discovery @@ -106,6 +107,7 @@ public RxBleDeviceServices call() { } @Override + @NonNull public String toString() { return "ServiceDiscoveryOperation{" + super.toString() + '}'; } diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/TimeoutConfiguration.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/TimeoutConfiguration.java index af655cf68..dd1cd2f02 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/TimeoutConfiguration.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/operations/TimeoutConfiguration.java @@ -2,7 +2,7 @@ import java.util.concurrent.TimeUnit; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; public class TimeoutConfiguration { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/InternalToExternalScanResultConverter.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/InternalToExternalScanResultConverter.java index e15f4f88b..a649d3b70 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/InternalToExternalScanResultConverter.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/InternalToExternalScanResultConverter.java @@ -8,7 +8,7 @@ import bleshadow.javax.inject.Inject; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public class InternalToExternalScanResultConverter implements Function { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanPreconditionsVerifierApi24.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanPreconditionsVerifierApi24.java index f67bd3b73..4e87c4959 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanPreconditionsVerifierApi24.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanPreconditionsVerifierApi24.java @@ -10,7 +10,7 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; public class ScanPreconditionsVerifierApi24 implements ScanPreconditionsVerifier { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSettingsEmulator.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSettingsEmulator.java index 6b12e6ebe..2f8bba9ab 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSettingsEmulator.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSettingsEmulator.java @@ -13,12 +13,12 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.ObservableTransformer; -import io.reactivex.Scheduler; -import io.reactivex.functions.Function; -import io.reactivex.observables.GroupedObservable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.ObservableTransformer; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.observables.GroupedObservable; import static io.nrbtech.rxandroidble.internal.util.ObservableUtil.identityTransformer; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetup.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetup.java index 343faca50..0b5fd0ee5 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetup.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetup.java @@ -5,7 +5,7 @@ import io.nrbtech.rxandroidble.internal.operations.Operation; -import io.reactivex.ObservableTransformer; +import io.reactivex.rxjava3.core.ObservableTransformer; @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public class ScanSetup { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi18.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi18.java index 4c578f439..a677ebb50 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi18.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi18.java @@ -10,8 +10,8 @@ import bleshadow.javax.inject.Inject; -import io.reactivex.Observable; -import io.reactivex.ObservableTransformer; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableTransformer; @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public class ScanSetupBuilderImplApi18 implements ScanSetupBuilder { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi21.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi21.java index 1c9d463b4..099131e92 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi21.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi21.java @@ -11,7 +11,7 @@ import bleshadow.javax.inject.Inject; -import io.reactivex.ObservableTransformer; +import io.reactivex.rxjava3.core.ObservableTransformer; @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public class ScanSetupBuilderImplApi21 implements ScanSetupBuilder { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi23.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi23.java index 695338703..719a30daf 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi23.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/scan/ScanSetupBuilderImplApi23.java @@ -13,7 +13,7 @@ import bleshadow.javax.inject.Inject; -import io.reactivex.ObservableTransformer; +import io.reactivex.rxjava3.core.ObservableTransformer; @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public class ScanSetupBuilderImplApi23 implements ScanSetupBuilder { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/ClientOperationQueue.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/ClientOperationQueue.java index 7b958ca82..851ad395e 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/ClientOperationQueue.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/ClientOperationQueue.java @@ -2,7 +2,7 @@ import io.nrbtech.rxandroidble.internal.operations.Operation; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; /** * Interface used for serialization of {@link Operation} execution. diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/ConnectionOperationQueueImpl.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/ConnectionOperationQueueImpl.java index 6d1964916..326513b70 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/ConnectionOperationQueueImpl.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/ConnectionOperationQueueImpl.java @@ -18,12 +18,12 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.ObservableOnSubscribe; -import io.reactivex.Scheduler; -import io.reactivex.functions.Cancellable; -import io.reactivex.observers.DisposableObserver; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.ObservableOnSubscribe; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.functions.Cancellable; +import io.reactivex.rxjava3.observers.DisposableObserver; import static io.nrbtech.rxandroidble.internal.logger.LoggerUtil.commonMacMessage; import static io.nrbtech.rxandroidble.internal.logger.LoggerUtil.logOperationFinished; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/FIFORunnableEntry.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/FIFORunnableEntry.java index 09b3dfd80..72cdceb08 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/FIFORunnableEntry.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/FIFORunnableEntry.java @@ -8,10 +8,10 @@ import io.nrbtech.rxandroidble.internal.logger.LoggerUtil; import java.util.concurrent.atomic.AtomicLong; -import io.reactivex.ObservableEmitter; -import io.reactivex.Observer; -import io.reactivex.Scheduler; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; class FIFORunnableEntry implements Comparable { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/RxBleThreadFactory.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/RxBleThreadFactory.java index d01f40c27..3f34d9656 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/RxBleThreadFactory.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/serialization/RxBleThreadFactory.java @@ -1,6 +1,6 @@ package io.nrbtech.rxandroidble.internal.serialization; -import io.reactivex.internal.schedulers.NonBlockingThread; +import io.reactivex.rxjava3.internal.schedulers.NonBlockingThread; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicLong; diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ActiveCharacteristicNotification.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ActiveCharacteristicNotification.java index 00d30effb..ac1616b98 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ActiveCharacteristicNotification.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ActiveCharacteristicNotification.java @@ -1,7 +1,7 @@ package io.nrbtech.rxandroidble.internal.util; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; public class ActiveCharacteristicNotification { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ByteAssociationUtil.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ByteAssociationUtil.java index 79370a9c2..f6abbf543 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ByteAssociationUtil.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ByteAssociationUtil.java @@ -4,8 +4,8 @@ import java.util.UUID; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; public class ByteAssociationUtil { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ClientStateObservable.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ClientStateObservable.java index c37b19fc9..6da323789 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ClientStateObservable.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ClientStateObservable.java @@ -12,13 +12,13 @@ import bleshadow.javax.inject.Inject; import bleshadow.javax.inject.Named; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.Scheduler; -import io.reactivex.Single; -import io.reactivex.disposables.Disposables; -import io.reactivex.functions.Function; -import io.reactivex.functions.Predicate; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.functions.Predicate; /** * The Observable class which emits changes to the Client State. These can be useful for evaluating if particular functionality @@ -85,7 +85,7 @@ static Observable checkAdapterAndServicesState( final Observable locationServicesOkObservable ) { return rxBleAdapterStateObservable - .startWith(rxBleAdapterWrapper.isBluetoothEnabled() + .startWithItem(rxBleAdapterWrapper.isBluetoothEnabled() ? RxBleAdapterStateObservable.BleAdapterState.STATE_ON /* * Actual RxBleAdapterStateObservable.BleAdapterState does not really matter - because in the .switchMap() below @@ -114,7 +114,7 @@ public RxBleClient.State apply(Boolean locationServicesOk) { @Override protected void subscribeActual(Observer observer) { if (!rxBleAdapterWrapper.hasBluetoothAdapter()) { - observer.onSubscribe(Disposables.empty()); + observer.onSubscribe(Disposable.empty()); observer.onComplete(); return; } diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/DisposableUtil.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/DisposableUtil.java index b6d8ae118..170762e4a 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/DisposableUtil.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/DisposableUtil.java @@ -1,9 +1,9 @@ package io.nrbtech.rxandroidble.internal.util; -import io.reactivex.ObservableEmitter; -import io.reactivex.SingleEmitter; -import io.reactivex.observers.DisposableObserver; -import io.reactivex.observers.DisposableSingleObserver; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.SingleEmitter; +import io.reactivex.rxjava3.observers.DisposableObserver; +import io.reactivex.rxjava3.observers.DisposableSingleObserver; public class DisposableUtil { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/LocationServicesOkObservableApi23Factory.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/LocationServicesOkObservableApi23Factory.java index 7a0d528aa..9bbf9c657 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/LocationServicesOkObservableApi23Factory.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/LocationServicesOkObservableApi23Factory.java @@ -8,11 +8,11 @@ import android.location.LocationManager; import bleshadow.javax.inject.Inject; -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.ObservableOnSubscribe; -import io.reactivex.functions.Cancellable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.ObservableOnSubscribe; +import io.reactivex.rxjava3.functions.Cancellable; +import io.reactivex.rxjava3.schedulers.Schedulers; @TargetApi(19 /* Build.VERSION_CODES.KITKAT */) public class LocationServicesOkObservableApi23Factory { diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ObservableUtil.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ObservableUtil.java index 088cc29e6..6aa7ac8e3 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ObservableUtil.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/ObservableUtil.java @@ -1,8 +1,8 @@ package io.nrbtech.rxandroidble.internal.util; -import io.reactivex.Observable; -import io.reactivex.ObservableTransformer; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableTransformer; public class ObservableUtil { @@ -19,7 +19,7 @@ private ObservableUtil() { } public static Observable justOnNext(T onNext) { - return Observable.never().startWith(onNext); + return Observable.never().startWithItem(onNext); } @SuppressWarnings("unchecked") diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/QueueReleasingEmitterWrapper.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/QueueReleasingEmitterWrapper.java index 61bcf0993..8a1c78a56 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/QueueReleasingEmitterWrapper.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/util/QueueReleasingEmitterWrapper.java @@ -6,11 +6,11 @@ import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.Emitter; -import io.reactivex.ObservableEmitter; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Cancellable; +import io.reactivex.rxjava3.core.Emitter; +import io.reactivex.rxjava3.core.ObservableEmitter; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Cancellable; /** * A convenience class to use in {@link QueueOperation} subclasses. It wraps the {@link Emitter} diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/utils/ConnectionSharingAdapter.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/utils/ConnectionSharingAdapter.java index c56ed5abe..98cc64b70 100644 --- a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/utils/ConnectionSharingAdapter.java +++ b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/utils/ConnectionSharingAdapter.java @@ -4,10 +4,10 @@ import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.ObservableTransformer; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.ObservableTransformer; +import io.reactivex.rxjava3.functions.Action; /** * Observable transformer that can be used to share connection between many subscribers. diff --git a/rxandroidble/src/test/groovy/io/nrbtech/rxandroidble/internal/util/MockOperationTimeoutConfiguration.java b/rxandroidble/src/test/groovy/io/nrbtech/rxandroidble/internal/util/MockOperationTimeoutConfiguration.java index 159098dfa..5ff62162a 100644 --- a/rxandroidble/src/test/groovy/io/nrbtech/rxandroidble/internal/util/MockOperationTimeoutConfiguration.java +++ b/rxandroidble/src/test/groovy/io/nrbtech/rxandroidble/internal/util/MockOperationTimeoutConfiguration.java @@ -4,7 +4,7 @@ import java.util.concurrent.TimeUnit; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; public class MockOperationTimeoutConfiguration extends TimeoutConfiguration { diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle index 3c56fc609..f13d35d1a 100644 --- a/sample-kotlin/build.gradle +++ b/sample-kotlin/build.gradle @@ -57,7 +57,7 @@ dependencies { // RxJava implementation rootProject.ext.libs.rxjava implementation rootProject.ext.libs.rxandroid - implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0' + implementation 'io.reactivex.rxjava3:rxkotlin:3.0.0' // Replaying share implementation rootProject.ext.libs.rxjava_replayingshare diff --git a/sample/src/main/java/io/nrbtech/rxandroidble/sample/SampleApplication.java b/sample/src/main/java/io/nrbtech/rxandroidble/sample/SampleApplication.java index b111d4c17..a0e784ab5 100644 --- a/sample/src/main/java/io/nrbtech/rxandroidble/sample/SampleApplication.java +++ b/sample/src/main/java/io/nrbtech/rxandroidble/sample/SampleApplication.java @@ -9,7 +9,7 @@ import io.nrbtech.rxandroidble.RxBleClient; import io.nrbtech.rxandroidble.exceptions.BleException; import io.reactivex.exceptions.UndeliverableException; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public class SampleApplication extends Application { diff --git a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example1_scanning/ScanActivity.java b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example1_scanning/ScanActivity.java index 3439d6f12..9d8a72a2a 100644 --- a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example1_scanning/ScanActivity.java +++ b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example1_scanning/ScanActivity.java @@ -23,8 +23,8 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; public class ScanActivity extends AppCompatActivity { diff --git a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example2_connection/ConnectionExampleActivity.java b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example2_connection/ConnectionExampleActivity.java index e350df5a9..5fc716950 100644 --- a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example2_connection/ConnectionExampleActivity.java +++ b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example2_connection/ConnectionExampleActivity.java @@ -18,9 +18,9 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.CompositeDisposable; +import io.reactivex.rxjava3.disposables.Disposable; public class ConnectionExampleActivity extends AppCompatActivity { diff --git a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example3_discovery/ServiceDiscoveryExampleActivity.java b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example3_discovery/ServiceDiscoveryExampleActivity.java index 9ae94a253..3ada6dfbd 100644 --- a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example3_discovery/ServiceDiscoveryExampleActivity.java +++ b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example3_discovery/ServiceDiscoveryExampleActivity.java @@ -18,9 +18,9 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.CompositeDisposable; +import io.reactivex.rxjava3.disposables.Disposable; public class ServiceDiscoveryExampleActivity extends AppCompatActivity { diff --git a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example4_characteristic/advanced/Presenter.java b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example4_characteristic/advanced/Presenter.java index d90cf9d37..caec233e4 100644 --- a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example4_characteristic/advanced/Presenter.java +++ b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example4_characteristic/advanced/Presenter.java @@ -11,9 +11,9 @@ import java.util.UUID; -import io.reactivex.Observable; -import io.reactivex.ObservableTransformer; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableTransformer; +import io.reactivex.rxjava3.core.Single; import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_INDICATE; import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_NOTIFY; @@ -78,7 +78,7 @@ static Observable prepareActivityLogic( notifyAndIndicateObservable ) // start by informing the Activity that connection is established - .startWith(new InfoEvent("Hey, connection has been established!")); + .startWithItem(new InfoEvent("Hey, connection has been established!")); } ) // convenience transformer to close the connection @@ -180,7 +180,7 @@ private static Observable setupNotificationAndIndicationBehaviou */ .compose(repeatAfterCompleted()) // at the beginning inform the activity about whether compat mode is being used - .startWith(new CompatibilityModeEvent( + .startWithItem(new CompatibilityModeEvent( hasProperty(characteristic, PROPERTY_NOTIFY | PROPERTY_INDICATE) && notificationSetupMode == NotificationSetupMode.COMPAT )); diff --git a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example5_rssi_periodic/RssiPeriodicExampleActivity.java b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example5_rssi_periodic/RssiPeriodicExampleActivity.java index 707bc2650..e274f8bc2 100644 --- a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example5_rssi_periodic/RssiPeriodicExampleActivity.java +++ b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example5_rssi_periodic/RssiPeriodicExampleActivity.java @@ -15,9 +15,9 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example7_long_write/LongWriteExampleActivity.java b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example7_long_write/LongWriteExampleActivity.java index e6b89c5e6..74a390b06 100644 --- a/sample/src/main/java/io/nrbtech/rxandroidble/sample/example7_long_write/LongWriteExampleActivity.java +++ b/sample/src/main/java/io/nrbtech/rxandroidble/sample/example7_long_write/LongWriteExampleActivity.java @@ -11,9 +11,9 @@ import java.util.UUID; -import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.disposables.Disposable; /** * For the sake of this example lets assume that we have a Bluetooth Device that is retrieved by: