Merge branch 'task/incorrect_pop_handling' into 'master'

Added handling for incorrect proof of possession (POP).

See merge request idf/esp-idf-provisioning-android!57

Author: shahpiyushv

README.md

@@ -47,7 +47,7 @@ To get this app please clone this repository using the below command:
  ```
 And add a dependency code to your  app module's  `build.gradle`  file. 
 ```  
- implementation 'com.github.espressif:esp-idf-provisioning-android:lib-2.0.11'
+ implementation 'com.github.espressif:esp-idf-provisioning-android:lib-2.0.13'
 ```
 
 ## Using Provisioning Library

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.espressif.wifi_provisioning"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 14
-        versionName "2.0.12 - ${getGitHash()}"
+        versionCode 15
+        versionName "2.0.13 - ${getGitHash()}"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/java/com/espressif/ui/activities/ProofOfPossessionActivity.java

@@ -30,6 +30,7 @@
 import com.espressif.provisioning.DeviceConnectionEvent;
 import com.espressif.provisioning.ESPConstants;
 import com.espressif.provisioning.ESPProvisionManager;
+import com.espressif.provisioning.listeners.ResponseListener;
 import com.espressif.wifi_provisioning.R;
 
 import org.greenrobot.eventbus.EventBus;
@@ -47,7 +48,7 @@ public class ProofOfPossessionActivity extends AppCompatActivity {
     private TextView txtNextBtn;
 
     private String deviceName;
-    private TextView tvPopInstruction;
+    private TextView tvPopInstruction, tvPopError;
     private EditText etPop;
     private ESPProvisionManager provisionManager;
 
@@ -111,14 +112,36 @@ public void onClick(View v) {
 
             final String pop = etPop.getText().toString();
             Log.d(TAG, "POP : " + pop);
+            tvPopError.setVisibility(View.INVISIBLE);
             provisionManager.getEspDevice().setProofOfPossession(pop);
-            ArrayList<String> deviceCaps = provisionManager.getEspDevice().getDeviceCapabilities();
 
-            if (deviceCaps.contains("wifi_scan")) {
-                goToWiFiScanListActivity();
-            } else {
-                goToWiFiConfigActivity();
-            }
+            provisionManager.getEspDevice().initSession(new ResponseListener() {
+                @Override
+                public void onSuccess(byte[] returnData) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            ArrayList<String> deviceCaps = provisionManager.getEspDevice().getDeviceCapabilities();
+                            if (deviceCaps.contains("wifi_scan")) {
+                                goToWiFiScanListActivity();
+                            } else {
+                                goToWiFiConfigActivity();
+                            }
+                        }
+                    });
+                }
+
+                @Override
+                public void onFailure(Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            tvPopError.setVisibility(View.VISIBLE);
+                        }
+                    });
+                }
+            });
         }
     };
 
@@ -137,6 +160,7 @@ private void initViews() {
         tvBack = findViewById(R.id.btn_back);
         tvCancel = findViewById(R.id.btn_cancel);
         tvPopInstruction = findViewById(R.id.tv_pop);
+        tvPopError = findViewById(R.id.tv_error_pop);
         etPop = findViewById(R.id.et_pop);
 
         tvTitle.setText(R.string.title_activity_pop);

app/src/main/res/layout/activity_pop.xml

@@ -45,6 +45,18 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_pop" />
 
+            <TextView
+                android:id="@+id/tv_error_pop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_32"
+                android:text="@string/error_pop_incorrect"
+                android:textColor="@color/color_orange"
+                android:textSize="14sp"
+                android:visibility="invisible"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/et_pop" />
+
             <include
                 android:id="@+id/btn_next"
                 layout="@layout/button"
@@ -53,7 +65,7 @@
                 android:layout_marginTop="@dimen/margin_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/et_pop" />
+                app:layout_constraintTop_toBottomOf="@id/tv_error_pop" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/values/strings.xml

@@ -84,7 +84,7 @@
     <string name="error_network_not_found">Network not found.</string>
     <string name="error_authentication_failed">Wi-Fi Authentication failed.</string>
     <string name="error_unknown">Device provisioning failed. Reason : Unknown.</string>
-    <string name="error_pop_incorrect">Error establishing session.\n Check if Proof of Possession(POP) is correct!</string>
+    <string name="error_pop_incorrect">Please retry with correct proof of possession PIN.</string>
     <string name="error_no_ble_device">No Bluetooth devices found!</string>
     <string name="error_device_connect_failed">Error! Failed to connect with device.</string>
     <string name="error_ssid_empty">Network name cannot be empty</string>

provisioning/src/main/java/com/espressif/provisioning/ESPDevice.java

@@ -555,7 +555,7 @@ public void onFailure(Exception e) {
         }
     }
 
-    private void initSession(final ResponseListener listener) {
+    public void initSession(final ResponseListener listener) {
 
         if (securityType.equals(ESPConstants.SecurityType.SECURITY_0)) {
             security = new Security0();