From 3141e0ba8f419a5528ebe38ebd640c51d020d978 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Fri, 10 Dec 2021 18:03:52 +0900 Subject: [PATCH] android lint --- .../thibault/aves/channel/calls/AccessibilityHandler.kt | 2 ++ .../deckers/thibault/aves/channel/calls/AppAdapterHandler.kt | 2 ++ .../thibault/aves/channel/calls/MetadataFetchHandler.kt | 4 ++-- .../aves/channel/streams/SettingsChangeStreamHandler.kt | 3 +++ .../aves/channel/streams/StorageAccessStreamHandler.kt | 4 ++-- .../thibault/aves/metadata/MediaMetadataRetrieverHelper.kt | 2 ++ .../main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt | 2 ++ .../main/kotlin/deckers/thibault/aves/model/SourceEntry.kt | 2 ++ .../src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt | 2 +- .../kotlin/deckers/thibault/aves/utils/PermissionManager.kt | 2 ++ .../main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt | 1 - 11 files changed, 20 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AccessibilityHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AccessibilityHandler.kt index b18950cf0..6deead748 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AccessibilityHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AccessibilityHandler.kt @@ -1,5 +1,6 @@ package deckers.thibault.aves.channel.calls +import android.annotation.SuppressLint import android.app.Activity import android.content.Context import android.os.Build @@ -24,6 +25,7 @@ class AccessibilityHandler(private val activity: Activity) : MethodCallHandler { private fun areAnimationsRemoved(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) { var removed = false + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { try { removed = Settings.Global.getFloat(activity.contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE) == 0f diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt index ea05c9733..e906ab72c 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt @@ -1,5 +1,6 @@ package deckers.thibault.aves.channel.calls +import android.annotation.SuppressLint import android.content.* import android.content.pm.ApplicationInfo import android.content.res.Configuration @@ -63,6 +64,7 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler { // apps tend to use their name in English when creating directories // so we get their names in English as well as the current locale val englishConfig = Configuration().apply { + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { setLocale(Locale.ENGLISH) } else { diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt index ec777d178..29c52af31 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt @@ -96,7 +96,6 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler { } } - @SuppressLint("ObsoleteSdkInt") private fun getAllMetadata(call: MethodCall, result: MethodChannel.Result) { val mimeType = call.argument("mimeType") val uri = call.argument("uri")?.let { Uri.parse(it) } @@ -193,6 +192,7 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler { val key = kv.key // `PNG-iTXt` uses UTF-8, contrary to `PNG-tEXt` and `PNG-zTXt` using Latin-1 / ISO-8859-1 val charset = if (baseDirName == PNG_ITXT_DIR_NAME) { + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { StandardCharsets.UTF_8 } else { @@ -577,7 +577,6 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler { metadataMap[KEY_FLAGS] = flags } - @SuppressLint("ObsoleteSdkInt") private fun getMultimediaCatalogMetadataByMediaMetadataRetriever( uri: Uri, mimeType: String, @@ -587,6 +586,7 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler { var flags = (metadataMap[KEY_FLAGS] ?: 0) as Int try { + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { retriever.getSafeInt(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION) { metadataMap[KEY_ROTATION_DEGREES] = it } } diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/SettingsChangeStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/SettingsChangeStreamHandler.kt index 4b53b693c..c61c18ad7 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/SettingsChangeStreamHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/SettingsChangeStreamHandler.kt @@ -1,5 +1,6 @@ package deckers.thibault.aves.channel.streams +import android.annotation.SuppressLint import android.content.Context import android.database.ContentObserver import android.net.Uri @@ -36,6 +37,7 @@ class SettingsChangeStreamHandler(private val context: Context) : EventChannel.S val settings: FieldMap = hashMapOf( Settings.System.ACCELEROMETER_ROTATION to accelerometerRotation, ) + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { settings[Settings.Global.TRANSITION_ANIMATION_SCALE] = transitionAnimationScale } @@ -51,6 +53,7 @@ class SettingsChangeStreamHandler(private val context: Context) : EventChannel.S accelerometerRotation = newAccelerometerRotation changed = true } + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { val newTransitionAnimationScale = Settings.Global.getFloat(context.contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE) if (transitionAnimationScale != newTransitionAnimationScale) { diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/StorageAccessStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/StorageAccessStreamHandler.kt index 42755cf30..8970a02d9 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/StorageAccessStreamHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/StorageAccessStreamHandler.kt @@ -92,8 +92,8 @@ class StorageAccessStreamHandler(private val activity: Activity, arguments: Any? endOfStream() } - @SuppressLint("ObsoleteSdkInt") private fun createFile() { + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { error("createFile-sdk", "unsupported SDK version=${Build.VERSION.SDK_INT}", null) return @@ -135,8 +135,8 @@ class StorageAccessStreamHandler(private val activity: Activity, arguments: Any? } - @SuppressLint("ObsoleteSdkInt") private suspend fun openFile() { + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { error("openFile-sdk", "unsupported SDK version=${Build.VERSION.SDK_INT}", null) return diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MediaMetadataRetrieverHelper.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MediaMetadataRetrieverHelper.kt index 4b2f04d16..cbb92eee9 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MediaMetadataRetrieverHelper.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MediaMetadataRetrieverHelper.kt @@ -1,5 +1,6 @@ package deckers.thibault.aves.metadata +import android.annotation.SuppressLint import android.media.MediaFormat import android.media.MediaMetadataRetriever import android.os.Build @@ -31,6 +32,7 @@ object MediaMetadataRetrieverHelper { MediaMetadataRetriever.METADATA_KEY_WRITER to "Writer", MediaMetadataRetriever.METADATA_KEY_YEAR to "Year", ).apply { + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { put(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION, "Video Rotation") } diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt index 3cfa5f1bd..1b6277be9 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiPage.kt @@ -1,5 +1,6 @@ package deckers.thibault.aves.metadata +import android.annotation.SuppressLint import android.content.Context import android.media.MediaExtractor import android.media.MediaFormat @@ -56,6 +57,7 @@ object MultiPage { format.getSafeInt(MediaFormat.KEY_WIDTH) { track[KEY_WIDTH] = it } format.getSafeInt(MediaFormat.KEY_HEIGHT) { track[KEY_HEIGHT] = it } + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { format.getSafeInt(MediaFormat.KEY_IS_DEFAULT) { track[KEY_IS_DEFAULT] = it != 0 } } diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt index 67e429301..b4ffd9b43 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt @@ -1,5 +1,6 @@ package deckers.thibault.aves.model +import android.annotation.SuppressLint import android.content.ContentResolver import android.content.Context import android.graphics.BitmapFactory @@ -139,6 +140,7 @@ class SourceEntry { retriever.getSafeLong(MediaMetadataRetriever.METADATA_KEY_DURATION) { durationMillis = it } retriever.getSafeDateMillis(MediaMetadataRetriever.METADATA_KEY_DATE) { sourceDateTakenMillis = it } retriever.getSafeString(MediaMetadataRetriever.METADATA_KEY_TITLE) { title = it } + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { retriever.getSafeInt(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION) { sourceRotationDegrees = it } } diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt index 07d8064f6..51d83b4a3 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt @@ -3,7 +3,7 @@ package deckers.thibault.aves.utils import androidx.exifinterface.media.ExifInterface object MimeTypes { - const val ANY = "*/*"; + const val ANY = "*/*" // generic raster const val BMP = "image/bmp" diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt index a078ea9a1..e77a1648e 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt @@ -1,5 +1,6 @@ package deckers.thibault.aves.utils +import android.annotation.SuppressLint import android.app.Activity import android.content.Context import android.content.Intent @@ -182,6 +183,7 @@ object PermissionManager { // from API 19 / Android 4.4 / KitKat, removable storage requires access permission, at the file level // from API 21 / Android 5.0 / Lollipop, removable storage requires access permission, but directory access grant is possible // from API 30 / Android 11 / R, any storage requires access permission + @SuppressLint("ObsoleteSdkInt") if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2) { accessibleDirs.addAll(StorageUtils.getVolumePaths(context)) } else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) { diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt index 79118d575..c801c30ec 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt @@ -93,7 +93,6 @@ object StorageUtils { } } - @SuppressLint("ObsoleteSdkInt") private fun findVolumePaths(context: Context): Array { // Final set of paths val paths = HashSet()