タイムアウト値を伸ばす。

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/olympuspen/wrapper/playback/OlympusPenPlaybackControl.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/olympuspen/wrapper/playback/OlympusPenPlaybackControl.java
index b85474c..7d78e90 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/olympuspen/wrapper/playback/OlympusPenPlaybackControl.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/olympuspen/wrapper/playback/OlympusPenPlaybackControl.java
@@ -28,16 +28,16 @@ import androidx.preference.PreferenceManager;
 public class OlympusPenPlaybackControl implements IPlaybackControl
 {
     private final String TAG = toString();
-    private static final int DEFAULT_TIMEOUT = 3000;
+    private static final int DEFAULT_TIMEOUT = 15000;
     private final Activity activity;
     private final int timeoutValue;
-    private OlympusPenObjectDataHolder imageListHolder = new OlympusPenObjectDataHolder();
+    private final OlympusPenObjectDataHolder imageListHolder = new OlympusPenObjectDataHolder();
 
     public OlympusPenPlaybackControl(@NonNull Activity activity, int timeoutMs)
     {
         Log.v(TAG, "OlympusPenPlaybackControl()");
         this.activity = activity;
-        this.timeoutValue  = (timeoutMs < DEFAULT_TIMEOUT) ? DEFAULT_TIMEOUT : timeoutMs;
+        this.timeoutValue  = Math.max(timeoutMs, DEFAULT_TIMEOUT);
     }
 
     @Override