Merge pull request #63 from NordicSemiconductor/dev

Preparing for release 1.0.2
NordicSemiconductor · Sep 18, 2018 · f1a3187 · f1a3187
2 parents 2caec36 + 04fb529
commit f1a3187
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 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 28
-        versionCode 11
-        versionName "1.0.1"
+        versionCode 12
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

diff --git a/android-nrf-mesh-library/meshprovisioner/build.gradle b/android-nrf-mesh-library/meshprovisioner/build.gradle
@@ -28,8 +28,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 11
-        versionName "1.0.1"
+        versionCode 12
+        versionName "1.0.2"
     }
 
     buildTypes {

diff --git a/...shprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/models/VendorModel.java b/...shprovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/models/VendorModel.java
@@ -54,8 +54,7 @@ public VendorModel(final int modelIdentifier) {
         super(modelIdentifier);
         final ByteBuffer buffer = ByteBuffer.allocate(4).order(ByteOrder.BIG_ENDIAN);
         buffer.putInt(modelIdentifier);
-        buffer.position(2);
-        this.companyIdentifier = buffer.getShort();
+        this.companyIdentifier = buffer.getShort(0);
         this.companyName = CompanyIdentifiers.getCompanyName(companyIdentifier);
         Log.v(TAG, "Company name: " + companyName);
     }
@@ -64,8 +63,7 @@ private VendorModel(final Parcel source) {
         super(source);
         final ByteBuffer buffer = ByteBuffer.allocate(4).order(ByteOrder.BIG_ENDIAN);
         buffer.putInt(mModelId);
-        buffer.position(2);
-        this.companyIdentifier = buffer.getShort();
+        this.companyIdentifier = buffer.getShort(0);
         this.companyName = CompanyIdentifiers.getCompanyName(companyIdentifier);
     }
 

diff --git a/...rovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/transport/AccessLayer.java b/...rovisioner/src/main/java/no/nordicsemi/android/meshprovisioner/transport/AccessLayer.java
@@ -103,7 +103,9 @@ public final void createCustomAccessMessage(final AccessMessage accessMessage) {
             accessMessageBuffer = ByteBuffer.allocate(opCodesCompanyIdentifier.length);
             accessMessageBuffer.put(opCodesCompanyIdentifier);
         }
-        accessMessage.setAccessPdu(accessMessageBuffer.array());
+        final byte [] accessPdu = accessMessageBuffer.array();
+        Log.v(TAG, "Created Access PDU " + MeshParserUtils.bytesToHex(accessPdu, false));
+        accessMessage.setAccessPdu(accessPdu);
     }
 
     /**