From b5d2ac3377e5c9fa43ab5b60133bc9f9c724e7fd Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Mon, 19 Apr 2021 12:31:08 +0900
Subject: [PATCH] minor change

---
 .../main/kotlin/deckers/thibault/aves/MainActivity.kt |  2 +-
 .../thibault/aves/channel/calls/AppAdapterHandler.kt  |  2 +-
 .../thibault/aves/channel/calls/DebugHandler.kt       |  2 +-
 .../thibault/aves/channel/calls/MetadataHandler.kt    |  2 +-
 .../channel/streams/ContentChangeStreamHandler.kt     |  2 +-
 .../aves/channel/streams/ImageByteStreamHandler.kt    |  6 +++---
 .../aves/channel/streams/ImageOpStreamHandler.kt      |  2 +-
 .../aves/channel/streams/MediaStoreStreamHandler.kt   |  2 +-
 .../channel/streams/StorageAccessStreamHandler.kt     |  2 +-
 .../thibault/aves/metadata/ExifInterfaceHelper.kt     |  2 +-
 .../deckers/thibault/aves/metadata/MultiTrackMedia.kt |  2 +-
 .../deckers/thibault/aves/metadata/SphericalVideo.kt  |  2 +-
 .../main/kotlin/deckers/thibault/aves/metadata/XMP.kt |  2 +-
 .../thibault/aves/model/provider/ImageProvider.kt     |  2 +-
 .../aves/model/provider/MediaStoreImageProvider.kt    |  2 +-
 .../kotlin/deckers/thibault/aves/utils/BitmapUtils.kt |  2 +-
 .../kotlin/deckers/thibault/aves/utils/LogUtils.kt    | 11 ++++++-----
 .../deckers/thibault/aves/utils/PermissionManager.kt  |  2 +-
 .../deckers/thibault/aves/utils/StorageUtils.kt       |  2 +-
 .../kotlin/deckers/thibault/aves/utils/UriUtils.kt    |  2 +-
 20 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
index e73bf059b..f1fc537dd 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
@@ -172,7 +172,7 @@ class MainActivity : FlutterActivity() {
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(MainActivity::class.java)
+        private val LOG_TAG = LogUtils.createTag<MainActivity>()
         const val VIEWER_CHANNEL = "deckers.thibault/aves/viewer"
     }
 }
