Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

android: cleanup

Browse source
This commit is contained in:
Thibault Deckers 2023-05-08 01:45:24 +02:00
parent 17ac257f0c
commit 1f0c46db07
8 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ActivityWindowHandler.kt
View file

@ -8,7 +8,7 @@ import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel
class ActivityWindowHandler(private val activity: Activity) : WindowHandler(activity) { 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) result.success(true)
} }
@ -49,11 +49,11 @@ class ActivityWindowHandler(private val activity: Activity) : WindowHandler(acti
result.success(true) 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) 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) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
result.error("getCutoutInsets-sdk", "unsupported SDK version=${Build.VERSION.SDK_INT}", null) result.error("getCutoutInsets-sdk", "unsupported SDK version=${Build.VERSION.SDK_INT}", null)
return return

4
android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/ServiceWindowHandler.kt
View file

@ -5,7 +5,7 @@ import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel
class ServiceWindowHandler(service: Service) : WindowHandler(service) { 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) result.success(false)
} }
@ -21,7 +21,7 @@ class ServiceWindowHandler(service: Service) : WindowHandler(service) {
result.success(false) 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) result.success(false)
} }

2
android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/window/WindowHandler.kt
View file

@ -40,7 +40,7 @@ abstract class WindowHandler(private val contextWrapper: ContextWrapper) : Metho
abstract fun requestOrientation(call: MethodCall, result: MethodChannel.Result) 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) abstract fun getCutoutInsets(call: MethodCall, result: MethodChannel.Result)

2
android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/SettingsChangeStreamHandler.kt
View file

@ -1,10 +1,8 @@
package deckers.thibault.aves.channel.streams package deckers.thibault.aves.channel.streams
import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.database.ContentObserver import android.database.ContentObserver
import android.net.Uri import android.net.Uri
import android.os.Build
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.provider.Settings import android.provider.Settings

2
android/app/src/main/kotlin/deckers/thibault/aves/metadata/GoogleDeviceContainer.kt
View file

@ -81,4 +81,4 @@ class GoogleDeviceContainer {
fun itemMimeType(index: Int) = item(index)?.mimeType 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)

4
android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeMp4BoxHandler.kt
View file

@ -1,8 +1,6 @@
package deckers.thibault.aves.metadata.metadataextractor package deckers.thibault.aves.metadata.metadataextractor
import com.drew.imaging.mp4.Mp4Handler 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.Metadata
import com.drew.metadata.mp4.Mp4BoxHandler import com.drew.metadata.mp4.Mp4BoxHandler
import com.drew.metadata.mp4.Mp4BoxTypes import com.drew.metadata.mp4.Mp4BoxTypes
@ -11,7 +9,7 @@ import java.io.IOException
class SafeMp4BoxHandler(metadata: Metadata) : Mp4BoxHandler(metadata) { class SafeMp4BoxHandler(metadata: Metadata) : Mp4BoxHandler(metadata) {
@Throws(IOException::class) @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) { if (payload != null && type == Mp4BoxTypes.BOX_USER_DEFINED) {
val userBoxHandler = SafeMp4UuidBoxHandler(metadata) val userBoxHandler = SafeMp4UuidBoxHandler(metadata)
userBoxHandler.processBox(type, payload, boxSize, context) userBoxHandler.processBox(type, payload, boxSize, context)

21
android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafePngMetadataReader.kt
View file

@ -1,11 +1,24 @@
package deckers.thibault.aves.metadata.metadataextractor package deckers.thibault.aves.metadata.metadataextractor
import android.util.Log 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.TiffProcessingException
import com.drew.imaging.tiff.TiffReader import com.drew.imaging.tiff.TiffReader
import com.drew.lang.* import com.drew.lang.ByteArrayReader
import com.drew.lang.annotations.NotNull 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.ErrorDirectory
import com.drew.metadata.Metadata import com.drew.metadata.Metadata
import com.drew.metadata.StringValue import com.drew.metadata.StringValue
@ -64,7 +77,7 @@ object SafePngMetadataReader {
} }
@Throws(PngProcessingException::class, IOException::class) @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 chunkType = chunk.type
val bytes = chunk.bytes val bytes = chunk.bytes

4
android/app/src/main/kotlin/deckers/thibault/aves/metadata/metadataextractor/SafeXmpReader.kt
View file

@ -10,8 +10,6 @@ import com.adobe.internal.xmp.properties.XMPPropertyInfo
import com.drew.imaging.jpeg.JpegSegmentType import com.drew.imaging.jpeg.JpegSegmentType
import com.drew.lang.SequentialByteArrayReader import com.drew.lang.SequentialByteArrayReader
import com.drew.lang.SequentialReader 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.Directory
import com.drew.metadata.Metadata import com.drew.metadata.Metadata
import com.drew.metadata.xmp.XmpDirectory import com.drew.metadata.xmp.XmpDirectory
@ -63,7 +61,7 @@ class SafeXmpReader : XmpReader() {
} }
// adapted from `XmpReader` to provide different parsing options // 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() val directory = XmpDirectory()
if (parentDirectory != null) directory.parent = parentDirectory if (parentDirectory != null) directory.parent = parentDirectory