Skip to content

Commit 118aa97

Browse files
Maraguesphilips77
authored andcommitted
Response getters have wrong NonNull annotations (NordicSemiconductor#49)
* Make gradlew executable (chmod +x) * Change ReadResponse getters to Nullable * Change WriteResponse getters to Nullable * Change RssiResult getter to @nullable * Change ConnectionPriorityResponse getter to @nullable * Change MtuResult getter to @nullable * Change PhyResult getter to @nullable
1 parent be41559 commit 118aa97

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

ble/src/main/java/no/nordicsemi/android/ble/response/ConnectionPriorityResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import android.os.Parcelable;
2828
import android.support.annotation.IntRange;
2929
import android.support.annotation.NonNull;
30+
import android.support.annotation.Nullable;
3031

3132
import no.nordicsemi.android.ble.callback.ConnectionPriorityCallback;
3233

@@ -37,7 +38,6 @@
3738
*/
3839
@SuppressWarnings({"unused", "WeakerAccess"})
3940
public class ConnectionPriorityResponse implements ConnectionPriorityCallback, Parcelable {
40-
@NonNull
4141
private BluetoothDevice device;
4242

4343
@IntRange(from = 6, to = 3200)
@@ -60,7 +60,7 @@ public void onConnectionUpdated(@NonNull final BluetoothDevice device,
6060
this.supervisionTimeout = timeout;
6161
}
6262

63-
@NonNull
63+
@Nullable
6464
public BluetoothDevice getBluetoothDevice() {
6565
return device;
6666
}

ble/src/main/java/no/nordicsemi/android/ble/response/MtuResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import android.os.Parcelable;
2828
import android.support.annotation.IntRange;
2929
import android.support.annotation.NonNull;
30+
import android.support.annotation.Nullable;
3031

3132
import no.nordicsemi.android.ble.callback.MtuCallback;
3233

3334
@SuppressWarnings({"unused", "WeakerAccess"})
3435
public class MtuResult implements MtuCallback, Parcelable {
35-
@NonNull
3636
private BluetoothDevice device;
3737

3838
@IntRange(from = 23, to = 517)
@@ -45,7 +45,7 @@ public void onMtuChanged(@NonNull final BluetoothDevice device,
4545
this.mtu = mtu;
4646
}
4747

48-
@NonNull
48+
@Nullable
4949
public BluetoothDevice getBluetoothDevice() {
5050
return device;
5151
}

ble/src/main/java/no/nordicsemi/android/ble/response/PhyResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import android.os.Parcel;
2727
import android.os.Parcelable;
2828
import android.support.annotation.NonNull;
29+
import android.support.annotation.Nullable;
2930

3031
import no.nordicsemi.android.ble.annotation.PhyValue;
3132
import no.nordicsemi.android.ble.callback.PhyCallback;
3233

3334
@SuppressWarnings({"unused", "WeakerAccess"})
3435
public class PhyResult implements PhyCallback, Parcelable {
35-
@NonNull
3636
private BluetoothDevice device;
3737

3838
@PhyValue
@@ -49,7 +49,7 @@ public void onPhyChanged(@NonNull final BluetoothDevice device,
4949
this.rxPhy = rxPhy;
5050
}
5151

52-
@NonNull
52+
@Nullable
5353
public BluetoothDevice getBluetoothDevice() {
5454
return device;
5555
}

ble/src/main/java/no/nordicsemi/android/ble/response/ReadResponse.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.os.Parcel;
2727
import android.os.Parcelable;
2828
import android.support.annotation.NonNull;
29+
import android.support.annotation.Nullable;
2930

3031
import no.nordicsemi.android.ble.callback.DataReceivedCallback;
3132
import no.nordicsemi.android.ble.data.Data;
@@ -51,12 +52,12 @@ public void onDataReceived(@NonNull final BluetoothDevice device, @NonNull final
5152
this.data = data;
5253
}
5354

54-
@NonNull
55+
@Nullable
5556
public BluetoothDevice getBluetoothDevice() {
5657
return device;
5758
}
5859

59-
@NonNull
60+
@Nullable
6061
public Data getRawData() {
6162
return data;
6263
}

ble/src/main/java/no/nordicsemi/android/ble/response/RssiResult.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import android.os.Parcelable;
2828
import android.support.annotation.IntRange;
2929
import android.support.annotation.NonNull;
30+
import android.support.annotation.Nullable;
3031

3132
import no.nordicsemi.android.ble.callback.RssiCallback;
3233

@@ -44,7 +45,7 @@ public void onRssiRead(@NonNull final BluetoothDevice device,
4445
this.rssi = rssi;
4546
}
4647

47-
@NonNull
48+
@Nullable
4849
public BluetoothDevice getBluetoothDevice() {
4950
return device;
5051
}

ble/src/main/java/no/nordicsemi/android/ble/response/WriteResponse.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.os.Parcel;
2727
import android.os.Parcelable;
2828
import android.support.annotation.NonNull;
29+
import android.support.annotation.Nullable;
2930

3031
import no.nordicsemi.android.ble.callback.DataSentCallback;
3132
import no.nordicsemi.android.ble.data.Data;
@@ -46,12 +47,12 @@ public void onDataSent(@NonNull final BluetoothDevice device, @NonNull final Dat
4647
this.data = data;
4748
}
4849

49-
@NonNull
50+
@Nullable
5051
public BluetoothDevice getBluetoothDevice() {
5152
return device;
5253
}
5354

54-
@NonNull
55+
@Nullable
5556
public Data getRawData() {
5657
return data;
5758
}

gradlew

100644100755
File mode changed.

0 commit comments

Comments
 (0)