\ No newline at end of file
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 9df5b08c6..f93f043e7 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
@@ -263,7 +263,7 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(AppAdapterHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<AppAdapterHandler>()
         const val CHANNEL = "deckers.thibault/aves/app"
     }
 }
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/DebugHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/DebugHandler.kt
index 70e7a46f5..be5cbdb78 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/DebugHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/DebugHandler.kt
@@ -305,7 +305,7 @@ class DebugHandler(private val context: Context) : MethodCallHandler {
     )
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(DebugHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<DebugHandler>()
         const val CHANNEL = "deckers.thibault/aves/debug"
     }
 }
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
index 0aa6ce5e1..9f1ad02fe 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
@@ -910,7 +910,7 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(MetadataHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<MetadataHandler>()
         const val CHANNEL = "deckers.thibault/aves/metadata"
 
         private val allMetadataRedundantDirNames = setOf(
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ContentChangeStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ContentChangeStreamHandler.kt
index fc9a0114a..582abbe49 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ContentChangeStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ContentChangeStreamHandler.kt
@@ -58,7 +58,7 @@ class ContentChangeStreamHandler(private val context: Context) : EventChannel.St
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(ContentChangeStreamHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<ContentChangeStreamHandler>()
         const val CHANNEL = "deckers.thibault/aves/contentchange"
     }
 }
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageByteStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageByteStreamHandler.kt
index 58746c997..c7c4355e5 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageByteStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageByteStreamHandler.kt
@@ -175,7 +175,7 @@ class ImageByteStreamHandler(private val activity: Activity, private val argumen
     }
 
     private fun streamBytes(inputStream: InputStream) {
-        val buffer = ByteArray(bufferSize)
+        val buffer = ByteArray(BUFFER_SIZE)
         var len: Int
         while (inputStream.read(buffer).also { len = it } != -1) {
             // cannot decode image on Flutter side when using `buffer` directly
@@ -184,10 +184,10 @@ class ImageByteStreamHandler(private val activity: Activity, private val argumen
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(ImageByteStreamHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<ImageByteStreamHandler>()
         const val CHANNEL = "deckers.thibault/aves/imagebytestream"
 
-        const val bufferSize = 2 shl 17 // 256kB
+        const val BUFFER_SIZE = 2 shl 17 // 256kB
 
         // request a fresh image with the highest quality format
         val glideOptions = RequestOptions()
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt
index 86e8d0650..bc58d75d4 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt
@@ -176,7 +176,7 @@ class ImageOpStreamHandler(private val context: Context, private val arguments:
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(ImageOpStreamHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<ImageOpStreamHandler>()
         const val CHANNEL = "deckers.thibault/aves/imageopstream"
     }
 }
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
index 69e130e33..dc5a0caa8 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
@@ -61,7 +61,7 @@ class MediaStoreStreamHandler(private val context: Context, arguments: Any?) : E
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(MediaStoreStreamHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<MediaStoreStreamHandler>()
         const val CHANNEL = "deckers.thibault/aves/mediastorestream"
     }
 }
\ No newline at end of file
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 f22e7b684..649425255 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
@@ -75,7 +75,7 @@ class StorageAccessStreamHandler(private val activity: Activity, arguments: Any?
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(StorageAccessStreamHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<StorageAccessStreamHandler>()
         const val CHANNEL = "deckers.thibault/aves/storageaccessstream"
     }
 }
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/ExifInterfaceHelper.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/ExifInterfaceHelper.kt
index f43001cda..dd449e012 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/ExifInterfaceHelper.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/ExifInterfaceHelper.kt
@@ -17,7 +17,7 @@ import kotlin.math.floor
 import kotlin.math.roundToLong
 
 object ExifInterfaceHelper {
-    private val LOG_TAG = LogUtils.createTag(ExifInterfaceHelper::class.java)
+    private val LOG_TAG = LogUtils.createTag<ExifInterfaceHelper>()
     private val DATETIME_FORMAT = SimpleDateFormat("yyyy:MM:dd hh:mm:ss", Locale.ROOT)
 
     private const val precisionErrorTolerance = 1e-10
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiTrackMedia.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiTrackMedia.kt
index acd72a5d5..d73bbe8fe 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiTrackMedia.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiTrackMedia.kt
@@ -13,7 +13,7 @@ import deckers.thibault.aves.utils.MimeTypes
 import deckers.thibault.aves.utils.StorageUtils
 
 object MultiTrackMedia {
-    private val LOG_TAG = LogUtils.createTag(MultiTrackMedia::class.java)
+    private val LOG_TAG = LogUtils.createTag<MultiTrackMedia>()
 
     @RequiresApi(Build.VERSION_CODES.P)
     fun getImage(context: Context, uri: Uri, trackIndex: Int?): Bitmap? {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/SphericalVideo.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/SphericalVideo.kt
index 5aec0dba7..23f5e9020 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/SphericalVideo.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/SphericalVideo.kt
@@ -82,7 +82,7 @@ class GSpherical(xmlBytes: ByteArray) {
     ).filterValues { it != null }
 
     companion object SphericalVideo {
-        private val LOG_TAG = LogUtils.createTag(SphericalVideo::class.java)
+        private val LOG_TAG = LogUtils.createTag<SphericalVideo>()
 
         // cf https://github.com/google/spatial-media
         const val SPHERICAL_VIDEO_V1_UUID = "ffcc8263-f855-4a93-8814-587a02521fdd"
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
index 6d411f1e5..be2f4da9c 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
@@ -8,7 +8,7 @@ import deckers.thibault.aves.utils.LogUtils
 import java.util.*
 
 object XMP {
-    private val LOG_TAG = LogUtils.createTag(XMP::class.java)
+    private val LOG_TAG = LogUtils.createTag<XMP>()
 
     // standard namespaces
     // cf com.adobe.internal.xmp.XMPConst
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
index fcde6e512..3855f5732 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
@@ -349,6 +349,6 @@ abstract class ImageProvider {
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(ImageProvider::class.java)
+        private val LOG_TAG = LogUtils.createTag<ImageProvider>()
     }
 }
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
index 183d16391..13a093ae2 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
@@ -335,7 +335,7 @@ class MediaStoreImageProvider : ImageProvider() {
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(MediaStoreImageProvider::class.java)
+        private val LOG_TAG = LogUtils.createTag<MediaStoreImageProvider>()
 
         private val IMAGE_CONTENT_URI = MediaStore.Images.Media.EXTERNAL_CONTENT_URI
         private val VIDEO_CONTENT_URI = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/BitmapUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/BitmapUtils.kt
index 2f71186ee..0e90819c0 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/BitmapUtils.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/BitmapUtils.kt
@@ -9,7 +9,7 @@ import deckers.thibault.aves.metadata.Metadata.getExifCode
 import java.io.ByteArrayOutputStream
 
 object BitmapUtils {
-    private val LOG_TAG = LogUtils.createTag(BitmapUtils::class.java)
+    private val LOG_TAG = LogUtils.createTag<BitmapUtils>()
 
     fun Bitmap.getBytes(canHaveAlpha: Boolean = false, quality: Int = 100, recycle: Boolean = true): ByteArray? {
         try {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/LogUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/LogUtils.kt
index c2e60a019..eb4d5bd93 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/LogUtils.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/LogUtils.kt
@@ -3,16 +3,17 @@ package deckers.thibault.aves.utils
 import java.util.regex.Pattern
 
 object LogUtils {
-    private const val LOG_TAG_MAX_LENGTH = 23
-    private val LOG_TAG_PACKAGE_PATTERN = Pattern.compile("(\\w)(\\w*)\\.")
+    const val LOG_TAG_MAX_LENGTH = 23
+    val LOG_TAG_PACKAGE_PATTERN: Pattern = Pattern.compile("(\\w)(\\w*)\\.")
 
     // create an Android logger friendly log tag for the specified class
-    fun createTag(clazz: Class<*>): String {
+    inline fun <reified T> createTag(): String {
+        val kClass = T::class
         // shorten class name to "a.b.CccDdd"
-        var logTag = LOG_TAG_PACKAGE_PATTERN.matcher(clazz.name).replaceAll("$1.")
+        var logTag = LOG_TAG_PACKAGE_PATTERN.matcher(kClass.qualifiedName!!).replaceAll("$1.")
         if (logTag.length > LOG_TAG_MAX_LENGTH) {
             // shorten class name to "a.b.CD"
-            val simpleName = clazz.simpleName
+            val simpleName = kClass.simpleName!!
             val shortSimpleName = simpleName.replace("[a-z]".toRegex(), "")
             logTag = logTag.replace(simpleName, shortSimpleName)
             if (logTag.length > LOG_TAG_MAX_LENGTH) {
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 13472aeae..7f55c79af 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
@@ -16,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap
 import kotlin.collections.ArrayList
 
 object PermissionManager {
-    private val LOG_TAG = LogUtils.createTag(PermissionManager::class.java)
+    private val LOG_TAG = LogUtils.createTag<PermissionManager>()
 
     const val VOLUME_ACCESS_REQUEST_CODE = 1
 
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 6651f784f..88a0627d9 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
@@ -23,7 +23,7 @@ import java.util.*
 import java.util.regex.Pattern
 
 object StorageUtils {
-    private val LOG_TAG = LogUtils.createTag(StorageUtils::class.java)
+    private val LOG_TAG = LogUtils.createTag<StorageUtils>()
 
     /**
      * Volume paths
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/UriUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/UriUtils.kt
index 6ac38aeb6..9e109272d 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/UriUtils.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/UriUtils.kt
@@ -5,7 +5,7 @@ import android.net.Uri
 import android.util.Log
 
 object UriUtils {
-    private val LOG_TAG = LogUtils.createTag(UriUtils::class.java)
+    private val LOG_TAG = LogUtils.createTag<UriUtils>()
 
     fun Uri.tryParseId(): Long? {
         try {