From 927d9786a634c6d80be466d13d44af350c846812 Mon Sep 17 00:00:00 2001 From: deflis Date: Sat, 19 May 2018 04:39:30 +0900 Subject: [PATCH] =?UTF-8?q?UserAgent=E3=82=92=E5=87=BA=E3=81=99=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/jp/juggler/subwaytooter/App1.kt | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/App1.kt b/app/src/main/java/jp/juggler/subwaytooter/App1.kt index 5e5e2fda..7b20c3be 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/App1.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/App1.kt @@ -9,6 +9,7 @@ import android.content.SharedPreferences import android.database.sqlite.SQLiteDatabase import android.database.sqlite.SQLiteOpenHelper import android.net.Uri +import android.os.Build import android.support.customtabs.CustomTabsIntent import android.util.Log @@ -35,12 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger import jp.juggler.subwaytooter.api.entity.TootAttachment import jp.juggler.subwaytooter.table.* import jp.juggler.subwaytooter.util.* -import okhttp3.Cache -import okhttp3.CacheControl -import okhttp3.CipherSuite -import okhttp3.ConnectionSpec -import okhttp3.OkHttpClient -import okhttp3.Response +import okhttp3.* import uk.co.chrisjenx.calligraphy.CalligraphyConfig class App1 : Application() { @@ -193,8 +189,15 @@ class App1 : Application() { val spec_list = ArrayList() spec_list.add(spec) spec_list.add(ConnectionSpec.CLEARTEXT) - - + + val user_agent_interceptor = Interceptor { chain -> + val original_request = chain.request() + val request_with_user_agent = original_request.newBuilder() + .header("User-Agent", "SubwayTooter/" + BuildConfig.VERSION_NAME + " Android/" + Build.VERSION.RELEASE) + .build() + chain.proceed(request_with_user_agent) + } + return OkHttpClient.Builder() .connectTimeout(30, TimeUnit.SECONDS) .readTimeout(60, TimeUnit.SECONDS) @@ -202,6 +205,7 @@ class App1 : Application() { .pingInterval(10, TimeUnit.SECONDS) .connectionSpecs(spec_list) .addInterceptor(ProgressResponseBody.makeInterceptor()) + .addInterceptor(user_agent_interceptor) } lateinit var ok_http_client : OkHttpClient