Fix null pointer issue for setPreviewCallback/WithBuffer

ricohapi · Mar 10, 2023 · c71d79e · c71d79e
1 parent f839b9a
commit c71d79e
Show file tree

Hide file tree

Showing 17 changed files with 60 additions and 32 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # RICOH THETA Plug-in Library
 
-Version: 3.0.4
+Version: 3.0.5
 
 ## Contents
 
@@ -57,13 +57,14 @@ This Library has been confirmed to operate under the following conditions.
 
 #### Operating System
 
-* Windows 10 Version 21H1
+* Windows 10 Version 21H2
 * macOS Monterey Version 12.2
 
 #### Development environment
 
-* Android&trade; Studio 4.2.2
-* gradle 3.5.3
+* Android&trade; Studio Chipmunk | 2021.2.1 Patch 2
+* Android Gradle Plugin Version 3.6.4
+* Gradle Version 5.6.4
 * Android&trade; SDK (API Level 29)
 * compileSdkVersion 29
 * minSdkVersion 25
@@ -103,7 +104,7 @@ allprojects {
 
 ```
 dependencies {
-    implementation 'com.theta360:pluginlibrary:3.0.4'
+    implementation 'com.theta360:pluginlibrary:3.0.5'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.6.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 22 15:04:31 JST 2019
+#Fri Mar 10 22:50:24 JST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
-def version = '3.0.4'
+def version = '3.0.5'
 def repo = new File(rootDir, "repository")
 
 android {
     compileSdkVersion 29
     defaultConfig {
         minSdkVersion 25
         targetSdkVersion 29
-        versionCode 12
+        versionCode 13
         versionName "${version}"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/library/src/main/java/com/theta360/pluginlibrary/factory/VCamera.java b/library/src/main/java/com/theta360/pluginlibrary/factory/VCamera.java
@@ -326,11 +326,13 @@ public void setPreviewTexture(SurfaceTexture var1) throws IOException {
 
     @Override
     public void setOneShotPreviewCallback(PreviewCallback cb) {
+        prCallback = cb;
         mCamera.setOneShotPreviewCallback(previewCallback);
     }
 
     @Override
     public void setPreviewCallbackWithBuffer(PreviewCallback cb) {
+        prCallback = cb;
         mCamera.setPreviewCallbackWithBuffer(previewCallback);
     }
 
@@ -438,7 +440,8 @@ public void stopPreview() {
 
     @Override
     public void setPreviewCallback(PreviewCallback cb) {
-        mCamera.setPreviewCallback(null);
+        prCallback = cb;
+        mCamera.setPreviewCallback(previewCallback);
     }
 
     @Override

diff --git a/library/src/main/java/com/theta360/pluginlibrary/factory/XCamera.java b/library/src/main/java/com/theta360/pluginlibrary/factory/XCamera.java
@@ -316,11 +316,13 @@ public void setPreviewTexture(SurfaceTexture var1) throws IOException {
 
     @Override
     public void setOneShotPreviewCallback(PreviewCallback cb) {
+        prCallback = cb;
         mCamera.setOneShotPreviewCallback(previewCallback);
     }
 
     @Override
     public void setPreviewCallbackWithBuffer(PreviewCallback cb) {
+        prCallback = cb;
         mCamera.setPreviewCallbackWithBuffer(previewCallback);
     }
 
@@ -404,7 +406,8 @@ public void stopPreview() {
 
     @Override
     public void setPreviewCallback(PreviewCallback cb) {
-        mCamera.setPreviewCallback(null);
+        prCallback = cb;
+        mCamera.setPreviewCallback(previewCallback);
     }
 
     @Override

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
@@ -0,0 +1 @@
+476c92d786208c53d22bfc8b422e9303
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
@@ -0,0 +1 @@
+0592ed097f0677f7651865da798e51d393bb2e34
diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.theta360</groupId>
+  <artifactId>pluginlibrary</artifactId>
+  <version>3.0.5</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>appcompat-v7</artifactId>
+      <version>25.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sanselan</groupId>
+      <artifactId>sanselan</artifactId>
+      <version>0.97-incubator</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.danlew</groupId>
+      <artifactId>android.joda</artifactId>
+      <version>2.9.9.4</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.md5 b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.md5
@@ -0,0 +1 @@
+8aae43e056f1809ad78bc406e718fccd
diff --git a/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.sha1 b/repository/com/theta360/pluginlibrary/3.0.5/pluginlibrary-3.0.5.pom.sha1
@@ -0,0 +1 @@
+63ece3d93197a7f8489ec5cdea02ba0e1b8f8ae9
diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml b/repository/com/theta360/pluginlibrary/maven-metadata.xml
@@ -3,7 +3,7 @@
   <groupId>com.theta360</groupId>
   <artifactId>pluginlibrary</artifactId>
   <versioning>
-    <release>3.0.4</release>
+    <release>3.0.5</release>
     <versions>
       <version>2.0.0</version>
       <version>2.1.0</version>
@@ -12,7 +12,8 @@
       <version>3.0.2</version>
       <version>3.0.3</version>
       <version>3.0.4</version>
+      <version>3.0.5</version>
     </versions>
-    <lastUpdated>20220623070909</lastUpdated>
+    <lastUpdated>20230310163550</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 @@
-aaa7050f20251396cd983c067b43879a
+4afd37fade043c4c14059265aa49f3a8
diff --git a/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1 b/repository/com/theta360/pluginlibrary/maven-metadata.xml.sha1
@@ -1 +1 @@
-915b7fe59dd441dec36cceed95e332c4c588e0c9
+fd05867a8adb7f7dbe847b3be0abe9ce18a85118
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		aaa7050f20251396cd983c067b43879a
		4afd37fade043c4c14059265aa49f3a8
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		915b7fe59dd441dec36cceed95e332c4c588e0c9
		fd05867a8adb7f7dbe847b3be0abe9ce18a85118