Skip to content

Commit

Permalink
sed file contents
Browse files Browse the repository at this point in the history
git grep -l rxandroidble2 | xargs sed -i 's|rxandroidble2|rxandroidble3|g'
  • Loading branch information
z3ntu committed Apr 1, 2021
1 parent 17b2598 commit ebda741
Show file tree
Hide file tree
Showing 293 changed files with 1,283 additions and 1,283 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# RxAndroidBle [![Build Status](https://travis-ci.org/Polidea/RxAndroidBle.svg?branch=master)](https://travis-ci.org/Polidea/RxAndroidBle) [![Maven Central](https://img.shields.io/maven-central/v/com.polidea.rxandroidble2/rxandroidble.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.polidea.rxandroidble2%22%20AND%20a%3A%22rxandroidble%22)
# RxAndroidBle [![Build Status](https://travis-ci.org/Polidea/RxAndroidBle.svg?branch=master)](https://travis-ci.org/Polidea/RxAndroidBle) [![Maven Central](https://img.shields.io/maven-central/v/com.polidea.rxandroidble3/rxandroidble.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.polidea.rxandroidble3%22%20AND%20a%3A%22rxandroidble%22)
<p align="center">
<img
alt="Tailored software services including concept, design, development and testing"
Expand Down Expand Up @@ -291,7 +291,7 @@ The below table contains an overview of used `Observable` patterns
\** this `Observable` may complete. For example `observeStateChanges()` does emit only a single value and finishes in exactly one situation — when Bluetooth Adapter is not available on the device. There is no reason to monitor other states as the adapter does not appear during runtime. A second example: Observables emitted from `setupNotification` / `setupIndication` may complete when the parent Observable is disposed.

