Merge pull request #5 from codenameone/fix-crashes-salient-object

Updated version to 2.0.4-SNAPSHOT
codenameone · Jul 20, 2024 · b5ab810 · b5ab810
2 parents 6914109 + 90fce10
commit b5ab810
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 29 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/android/pom.xml b/android/pom.xml
@@ -4,11 +4,11 @@
   <parent>
       <groupId>com.codenameone</groupId>
       <artifactId>qrscanner</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.4-SNAPSHOT</version>
   </parent>
   <groupId>com.codenameone</groupId>
   <artifactId>qrscanner-android</artifactId>
-  <version>2.0.3</version>
+  <version>2.0.4-SNAPSHOT</version>
 
   <name>qrscanner-android</name>
   <build>

diff --git a/common/pom.xml b/common/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.codenameone</groupId>
         <artifactId>qrscanner</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.codenameone</groupId>
     <artifactId>qrscanner-common</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/ios/pom.xml b/ios/pom.xml
@@ -4,11 +4,11 @@
   <parent>
       <groupId>com.codenameone</groupId>
       <artifactId>qrscanner</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.4-SNAPSHOT</version>
   </parent>
   <groupId>com.codenameone</groupId>
   <artifactId>qrscanner-ios</artifactId>
-  <version>2.0.3</version>
+  <version>2.0.4-SNAPSHOT</version>
 
   <name>qrscanner-ios</name>
   <build>

diff --git a/ios/src/main/objectivec/CN1AVFoundationCodeScanner.m b/ios/src/main/objectivec/CN1AVFoundationCodeScanner.m
@@ -83,6 +83,9 @@ -(void)cleanupScanning {
 
 - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects:(NSArray<__kindof AVMetadataObject *> *)metadataObjects fromConnection:(AVCaptureConnection *)connection {
     for (AVMetadataObject *metadataObject in metadataObjects) {
+        if (![metadataObject isKindOfClass:[AVMetadataMachineReadableCodeObject class]]) {
+            continue;
+        }
         if (self.metadataObjectTypes == nil || self.metadataObjectTypes.count == 0 || [self.metadataObjectTypes containsObject:metadataObject.type]) {
             AVMetadataMachineReadableCodeObject *readableObject = (AVMetadataMachineReadableCodeObject *)metadataObject;
             NSString *scannedResult = readableObject.stringValue;

diff --git a/javascript/pom.xml b/javascript/pom.xml
@@ -4,11 +4,11 @@
   <parent>
       <groupId>com.codenameone</groupId>
       <artifactId>qrscanner</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.4-SNAPSHOT</version>
   </parent>
   <groupId>com.codenameone</groupId>
   <artifactId>qrscanner-javascript</artifactId>
-  <version>2.0.3</version>
+  <version>2.0.4-SNAPSHOT</version>
 
   <name>qrscanner-javascript</name>
   <build>

diff --git a/javase/pom.xml b/javase/pom.xml
@@ -4,11 +4,11 @@
   <parent>
       <groupId>com.codenameone</groupId>
       <artifactId>qrscanner</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.4-SNAPSHOT</version>
   </parent>
   <groupId>com.codenameone</groupId>
   <artifactId>qrscanner-javase</artifactId>
-  <version>2.0.3</version>
+  <version>2.0.4-SNAPSHOT</version>
 
   <name>qrscanner-javase</name>
 

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -4,11 +4,11 @@
   <parent>
       <groupId>com.codenameone</groupId>
       <artifactId>qrscanner</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.4-SNAPSHOT</version>
   </parent>
   <groupId>com.codenameone</groupId>
   <artifactId>qrscanner-lib</artifactId>
-  <version>2.0.3</version>
+  <version>2.0.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>qrscanner-lib</name>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.codenameone</groupId>
     <artifactId>qrscanner</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>qrscanner</name>

diff --git a/tests/common/pom.xml b/tests/common/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>com.codenameone</groupId>
         <artifactId>qrscanner-tests</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4-SNAPSHOT</version>
     </parent>
     <groupId>com.codenameone</groupId>
     <artifactId>qrscanner-tests-common</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -4,12 +4,12 @@
     <parent>
     <artifactId>qrscanner</artifactId>
     <groupId>com.codenameone</groupId>
-    <version>2.0.3</version>
+    <version>2.0.4-SNAPSHOT</version>
   </parent>
 
     <groupId>com.codenameone</groupId>
     <artifactId>qrscanner-tests</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>qrscanner-tests-tests</name>

diff --git a/win/pom.xml b/win/pom.xml
@@ -4,11 +4,11 @@
   <parent>
       <groupId>com.codenameone</groupId>
       <artifactId>qrscanner</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.4-SNAPSHOT</version>
   </parent>
   <groupId>com.codenameone</groupId>
   <artifactId>qrscanner-win</artifactId>
-  <version>2.0.3</version>
+  <version>2.0.4-SNAPSHOT</version>
 
   <name>qrscanner-win</name>
   <build>