なんどか取得に失敗するのに対策中。

[gokigen/PKRemote.git] / app / src / main / java / net / osdn / gokigen / pkremote / camera / vendor / ptpip / wrapper / command / messages / PtpIpCommandGeneric.java

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/command/messages/PtpIpCommandGeneric.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/command/messages/PtpIpCommandGeneric.java
index 8278e6a..1d8cfa7 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/command/messages/PtpIpCommandGeneric.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/command/messages/PtpIpCommandGeneric.java
@@ -12,6 +12,7 @@ public class PtpIpCommandGeneric extends PtpIpCommandBase
     private final int bodySize;
     private final int id;
     private final int holdId;
+    private final int estimatedObjectSize;
 
     private final byte opCode0;
     private final byte opCode1;
@@ -41,6 +42,7 @@ public class PtpIpCommandGeneric extends PtpIpCommandBase
         this.callback = callback;
         this.bodySize = 0;
         this.isDumpLog = isDumpLog;
+        this.estimatedObjectSize = -1;
 
         this.id = id;
         this.holdId = holdId;
@@ -73,6 +75,7 @@ public class PtpIpCommandGeneric extends PtpIpCommandBase
         this.callback = callback;
         this.bodySize = bodySize;
         this.isDumpLog = isDumpLog;
+        this.estimatedObjectSize = -1;
 
         this.id = id;
         this.holdId = holdId;
@@ -105,6 +108,7 @@ public class PtpIpCommandGeneric extends PtpIpCommandBase
         this.callback = callback;
         this.bodySize = bodySize;
         this.isDumpLog = isDumpLog;
+        this.estimatedObjectSize = -1;
 
         this.id = id;
         this.holdId = holdId;
@@ -137,6 +141,7 @@ public class PtpIpCommandGeneric extends PtpIpCommandBase
         this.callback = callback;
         this.bodySize = bodySize;
         this.isDumpLog = isDumpLog;
+        this.estimatedObjectSize = -1;
 
         this.id = id;
         this.holdId = holdId;
@@ -170,6 +175,7 @@ public class PtpIpCommandGeneric extends PtpIpCommandBase
         this.callback = callback;
         this.bodySize = bodySize;
         this.isDumpLog = isDumpLog;
+        this.estimatedObjectSize = -1;
 
         this.id = id;
         this.holdId = holdId;
@@ -210,6 +216,12 @@ public class PtpIpCommandGeneric extends PtpIpCommandBase
     }
 
     @Override
+    public int estimatedReceiveDataSize()
+    {
+        return (estimatedObjectSize);
+    }
+
+    @Override
     public byte[] commandBody()
     {
         if (bodySize == 2)