### Helpers
We encourage you to check the package [`com.polidea.rxandroidble2.helpers`](https://github.com/Polidea/RxAndroidBle/tree/master/rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers) and [`com.polidea.rxandroidble2.utils`](https://github.com/Polidea/RxAndroidBle/tree/master/rxandroidble/src/main/java/com/polidea/rxandroidble2/utils) which contain handy reactive wrappers for some typical use-cases.
We encourage you to check the package [`com.polidea.rxandroidble3.helpers`](https://github.com/Polidea/RxAndroidBle/tree/master/rxandroidble/src/main/java/com/polidea/rxandroidble3/helpers) and [`com.polidea.rxandroidble3.utils`](https://github.com/Polidea/RxAndroidBle/tree/master/rxandroidble/src/main/java/com/polidea/rxandroidble3/utils) which contain handy reactive wrappers for some typical use-cases.

#### Value interpretation
Bluetooth Specification specifies formats in which `int`/`float`/`String` values may be stored in characteristics. `BluetoothGattCharacteristic` has functions for retrieving those (`.getIntValue()`/`.getFloatValue()`/`.getStringValue()`).
Expand Down Expand Up @@ -327,22 +327,22 @@ Google is checking `AndroidManifest` for declaring permissions when releasing to
## More examples
Usage examples are located in:
- [`/sample`](https://github.com/Polidea/RxAndroidBle/tree/master/sample/src/main/java/com/polidea/rxandroidble2/sample)
- [`/sample-kotlin`](https://github.com/Polidea/RxAndroidBle/tree/master/sample-kotlin/src/main/kotlin/com/polidea/rxandroidble2/samplekotlin)
- [`/sample`](https://github.com/Polidea/RxAndroidBle/tree/master/sample/src/main/java/com/polidea/rxandroidble3/sample)
- [`/sample-kotlin`](https://github.com/Polidea/RxAndroidBle/tree/master/sample-kotlin/src/main/kotlin/com/polidea/rxandroidble3/samplekotlin)
Keep in mind that these are only _samples_ to show how the library can be used. These are not meant for being role model of a good application architecture.
## Download
### Gradle
```groovy
implementation "com.polidea.rxandroidble2:rxandroidble:1.11.1"
implementation "com.polidea.rxandroidble3:rxandroidble:1.11.1"
```
### Maven
```xml
<dependency>
<groupId>com.polidea.rxandroidble2</groupId>
<groupId>com.polidea.rxandroidble3</groupId>
<artifactId>rxandroidble</artifactId>
<version>1.11.1</version>
<type>aar</type>
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GROUP=com.polidea.rxandroidble2
GROUP=com.polidea.rxandroidble3
VERSION_NAME=1.12.0-SNAPSHOT

POM_DESCRIPTION=RxJava backed support for Bluetooth Low Energy in Android
Expand Down
4 changes: 2 additions & 2 deletions mockrxandroidble/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Get MockRxAndroidBle via Maven:

```xml
<dependency>
<groupId>com.polidea.rxandroidble2</groupId>
<groupId>com.polidea.rxandroidble3</groupId>
<artifactId>mockclient</artifactId>
<version>1.11.1</version>
<type>aar</type>
Expand All @@ -71,7 +71,7 @@ Get MockRxAndroidBle via Maven:
or via Gradle

```groovy
implementation "com.polidea.rxandroidble2:mockclient:1.11.1"
implementation "com.polidea.rxandroidble3:mockclient:1.11.1"
```

### License
Expand Down
2 changes: 1 addition & 1 deletion mockrxandroidble/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest package="com.polidea.rxandroidble2.mockrxandroidble" />
<manifest package="com.polidea.rxandroidble3.mockrxandroidble" />
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.polidea.rxandroidble2.mockrxandroidble;
package com.polidea.rxandroidble3.mockrxandroidble;

import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattDescriptor;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.polidea.rxandroidble2.RxBleClient;
import com.polidea.rxandroidble2.RxBleDevice;
import com.polidea.rxandroidble2.RxBleScanResult;
import com.polidea.rxandroidble2.scan.BackgroundScanner;
import com.polidea.rxandroidble2.scan.ScanCallbackType;
import com.polidea.rxandroidble2.scan.ScanFilter;
import com.polidea.rxandroidble2.scan.ScanRecord;
import com.polidea.rxandroidble2.scan.ScanResult;
import com.polidea.rxandroidble2.scan.ScanSettings;
import com.polidea.rxandroidble3.RxBleClient;
import com.polidea.rxandroidble3.RxBleDevice;
import com.polidea.rxandroidble3.RxBleScanResult;
import com.polidea.rxandroidble3.scan.BackgroundScanner;
import com.polidea.rxandroidble3.scan.ScanCallbackType;
import com.polidea.rxandroidble3.scan.ScanFilter;
import com.polidea.rxandroidble3.scan.ScanRecord;
import com.polidea.rxandroidble3.scan.ScanResult;
import com.polidea.rxandroidble3.scan.ScanSettings;

import java.nio.ByteBuffer;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.polidea.rxandroidble2.mockrxandroidble;
package com.polidea.rxandroidble3.mockrxandroidble;

import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattDescriptor;
Expand All @@ -7,25 +7,25 @@
import android.bluetooth.BluetoothGattService;
import android.util.Log;

import com.polidea.rxandroidble2.ConnectionParameters;
import com.polidea.rxandroidble2.NotificationSetupMode;
import com.polidea.rxandroidble2.RxBleConnection;
import com.polidea.rxandroidble2.RxBleCustomOperation;
import com.polidea.rxandroidble2.RxBleDeviceServices;
import com.polidea.rxandroidble2.exceptions.BleConflictingNotificationAlreadySetException;
import com.polidea.rxandroidble2.exceptions.BleDisconnectedException;
import com.polidea.rxandroidble2.exceptions.BleGattCharacteristicException;
import com.polidea.rxandroidble2.exceptions.BleGattDescriptorException;
import com.polidea.rxandroidble2.exceptions.BleGattOperationType;
import com.polidea.rxandroidble2.internal.Priority;
import com.polidea.rxandroidble2.internal.connection.ImmediateSerializedBatchAckStrategy;
import com.polidea.rxandroidble2.internal.util.ObservableUtil;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.results.RxBleGattReadResultMock;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.results.RxBleGattWriteResultMock;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.RxBleCharacteristicReadCallback;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.RxBleCharacteristicWriteCallback;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.RxBleDescriptorReadCallback;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.RxBleDescriptorWriteCallback;
import com.polidea.rxandroidble3.ConnectionParameters;
import com.polidea.rxandroidble3.NotificationSetupMode;
import com.polidea.rxandroidble3.RxBleConnection;
import com.polidea.rxandroidble3.RxBleCustomOperation;
import com.polidea.rxandroidble3.RxBleDeviceServices;
import com.polidea.rxandroidble3.exceptions.BleConflictingNotificationAlreadySetException;
import com.polidea.rxandroidble3.exceptions.BleDisconnectedException;
import com.polidea.rxandroidble3.exceptions.BleGattCharacteristicException;
import com.polidea.rxandroidble3.exceptions.BleGattDescriptorException;
import com.polidea.rxandroidble3.exceptions.BleGattOperationType;
import com.polidea.rxandroidble3.internal.Priority;
import com.polidea.rxandroidble3.internal.connection.ImmediateSerializedBatchAckStrategy;
import com.polidea.rxandroidble3.internal.util.ObservableUtil;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.results.RxBleGattReadResultMock;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.results.RxBleGattWriteResultMock;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.RxBleCharacteristicReadCallback;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.RxBleCharacteristicWriteCallback;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.RxBleDescriptorReadCallback;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.RxBleDescriptorWriteCallback;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -723,7 +723,7 @@ public Builder addService(@NonNull UUID uuid, @NonNull List<BluetoothGattCharact

/**
* Set an {@link Observable} that will be used to fire characteristic change notifications. It will be subscribed to after
* a call to {@link com.polidea.rxandroidble2.RxBleConnection#setupNotification(UUID)}. Calling this method is not required.
* a call to {@link com.polidea.rxandroidble3.RxBleConnection#setupNotification(UUID)}. Calling this method is not required.
*
* @param characteristicUUID UUID of the characteristic that will be observed for notifications
* @param sourceObservable Observable that will be subscribed to in order to receive characteristic change notifications
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.polidea.rxandroidble2.mockrxandroidble;
package com.polidea.rxandroidble3.mockrxandroidble;

import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothGattCharacteristic;
Expand All @@ -7,17 +7,17 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.polidea.rxandroidble2.RxBleConnection;
import com.polidea.rxandroidble2.RxBleDevice;
import com.polidea.rxandroidble2.RxBleDeviceServices;
import com.polidea.rxandroidble2.Timeout;
import com.polidea.rxandroidble2.exceptions.BleAlreadyConnectedException;
import com.polidea.rxandroidble2.exceptions.BleException;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.RxBleCharacteristicReadCallback;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.RxBleCharacteristicWriteCallback;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.RxBleDescriptorReadCallback;
import com.polidea.rxandroidble2.mockrxandroidble.callbacks.RxBleDescriptorWriteCallback;
import com.polidea.rxandroidble2.scan.ScanRecord;
import com.polidea.rxandroidble3.RxBleConnection;
import com.polidea.rxandroidble3.RxBleDevice;
import com.polidea.rxandroidble3.RxBleDeviceServices;
import com.polidea.rxandroidble3.Timeout;
import com.polidea.rxandroidble3.exceptions.BleAlreadyConnectedException;
import com.polidea.rxandroidble3.exceptions.BleException;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.RxBleCharacteristicReadCallback;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.RxBleCharacteristicWriteCallback;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.RxBleDescriptorReadCallback;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.RxBleDescriptorWriteCallback;
import com.polidea.rxandroidble3.scan.ScanRecord;

import java.util.HashMap;
import java.util.List;
Expand All @@ -34,9 +34,9 @@
import io.reactivex.rxjava3.subjects.BehaviorSubject;
import io.reactivex.rxjava3.subjects.ReplaySubject;

import static com.polidea.rxandroidble2.RxBleConnection.RxBleConnectionState.CONNECTED;
import static com.polidea.rxandroidble2.RxBleConnection.RxBleConnectionState.CONNECTING;
import static com.polidea.rxandroidble2.RxBleConnection.RxBleConnectionState.DISCONNECTED;
import static com.polidea.rxandroidble3.RxBleConnection.RxBleConnectionState.CONNECTED;
import static com.polidea.rxandroidble3.RxBleConnection.RxBleConnectionState.CONNECTING;
import static com.polidea.rxandroidble3.RxBleConnection.RxBleConnectionState.DISCONNECTED;

public class RxBleDeviceMock implements RxBleDevice {

Expand Down Expand Up @@ -199,7 +199,7 @@ public Builder bluetoothDevice(@NonNull BluetoothDevice bluetoothDevice) {

/**
* Set an {@link Observable} that will be used to fire characteristic change notifications. It will be subscribed to after
* a call to {@link com.polidea.rxandroidble2.RxBleConnection#setupNotification(UUID)}. Calling this method is not required.
* a call to {@link com.polidea.rxandroidble3.RxBleConnection#setupNotification(UUID)}. Calling this method is not required.
*
* @param characteristicUUID UUID of the characteristic that will be observed for notifications
* @param sourceObservable Observable that will be subscribed to in order to receive characteristic change notifications
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.polidea.rxandroidble2.mockrxandroidble;
package com.polidea.rxandroidble3.mockrxandroidble;

import android.os.ParcelUuid;
import android.util.SparseArray;

import androidx.annotation.Nullable;

import com.polidea.rxandroidble2.mockrxandroidble.internal.ScanRecordDataConstructor;
import com.polidea.rxandroidble2.scan.ScanRecord;
import com.polidea.rxandroidble3.mockrxandroidble.internal.ScanRecordDataConstructor;
import com.polidea.rxandroidble3.scan.ScanRecord;

import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.polidea.rxandroidble2.mockrxandroidble;
package com.polidea.rxandroidble3.mockrxandroidble;

import com.polidea.rxandroidble2.RxBleDevice;
import com.polidea.rxandroidble2.internal.ScanResultInterface;
import com.polidea.rxandroidble2.scan.ScanCallbackType;
import com.polidea.rxandroidble2.scan.ScanRecord;
import com.polidea.rxandroidble2.scan.ScanResult;
import com.polidea.rxandroidble3.RxBleDevice;
import com.polidea.rxandroidble3.internal.ScanResultInterface;
import com.polidea.rxandroidble3.scan.ScanCallbackType;
import com.polidea.rxandroidble3.scan.ScanRecord;
import com.polidea.rxandroidble3.scan.ScanResult;

public class RxBleScanResultMock extends ScanResult implements ScanResultInterface {
public RxBleScanResultMock(RxBleDevice bleDevice, int rssi, long timestampNanos, ScanCallbackType callbackType, ScanRecord scanRecord) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.polidea.rxandroidble2.mockrxandroidble.callbacks;
package com.polidea.rxandroidble3.mockrxandroidble.callbacks;

import android.bluetooth.BluetoothGattCharacteristic;

import com.polidea.rxandroidble2.mockrxandroidble.callbacks.results.RxBleGattReadResultMock;
import com.polidea.rxandroidble2.mockrxandroidble.RxBleDeviceMock;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.results.RxBleGattReadResultMock;
import com.polidea.rxandroidble3.mockrxandroidble.RxBleDeviceMock;

/**
* An interface for a user callback for handling characteristic read requests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.polidea.rxandroidble2.mockrxandroidble.callbacks;
package com.polidea.rxandroidble3.mockrxandroidble.callbacks;

import android.bluetooth.BluetoothGattCharacteristic;

import com.polidea.rxandroidble2.mockrxandroidble.callbacks.results.RxBleGattWriteResultMock;
import com.polidea.rxandroidble2.mockrxandroidble.RxBleDeviceMock;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.results.RxBleGattWriteResultMock;
import com.polidea.rxandroidble3.mockrxandroidble.RxBleDeviceMock;

/**
* An interface for a user callback for handling characteristic write requests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.polidea.rxandroidble2.mockrxandroidble.callbacks;
package com.polidea.rxandroidble3.mockrxandroidble.callbacks;

import android.bluetooth.BluetoothGattDescriptor;

import com.polidea.rxandroidble2.mockrxandroidble.callbacks.results.RxBleGattReadResultMock;
import com.polidea.rxandroidble2.mockrxandroidble.RxBleDeviceMock;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.results.RxBleGattReadResultMock;
import com.polidea.rxandroidble3.mockrxandroidble.RxBleDeviceMock;

/**
* An interface for a user callback for handling descriptor read requests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.polidea.rxandroidble2.mockrxandroidble.callbacks;
package com.polidea.rxandroidble3.mockrxandroidble.callbacks;

import android.bluetooth.BluetoothGattDescriptor;

import com.polidea.rxandroidble2.mockrxandroidble.callbacks.results.RxBleGattWriteResultMock;
import com.polidea.rxandroidble2.mockrxandroidble.RxBleDeviceMock;
import com.polidea.rxandroidble3.mockrxandroidble.callbacks.results.RxBleGattWriteResultMock;
import com.polidea.rxandroidble3.mockrxandroidble.RxBleDeviceMock;

/**
* An interface for a user callback for handling descriptor write requests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.polidea.rxandroidble2.mockrxandroidble.callbacks.results;
package com.polidea.rxandroidble3.mockrxandroidble.callbacks.results;

/**
* An interface for the user to respond to a read request
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.polidea.rxandroidble2.mockrxandroidble.callbacks.results;
package com.polidea.rxandroidble3.mockrxandroidble.callbacks.results;

/**
* An interface for the user to respond to a write request
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.polidea.rxandroidble2.mockrxandroidble.internal;
package com.polidea.rxandroidble3.mockrxandroidble.internal;

import android.os.ParcelUuid;
import android.util.SparseArray;

import androidx.annotation.Nullable;

import com.polidea.rxandroidble2.scan.ScanRecord;
import com.polidea.rxandroidble3.scan.ScanRecord;

import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.polidea.rxandroidble2.mockrxandroidble
package com.polidea.rxandroidble3.mockrxandroidble

import android.os.Build
import android.os.ParcelUuid
import com.polidea.rxandroidble2.RxBleClient
import com.polidea.rxandroidble2.RxBleConnection
import com.polidea.rxandroidble2.scan.ScanFilter
import com.polidea.rxandroidble2.scan.ScanSettings
import com.polidea.rxandroidble3.RxBleClient
import com.polidea.rxandroidble3.RxBleConnection
import com.polidea.rxandroidble3.scan.ScanFilter
import com.polidea.rxandroidble3.scan.ScanSettings
import hkhc.electricspock.ElectricSpecification
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.subjects.PublishSubject
import org.robolectric.annotation.Config
import com.polidea.rxandroidble2.BuildConfig
import com.polidea.rxandroidble3.BuildConfig

@Config(manifest = Config.NONE, constants = BuildConfig, sdk = Build.VERSION_CODES.LOLLIPOP)
public class RxBleClientMockLegacyTest extends ElectricSpecification {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.polidea.rxandroidble2.mockrxandroidble
package com.polidea.rxandroidble3.mockrxandroidble

import android.os.Build
import android.os.ParcelUuid
import com.polidea.rxandroidble2.RxBleClient
import com.polidea.rxandroidble2.RxBleConnection
import com.polidea.rxandroidble2.scan.ScanFilter;
import com.polidea.rxandroidble2.scan.ScanSettings;
import com.polidea.rxandroidble3.RxBleClient
import com.polidea.rxandroidble3.RxBleConnection
import com.polidea.rxandroidble3.scan.ScanFilter;
import com.polidea.rxandroidble3.scan.ScanSettings;
import hkhc.electricspock.ElectricSpecification
import io.reactivex.rxjava3.subjects.PublishSubject
import org.robolectric.annotation.Config
import com.polidea.rxandroidble2.BuildConfig
import com.polidea.rxandroidble3.BuildConfig

@Config(manifest = Config.NONE, constants = BuildConfig, sdk = Build.VERSION_CODES.LOLLIPOP)
public class RxBleClientMockTest extends ElectricSpecification {
Expand Down
Loading

0 comments on commit ebda741

Please sign in to comment.