From 2785d66cb1ec19dd2c5c64246f7226749f203dfb Mon Sep 17 00:00:00 2001 From: tateisu Date: Tue, 24 Aug 2021 07:57:47 +0900 Subject: [PATCH] =?UTF-8?q?-=20exoPlayer=E3=81=AE=20onPlayerError=E3=81=AE?= =?UTF-8?q?=E5=BC=95=E6=95=B0=E3=81=AE=E5=9E=8B=E3=82=92PlaybackException?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=20-=20detekt=201.18.0=20-=20google-?= =?UTF-8?q?services:4.3.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/juggler/subwaytooter/ActMediaViewer.kt | 12 ++++++++---- build.gradle | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMediaViewer.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMediaViewer.kt index 59d7c681..18c07413 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActMediaViewer.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActMediaViewer.kt @@ -144,7 +144,7 @@ class ActMediaViewer : AppCompatActivity(), View.OnClickListener { log.d("exoPlayer onRepeatModeChanged $repeatMode") } - override fun onPlayerError(error: ExoPlaybackException) { + override fun onPlayerError(error: PlaybackException) { log.d("exoPlayer onPlayerError") showToast(error, "player error.") } @@ -178,8 +178,8 @@ class ActMediaViewer : AppCompatActivity(), View.OnClickListener { this.idx = savedInstanceState?.getInt(EXTRA_IDX) ?: intent.getIntExtra(EXTRA_IDX, idx) this.serviceType = ServiceType.values()[ - savedInstanceState?.getInt(EXTRA_SERVICE_TYPE) - ?: intent.getIntExtra(EXTRA_SERVICE_TYPE, 0) + savedInstanceState?.getInt(EXTRA_SERVICE_TYPE) + ?: intent.getIntExtra(EXTRA_SERVICE_TYPE, 0) ] this.mediaList = decodeMediaList( @@ -815,7 +815,11 @@ class ActMediaViewer : AppCompatActivity(), View.OnClickListener { return false } - override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { + override fun onRequestPermissionsResult( + requestCode: Int, + permissions: Array, + grantResults: IntArray, + ) { if (requestCode == PERMISSION_REQUEST_CODE) { when (permissions.indices.all { grantResults[it] == PackageManager.PERMISSION_GRANTED }) { false -> showToast(true, R.string.missing_permission_to_access_media) diff --git a/build.gradle b/build.gradle index c01a13a1..b3646602 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { ext.junit_version='4.13.2' - ext.detekt_version='1.17.1' + ext.detekt_version='1.18.0' repositories { google() @@ -22,7 +22,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:4.2.2' - classpath 'com.google.gms:google-services:4.3.8' + classpath 'com.google.gms:google-services:4.3.10' //noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"