update

Author: XuXiangJun

app/src/main/java/com/espressif/esptouch/android/v2/EspTouch2Activity.java

@@ -193,16 +193,16 @@ private void check() {
     }
 
     private EspProvisioningRequest genRequest() {
-        mBinding.aesKeyEdit.setError(null);
-        mBinding.customDataEdit.setError(null);
+        mBinding.aesKeyLayout.setError(null);
+        mBinding.customDataLayout.setError(null);
 
         CharSequence aesKeyChars = mBinding.aesKeyEdit.getText();
         byte[] aesKey = null;
         if (aesKeyChars != null && aesKeyChars.length() > 0) {
             aesKey = aesKeyChars.toString().getBytes();
         }
         if (aesKey != null && aesKey.length != 16) {
-            mBinding.aesKeyEdit.setError(getString(R.string.esptouch2_aes_key_error));
+            mBinding.aesKeyLayout.setError(getString(R.string.esptouch2_aes_key_error));
             return null;
         }
 
@@ -223,7 +223,7 @@ private EspProvisioningRequest genRequest() {
         }
         int customDataMaxLen = EspProvisioningRequest.RESERVED_LENGTH_MAX;
         if (customData != null && customData.length > customDataMaxLen) {
-            mBinding.customDataEdit.setError(getString(R.string.esptouch2_custom_data_error, customDataMaxLen));
+            mBinding.customDataLayout.setError(getString(R.string.esptouch2_custom_data_error, customDataMaxLen));
             return null;
         }
 

esptouch-v2/src/main/java/com/espressif/iot/esptouch2/provision/EspProvisioningParams.java

@@ -24,7 +24,7 @@ class EspProvisioningParams {
 
     private final List<byte[]> mDataPacketList;
 
-    private int mAppPortMark;
+    private final int mAppPortMark;
     private byte[] mPassword;
     private byte[] mSsid;
     private byte[] mReservedData;
@@ -78,7 +78,7 @@ private void parse(EspProvisioningRequest request) {
 
         mWillEncrypt = request.aesKey != null && (mPassword.length > 0 || mReservedData.length > 0);
         mAesKey = mWillEncrypt ? request.aesKey : EMPTY_DATA;
-        mSecurityVer = request.securityVer;
+        mSecurityVer = request.securityVer & 0b11;
 
         mPasswordEncode = checkCharEncode(mPassword);
         mReservedEncode = checkCharEncode(mReservedData);