avoid null pointer exception for onPreviewFrame

ricohapi · Mar 13, 2023 · d42e1d2 · d42e1d2
1 parent c71d79e
commit d42e1d2
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/library/src/main/java/com/theta360/pluginlibrary/factory/VCamera.java b/library/src/main/java/com/theta360/pluginlibrary/factory/VCamera.java
@@ -246,7 +246,9 @@ public void onPictureTaken(byte[] data, android.hardware.Camera camera) {
     private android.hardware.Camera.PreviewCallback previewCallback = new android.hardware.Camera.PreviewCallback() {
         @Override
         public void onPreviewFrame(byte[] data, android.hardware.Camera camera) {
-            prCallback.onPreviewFrame(data, camera);
+            if (prCallback != null) {
+                prCallback.onPreviewFrame(data, camera);
+            }
         }
     };
 

diff --git a/library/src/main/java/com/theta360/pluginlibrary/factory/XCamera.java b/library/src/main/java/com/theta360/pluginlibrary/factory/XCamera.java
@@ -235,7 +235,9 @@ public void onPictureTaken(byte[] data, theta360.hardware.Camera camera) {
     private theta360.hardware.Camera.PreviewCallback previewCallback = new theta360.hardware.Camera.PreviewCallback() {
         @Override
         public void onPreviewFrame(byte[] data, theta360.hardware.Camera camera) {
-            prCallback.onPreviewFrame(data, camera);
+            if (prCallback != null) {
+                prCallback.onPreviewFrame(data, camera);
+            }
         }
     };
 

diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar
diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.md5 b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.md5
@@ -1 +1 @@
-476c92d786208c53d22bfc8b422e9303
+f44791a9c549087edf5b08270dfcfacf
diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.sha1 b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.aar.sha1
@@ -1 +1 @@
-0592ed097f0677f7651865da798e51d393bb2e34
+c7ddd2d26bbf0cb9304e34edad0566f7f499a124
diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml b/repository/com/theta360/pluginlibrary/maven-metadata.xml
@@ -14,6 +14,6 @@
       <version>3.0.4</version>
       <version>3.0.5</version>
     </versions>
-    <lastUpdated>20230310163550</lastUpdated>
+    <lastUpdated>20230313165727</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml.md5 b/repository/com/theta360/pluginlibrary/maven-metadata.xml.md5
@@ -1 +1 @@
-4afd37fade043c4c14059265aa49f3a8
+3f704763ca195e114507c63d05691bab
diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1 b/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1
@@ -1 +1 @@
-fd05867a8adb7f7dbe847b3be0abe9ce18a85118
+ea5aec5178e0aee0742e2b19fdb812170817815f
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		476c92d786208c53d22bfc8b422e9303
		f44791a9c549087edf5b08270dfcfacf
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0592ed097f0677f7651865da798e51d393bb2e34
		c7ddd2d26bbf0cb9304e34edad0566f7f499a124
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4afd37fade043c4c14059265aa49f3a8
		3f704763ca195e114507c63d05691bab
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		fd05867a8adb7f7dbe847b3be0abe9ce18a85118
		ea5aec5178e0aee0742e2b19fdb812170817815f