Merge branch 'task/generic_qrcode_handling' into 'master'

Invalid QR code handling

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

Author: shahpiyushv

app/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 30
         versionCode 14
-        versionName "2.0.11 - ${getGitHash()}"
+        versionName "2.0.12 - ${getGitHash()}"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

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

@@ -436,6 +436,25 @@ public void run() {
                 }
             });
         }
+
+        @Override
+        public void onFailure(Exception e, String qrCodeData) {
+            // Called when QR code is not in supported format.
+            // Comment below error handling and do whatever you want to do with your QR code data.
+            Log.e(TAG, "Error : " + e.getMessage());
+            Log.e(TAG, "QR code data : " + qrCodeData);
+
+            runOnUiThread(new Runnable() {
+
+                @Override
+                public void run() {
+                    hideLoading();
+                    String msg = e.getMessage();
+                    Toast.makeText(AddDeviceActivity.this, msg, Toast.LENGTH_LONG).show();
+                    finish();
+                }
+            });
+        }
     };
 
     private void goToWiFiScanActivity() {

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

@@ -301,7 +301,7 @@ public void run() {
                             }
                         } else {
                             Log.e(TAG, "Transport is not available in QR code data");
-                            qrCodeScanListener.onFailure(new RuntimeException("QR code is not valid"));
+                            qrCodeScanListener.onFailure(new RuntimeException("QR code is not valid"), scannedData);
                             return;
                         }
 
@@ -329,10 +329,10 @@ public void run() {
                     } catch (JSONException e) {
 
                         e.printStackTrace();
-                        qrCodeScanListener.onFailure(new RuntimeException("QR code is not valid"));
+                        qrCodeScanListener.onFailure(new RuntimeException("QR code is not valid"), scannedData);
                     }
                 } else {
-                    qrCodeScanListener.onFailure(new RuntimeException("QR code is not valid"));
+                    qrCodeScanListener.onFailure(new RuntimeException("QR code is not valid"), scannedData);
                 }
             }
         });

provisioning/src/main/java/com/espressif/provisioning/listeners/QRCodeScanListener.java

@@ -39,4 +39,12 @@ public interface QRCodeScanListener {
      * @param e Exception
      */
     void onFailure(Exception e);
+
+    /**
+     * Called when QR code data has different format.
+     *
+     * @param e    Exception
+     * @param data QR code data string.
+     */
+    void onFailure(Exception e, String data);
 }