From 1f0c46db074244d8448e4bf0ca90162a28c19fa6 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 8 May 2023 01:45:24 +0200 Subject: [PATCH] android: cleanup --- .../calls/window/ActivityWindowHandler.kt | 6 +++--- .../calls/window/ServiceWindowHandler.kt | 4 ++-- .../channel/calls/window/WindowHandler.kt | 2 +- .../streams/SettingsChangeStreamHandler.kt | 2 -- .../aves/metadata/GoogleDeviceContainer.kt | 2 +- .../metadataextractor/SafeMp4BoxHandler.kt | 4 +--- .../SafePngMetadataReader.kt | 21 +++++++++++++++---- .../metadataextractor/SafeXmpReader.kt | 4 +--- 8 files changed, 26 insertions(+), 19 deletions(-) diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ActivityWindowHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ActivityWindowHandler.kt index 1f6590dd6..bf4c37bcd 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ActivityWindowHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ActivityWindowHandler.kt @@ -8,7 +8,7 @@ import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodChannel class ActivityWindowHandler(private val activity: Activity) : WindowHandler(activity) { - override fun isActivity(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) { + override fun isActivity(call: MethodCall, result: MethodChannel.Result) { result.success(true) } @@ -49,11 +49,11 @@ class ActivityWindowHandler(private val activity: Activity) : WindowHandler(acti result.success(true) } - override fun isCutoutAware(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) { + override fun isCutoutAware(call: MethodCall, result: MethodChannel.Result) { result.success(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) } - override fun getCutoutInsets(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) { + override fun getCutoutInsets(call: MethodCall, result: MethodChannel.Result) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { result.error("getCutoutInsets-sdk", "unsupported SDK version=${Build.VERSION.SDK_INT}", null) return diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ServiceWindowHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ServiceWindowHandler.kt index 3a50fd324..1332bbb9a 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ServiceWindowHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ServiceWindowHandler.kt @@ -5,7 +5,7 @@ import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodChannel class ServiceWindowHandler(service: Service) : WindowHandler(service) { - override fun isActivity(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) { + override fun isActivity(call: MethodCall, result: MethodChannel.Result) { result.success(false) } @@ -21,7 +21,7 @@ class ServiceWindowHandler(service: Service) : WindowHandler(service) { result.success(false) } - override fun isCutoutAware(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) { + override fun isCutoutAware(call: MethodCall, result: MethodChannel.Result) { result.success(false) } diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/WindowHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/WindowHandler.kt index 492c6deeb..11472d6a5 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/WindowHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/WindowHandler.kt @@ -40,7 +40,7 @@ abstract class WindowHandler(private val contextWrapper: ContextWrapper) : Metho abstract fun requestOrientation(call: MethodCall, result: MethodChannel.Result) - abstract fun isCutoutAware(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) + abstract fun isCutoutAware(call: MethodCall, result: MethodChannel.Result) abstract fun getCutoutInsets(call: MethodCall, result: MethodChannel.Result) 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 dd1c94e19..b29b8d4f2 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,10 +1,8 @@ package deckers.thibault.aves.channel.streams -import android.annotation.SuppressLint import android.content.Context import android.database.ContentObserver import android.net.Uri -import android.os.Build import android.os.Handler import android.os.Looper import android.provider.Settings diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/GoogleDeviceContainer.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/GoogleDeviceContainer.kt index a481c94e4..60b74a507 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/GoogleDeviceContainer.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/GoogleDeviceContainer.kt @@ -81,4 +81,4 @@ class GoogleDeviceContainer { fun itemMimeType(index: Int) = item(index)?.mimeType } -class GoogleDeviceContainerItem(val mimeType: String, val length: Long, val dataUri: String) {} +class GoogleDeviceContainerItem(val mimeType: String, val length: Long, val dataUri: String) diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeMp4BoxHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeMp4BoxHandler.kt index 2e6bebb3b..b4e83772c 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeMp4BoxHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeMp4BoxHandler.kt @@ -1,8 +1,6 @@ package deckers.thibault.aves.metadata.metadataextractor import com.drew.imaging.mp4.Mp4Handler -import com.drew.lang.annotations.NotNull -import com.drew.lang.annotations.Nullable import com.drew.metadata.Metadata import com.drew.metadata.mp4.Mp4BoxHandler import com.drew.metadata.mp4.Mp4BoxTypes @@ -11,7 +9,7 @@ import java.io.IOException class SafeMp4BoxHandler(metadata: Metadata) : Mp4BoxHandler(metadata) { @Throws(IOException::class) - override fun processBox(@NotNull type: String, @Nullable payload: ByteArray?, boxSize: Long, context: Mp4Context?): Mp4Handler<*>? { + override fun processBox(type: String, payload: ByteArray?, boxSize: Long, context: Mp4Context?): Mp4Handler<*>? { if (payload != null && type == Mp4BoxTypes.BOX_USER_DEFINED) { val userBoxHandler = SafeMp4UuidBoxHandler(metadata) userBoxHandler.processBox(type, payload, boxSize, context) diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafePngMetadataReader.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafePngMetadataReader.kt index 1f2cc1dd5..1012a6477 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafePngMetadataReader.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafePngMetadataReader.kt @@ -1,11 +1,24 @@ package deckers.thibault.aves.metadata.metadataextractor import android.util.Log -import com.drew.imaging.png.* +import com.drew.imaging.png.PngChromaticities +import com.drew.imaging.png.PngChunk +import com.drew.imaging.png.PngChunkReader +import com.drew.imaging.png.PngChunkType +import com.drew.imaging.png.PngHeader +import com.drew.imaging.png.PngProcessingException import com.drew.imaging.tiff.TiffProcessingException import com.drew.imaging.tiff.TiffReader -import com.drew.lang.* -import com.drew.lang.annotations.NotNull +import com.drew.lang.ByteArrayReader +import com.drew.lang.ByteConvert +import com.drew.lang.Charsets +import com.drew.lang.DateUtil +import com.drew.lang.KeyValuePair +import com.drew.lang.RandomAccessStreamReader +import com.drew.lang.SequentialByteArrayReader +import com.drew.lang.SequentialReader +import com.drew.lang.StreamReader +import com.drew.lang.StreamUtil import com.drew.metadata.ErrorDirectory import com.drew.metadata.Metadata import com.drew.metadata.StringValue @@ -64,7 +77,7 @@ object SafePngMetadataReader { } @Throws(PngProcessingException::class, IOException::class) - private fun processChunk(@NotNull metadata: Metadata, @NotNull chunk: PngChunk) { + private fun processChunk(metadata: Metadata, chunk: PngChunk) { val chunkType = chunk.type val bytes = chunk.bytes diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeXmpReader.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeXmpReader.kt index ac07d9967..8eb67202e 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeXmpReader.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeXmpReader.kt @@ -10,8 +10,6 @@ import com.adobe.internal.xmp.properties.XMPPropertyInfo import com.drew.imaging.jpeg.JpegSegmentType import com.drew.lang.SequentialByteArrayReader import com.drew.lang.SequentialReader -import com.drew.lang.annotations.NotNull -import com.drew.lang.annotations.Nullable import com.drew.metadata.Directory import com.drew.metadata.Metadata import com.drew.metadata.xmp.XmpDirectory @@ -63,7 +61,7 @@ class SafeXmpReader : XmpReader() { } // adapted from `XmpReader` to provide different parsing options - override fun extract(@NotNull xmpBytes: ByteArray, offset: Int, length: Int, @NotNull metadata: Metadata, @Nullable parentDirectory: Directory?) { + override fun extract(xmpBytes: ByteArray, offset: Int, length: Int, metadata: Metadata, parentDirectory: Directory?) { val directory = XmpDirectory() if (parentDirectory != null) directory.parent = parentDirectory