From 12b460bb6061181ccd230494b87357ae0eb5b266 Mon Sep 17 00:00:00 2001 From: tateisu Date: Wed, 23 Feb 2022 13:24:38 +0900 Subject: [PATCH] =?UTF-8?q?API=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9?= =?UTF-8?q?=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82Chrome=20Custom=20Tabs?= =?UTF-8?q?=E3=81=A7=E9=96=8B=E3=81=91=E3=81=9F=E3=82=892=E5=9B=9E?= =?UTF-8?q?=E9=96=8B=E3=81=8B=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/jp/juggler/subwaytooter/App1.kt | 6 ++++-- .../jp/juggler/subwaytooter/appsetting/AppSettingItem.kt | 1 + app/src/main/java/jp/juggler/subwaytooter/pref/PrefS.kt | 2 ++ app/src/main/java/jp/juggler/subwaytooter/util/AppOpener.kt | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/App1.kt b/app/src/main/java/jp/juggler/subwaytooter/App1.kt index 0173e490..c9f6f683 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/App1.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/App1.kt @@ -274,8 +274,10 @@ class App1 : Application() { Logger.getLogger(OkHttpClient::class.java.name).level = Level.FINE + val apiReadTimeout = max(3, PrefS.spApiReadTimeout.toInt(appPref)) + // API用のHTTP設定はキャッシュを使わない - ok_http_client = prepareOkHttp(60, 60) + ok_http_client = prepareOkHttp(apiReadTimeout, apiReadTimeout) .build() // ディスクキャッシュ @@ -283,7 +285,7 @@ class App1 : Application() { val cache = Cache(cacheDir, 30000000L) // カスタム絵文字用のHTTP設定はキャッシュを使う - ok_http_client2 = prepareOkHttp(60, 60) + ok_http_client2 = prepareOkHttp(apiReadTimeout, apiReadTimeout) .cache(cache) .build() diff --git a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt index 40f5873b..bb45e8f0 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt @@ -1002,6 +1002,7 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett sw(PrefB.bpDontUseStreaming, R.string.dont_use_streaming_api) sw(PrefB.bpDontRefreshOnResume, R.string.dont_refresh_on_activity_resume) text(PrefS.spMediaReadTimeout, R.string.timeout_for_embed_media_viewer, InputTypeEx.number) + text(PrefS.spApiReadTimeout, R.string.timeout_for_server_api, InputTypeEx.number) action(R.string.delete_custom_emoji_cache) { action = { App1.custom_emoji_cache.delete() diff --git a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefS.kt b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefS.kt index 152b1c1c..2465158a 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefS.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefS.kt @@ -35,6 +35,8 @@ object PrefS { val spUserAgent = StringPref("UserAgent", "") val spMediaReadTimeout = StringPref("spMediaReadTimeout", "60") + val spApiReadTimeout = StringPref("spApiReadTimeout", "60") + val spAgreedPrivacyPolicyDigest = StringPref("spAgreedPrivacyPolicyDigest", "") val spTimeZone = StringPref("TimeZone", "") diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/AppOpener.kt b/app/src/main/java/jp/juggler/subwaytooter/util/AppOpener.kt index 127dd0f1..36392c79 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/util/AppOpener.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/util/AppOpener.kt @@ -163,6 +163,7 @@ fun Activity.openCustomTab(url: String?, pref: SharedPreferences = pref()) { "com.google.android.apps.chrome.Main" ) startCustomTabIntent(cn) + return } catch (ex2: Throwable) { log.e(ex2, "openCustomTab: missing chrome. retry to other application.") } diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e7813a41..eb0c76c4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -706,6 +706,7 @@ タイムラインのフォント(太字)(アプリ再起動が必要) タイムラインのフォントの大きさ\n(単位:sp。空欄でデフォルト。アプリ再起動が必要)\n…\n… 内蔵メディアビューアのタイムアウト (単位:秒 アプリ再起動(アプリ履歴からの消去)が必要) + サーバAPIアクセスのタイムアウト (単位:秒 アプリ再起動(アプリ履歴からの消去)が必要) 名前 アプリデータのエクスポート、インポート、バックアップからの復元などでアクセストークンが他のデバイスでも使われている可能性があります。アクセストークンの更新をおすすめします。 アクセストークンを入力してください diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d67a0759..59d0443f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -791,6 +791,7 @@ Reaction voting or its result Timeout for embedded media viewer (Unit:seconds, app restart(delete from app history) required) + Timeout for server API(Unit:seconds, app restart(delete from app history) required) Link color (app restart required) Missing closeable column in visible range. Don\'t use (Chrome/Firefox) \"Custom Tabs\" when opening links