From c291bc35538ba8580ec0dce638e1bab874781edd Mon Sep 17 00:00:00 2001 From: MRSa Date: Sun, 23 Apr 2023 21:43:56 +0900 Subject: [PATCH] =?utf8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6?= =?utf8?q?=E3=83=88=E5=80=A4=E3=82=92=E4=BC=B8=E3=81=B0=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../olympuspen/wrapper/playback/OlympusPenPlaybackControl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 --- 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 -- 2.11.0