Merge

Author: philips77

gradle.properties

@@ -19,7 +19,7 @@
 android.enableJetifier=true
 android.useAndroidX=true
 
-VERSION_NAME=1.4.2
+VERSION_NAME=1.4.3
 GROUP=no.nordicsemi.android.support.v18
 
 POM_DESCRIPTION=Android Bluetooth LE Scanner Compat library

scanner/build.gradle

@@ -41,4 +41,4 @@ dependencies {
     testImplementation "org.powermock:powermock-api-mockito:1.7.4"
 }
 
-apply from: rootProject.file('gradle/gradle-bintray-push.gradle')
+//apply from: rootProject.file('gradle/gradle-bintray-push.gradle')

scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/ScanFilter.java

@@ -183,11 +183,13 @@ public ScanFilter createFromParcel(final Parcel in) {
 					final byte[] serviceData = new byte[serviceDataLength];
 					in.readByteArray(serviceData);
 					if (in.readInt() == 0) {
+						//noinspection ConstantConditions
 						builder.setServiceData(serviceDataUuid, serviceData);
 					} else {
 						final int serviceDataMaskLength = in.readInt();
 						final byte[] serviceDataMask = new byte[serviceDataMaskLength];
 						in.readByteArray(serviceDataMask);
+						//noinspection ConstantConditions
 						builder.setServiceData(serviceDataUuid, serviceData, serviceDataMask);
 					}
 				}
@@ -518,14 +520,12 @@ public Builder setServiceUuid(@Nullable final ParcelUuid serviceUuid,
 		 *
 		 * @throws IllegalArgumentException If {@code serviceDataUuid} is null.
 		 */
-		public Builder setServiceData(@Nullable final ParcelUuid serviceDataUuid,
+		public Builder setServiceData(@NonNull final ParcelUuid serviceDataUuid,
 									  @Nullable final byte[] serviceData) {
-			if (serviceDataUuid == null && serviceData != null) {
+			//noinspection ConstantConditions
+			if (serviceDataUuid == null) {
 				throw new IllegalArgumentException("serviceDataUuid is null!");
 			}
-			if (serviceDataUuid != null && serviceData == null) {
-				throw new IllegalArgumentException("serviceData is null!");
-			}
 			this.serviceDataUuid = serviceDataUuid;
 			this.serviceData = serviceData;
 			this.serviceDataMask = null; // clear service data mask
@@ -542,10 +542,11 @@ public Builder setServiceData(@Nullable final ParcelUuid serviceDataUuid,
 		 *             {@code serviceDataMask} is {@code null} while {@code serviceData} is not or
 		 *             {@code serviceDataMask} and {@code serviceData} has different length.
 		 */
-		public Builder setServiceData(@Nullable final ParcelUuid serviceDataUuid,
+		public Builder setServiceData(@NonNull final ParcelUuid serviceDataUuid,
 									  @Nullable final byte[] serviceData,
 									  @Nullable final byte[] serviceDataMask) {
-			if (serviceDataUuid == null && serviceData != null) {
+			//noinspection ConstantConditions
+			if (serviceDataUuid == null) {
 				throw new IllegalArgumentException("serviceDataUuid is null");
 			}
 			if (serviceDataMask != null) {