Merge pull request #276 from NordicSemiconductor/dev

nRF Mesh release v2.1.2
NordicSemiconductor · Nov 21, 2019 · 3afe508 · 3afe508
2 parents 8e90dcb + 814a1f5
commit 3afe508
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 126 deletions.
diff --git a/Example/nrf-mesh/app/build.gradle b/Example/nrf-mesh/app/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "no.nordicsemi.android.nrfmeshprovisioner"
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 57
-        versionName "2.1.1"
+        versionCode 58
+        versionName "2.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

diff --git a/...f-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ble/BleMeshManager.java b/...f-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ble/BleMeshManager.java
@@ -112,7 +112,7 @@ protected void initialize() {
 
             // This callback will be called each time a notification is received.
             final DataReceivedCallback onDataReceived = (device, data) ->
-                    mCallbacks.onDataReceived(device, getMtu(), data.getValue());
+                    mCallbacks.onDataReceived(device, getMaximumPacketSize(), data.getValue());
 
             // Set the notification callback and enable notification on Data In characteristic.
             final BluetoothGattCharacteristic characteristic = isProvisioningComplete ?
@@ -178,7 +178,7 @@ public void sendPdu(final byte[] pdu) {
 
         // This callback will be called each time the data were sent.
         final DataSentCallback callback = (device, data) ->
-                mCallbacks.onDataSent(device, getMtu(), data.getValue());
+                mCallbacks.onDataSent(device, getMaximumPacketSize(), data.getValue());
 
         // Write the right characteristic.
         final BluetoothGattCharacteristic characteristic = isProvisioningComplete ?
@@ -189,9 +189,8 @@ public void sendPdu(final byte[] pdu) {
                 .enqueue();
     }
 
-    @Override
-    public int getMtu() {
-        return super.getMtu();
+    public int getMaximumPacketSize() {
+        return super.getMtu() - 3;
     }
 
     public boolean isProvisioningComplete() {
@@ -209,4 +208,4 @@ private boolean hasWriteNoResponseProperty(@NonNull final BluetoothGattCharacter
     private boolean hasNotifyProperty(@NonNull final BluetoothGattCharacteristic characteristic) {
         return (characteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_NOTIFY) != 0;
     }
-}
+}
diff --git a/.../src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/NrfMeshRepository.java b/.../src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/NrfMeshRepository.java
@@ -637,7 +637,7 @@ public void onMeshPduCreated(final byte[] pdu) {
 
     @Override
     public int getMtu() {
-        return mBleMeshManager.getMtu();
+        return mBleMeshManager.getMaximumPacketSize();
     }
 
     @Override

diff --git a/android-nrf-mesh-library/meshprovisioner/build.gradle b/android-nrf-mesh-library/meshprovisioner/build.gradle
@@ -29,8 +29,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 57
-        versionName "2.1.1"
+        versionCode 58
+        versionName "2.1.2"
 
         javaCompileOptions {
             annotationProcessorOptions {

diff --git a/...visioner/src/main/java/no/nordicsemi/android/meshprovisioner/MeshProvisioningHandler.java b/...visioner/src/main/java/no/nordicsemi/android/meshprovisioner/MeshProvisioningHandler.java
diff --git a/...java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningFailedState.java b/...java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningFailedState.java
@@ -29,14 +29,10 @@
 
 public class ProvisioningFailedState extends ProvisioningState {
 
-    private final Context mContext;
-    private final UnprovisionedMeshNode mUnprovisionedMeshNode;
     private int error;
 
-    public ProvisioningFailedState(final Context context, final UnprovisionedMeshNode unprovisionedMeshNode) {
+    public ProvisioningFailedState() {
         super();
-        this.mContext = context;
-        this.mUnprovisionedMeshNode = unprovisionedMeshNode;
     }
 
     @Override
@@ -86,35 +82,6 @@ public static String parseProvisioningFailure(final Context context, final int e
         }
     }
 
-    public static String parseProvisioningFailure(final Context context, final byte[] pdu) {
-        if(pdu == null)
-            return "Unknown";
-        final int errorCode = pdu[2];
-        switch (ProvisioningFailureCode.fromErrorCode(errorCode)) {
-            case PROHIBITED:
-                return context.getString(R.string.error_prohibited);
-            case INVALID_PDU:
-                return context.getString(R.string.error_invalid_pdu);
-            case INVALID_FORMAT:
-                return context.getString(R.string.error_invalid_format);
-            case UNEXPECTED_PDU:
-                return context.getString(R.string.error_prohibited);
-            case CONFIRMATION_FAILED:
-                return context.getString(R.string.error_confirmation_failed);
-            case OUT_OF_RESOURCES:
-                return context.getString(R.string.error_prohibited);
-            case DECRYPTION_FAILED:
-                return context.getString(R.string.error_decryption_failed);
-            case UNEXPECTED_ERROR:
-                return context.getString(R.string.error_unexpected_error);
-            case CANNOT_ASSIGN_ADDRESSES:
-                return context.getString(R.string.error_cannot_assign_addresses);
-            case UNKNOWN_ERROR_CODE:
-            default:
-                return context.getString(R.string.error_rfu);
-        }
-    }
-
     public enum ProvisioningFailureCode {
         PROHIBITED(0x00),
         INVALID_PDU(0x01),

diff --git a/...a/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningPublicKeyState.java b/...a/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningPublicKeyState.java
@@ -23,7 +23,6 @@
 package no.nordicsemi.android.meshprovisioner.provisionerstates;
 
 
-import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.spongycastle.jce.ECNamedCurveTable;
@@ -49,6 +48,7 @@
 
 import javax.crypto.KeyAgreement;
 
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.meshprovisioner.InternalTransportCallbacks;
 import no.nordicsemi.android.meshprovisioner.MeshManagerApi;
 import no.nordicsemi.android.meshprovisioner.MeshProvisioningStatusCallbacks;
@@ -142,6 +142,10 @@ private byte[] generatePublicKeyXYPDU() {
     }
 
     private void generateSharedECDHSecret(final byte[] provisioneePublicKeyXYPDU) {
+        if (provisioneePublicKeyXYPDU.length != 66) {
+            throw new IllegalArgumentException("Invalid Provisionee Public Key PDU," +
+                    " length of the Provisionee public key must be 66 bytes, but was " + provisioneePublicKeyXYPDU.length);
+        }
         final ByteBuffer buffer = ByteBuffer.allocate(provisioneePublicKeyXYPDU.length - 2);
         buffer.put(provisioneePublicKeyXYPDU, 2, buffer.limit());
         final byte[] xy = mTempProvisioneeXY = buffer.array();

diff --git a/.../main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningState.java b/.../main/java/no/nordicsemi/android/meshprovisioner/provisionerstates/ProvisioningState.java
@@ -90,7 +90,7 @@ public enum States {
         SENDING_NETWORK_TRANSMIT_SET(23),
         NETWORK_TRANSMIT_STATUS_RECEIVED(24),
         SENDING_BLOCK_ACKNOWLEDGEMENT(98),
-        BLOCK_ACKNOWLEDGEMENT_RECEIVED(99),;
+        BLOCK_ACKNOWLEDGEMENT_RECEIVED(99);
 
         private int state;
 
@@ -102,9 +102,9 @@ public int getState() {
             return state;
         }
 
-        public static States fromStatusCode(final int statusCode){
-            for(States state : States.values()){
-                if(state.getState() == statusCode){
+        public static States fromStatusCode(final int statusCode) {
+            for (States state : States.values()) {
+                if (state.getState() == statusCode) {
                     return state;
                 }
             }