commit c29a5b7761623270a94edb88b9306be09784ad0e
parent e6f4a109dad8e7db0191f3faa99d686e56590477
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date:   Sat,  7 Oct 2023 19:05:37 +0200

fix(mapper): invalid class names

Diffstat:

Mmapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/BCryptClassMapper.kt | 3++-


Mmapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/DefaultMediaItemMapper.kt | 3++-


Mmapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/MediaQualityLevelProviderMapper.kt | 3++-


Mmapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/OperaPageViewControllerMapper.kt | 3++-


Mmapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlatformAnalyticsCreatorMapper.kt | 3++-


Mmapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlusSubscriptionMapper.kt | 3++-


Mmapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScCameraSettingsMapper.kt | 3++-


Mmapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/StoryBoostStateMapper.kt | 3++-


8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/BCryptClassMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/BCryptClassMapper.kt
@@ -2,6 +2,7 @@ package me.rhunk.snapenhance.mapper.impl
 
 import me.rhunk.snapenhance.mapper.AbstractClassMapper
 import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.getClassName
 import me.rhunk.snapenhance.mapper.ext.getStaticConstructor
 import me.rhunk.snapenhance.mapper.ext.isFinal
 import org.jf.dexlib2.iface.instruction.formats.ArrayPayload
@@ -24,7 +25,7 @@ class BCryptClassMapper : AbstractClassMapper() {
                 }
 
                 context.addMapping("BCrypt",
-                    "class" to clazz.type.replace("L", "").replace(";", ""),
+                    "class" to clazz.getClassName(),
                     "hashMethod" to hashMethod.name
                 )
                 return
diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/DefaultMediaItemMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/DefaultMediaItemMapper.kt
@@ -2,6 +2,7 @@ package me.rhunk.snapenhance.mapper.impl
 
 import me.rhunk.snapenhance.mapper.AbstractClassMapper
 import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.getClassName
 import me.rhunk.snapenhance.mapper.ext.isAbstract
 
 class DefaultMediaItemMapper : AbstractClassMapper() {
@@ -15,7 +16,7 @@ class DefaultMediaItemMapper : AbstractClassMapper() {
             val constructorParameters = clazz.directMethods.firstOrNull { it.name == "<init>" }?.parameterTypes ?: continue
             if (constructorParameters.size < 6 || constructorParameters[5] != "J") continue
 
-            context.addMapping("DefaultMediaItem", clazz.type.replace("L", "").replace(";", ""))
+            context.addMapping("DefaultMediaItem", clazz.getClassName())
             return
         }
     }
diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/MediaQualityLevelProviderMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/MediaQualityLevelProviderMapper.kt
@@ -2,6 +2,7 @@ package me.rhunk.snapenhance.mapper.impl
 
 import me.rhunk.snapenhance.mapper.AbstractClassMapper
 import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.getClassName
 import me.rhunk.snapenhance.mapper.ext.isAbstract
 import org.jf.dexlib2.AccessFlags
 
@@ -15,7 +16,7 @@ class MediaQualityLevelProviderMapper : AbstractClassMapper(EnumMapper::class) {
 
             clazz.methods.firstOrNull { it.returnType == "L$mediaQualityLevelClass;" }?.let {
                 context.addMapping("MediaQualityLevelProvider",
-                    "class" to clazz.type.replace("L", "").replace(";", ""),
+                    "class" to clazz.getClassName(),
                     "method" to it.name
                 )
                 return
diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/OperaPageViewControllerMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/OperaPageViewControllerMapper.kt
@@ -2,6 +2,7 @@ package me.rhunk.snapenhance.mapper.impl
 
 import me.rhunk.snapenhance.mapper.AbstractClassMapper
 import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.getClassName
 import me.rhunk.snapenhance.mapper.ext.hasConstructorString
 import me.rhunk.snapenhance.mapper.ext.hasStaticConstructorString
 import me.rhunk.snapenhance.mapper.ext.isAbstract
@@ -39,7 +40,7 @@ class OperaPageViewControllerMapper : AbstractClassMapper() {
             }
 
             context.addMapping("OperaPageViewController",
-                "class" to clazz.type.replace("L", "").replace(";", ""),
+                "class" to clazz.getClassName(),
                 "viewStateField" to viewStateField.name,
                 "layerListField" to layerListField.name,
                 "onDisplayStateChange" to onDisplayStateChange.name,
diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlatformAnalyticsCreatorMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlatformAnalyticsCreatorMapper.kt
@@ -3,6 +3,7 @@ package me.rhunk.snapenhance.mapper.impl
 import me.rhunk.snapenhance.mapper.AbstractClassMapper
 import me.rhunk.snapenhance.mapper.MapperContext
 import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getClassName
 import me.rhunk.snapenhance.mapper.ext.getStaticConstructor
 import me.rhunk.snapenhance.mapper.ext.isEnum
 
@@ -17,7 +18,7 @@ class PlatformAnalyticsCreatorMapper : AbstractClassMapper() {
             if (!firstParameterClass.isEnum()) continue
             if (firstParameterClass.getStaticConstructor()?.implementation?.findConstString("IN_APP_NOTIFICATION") != true) continue
 
-            context.addMapping("PlatformAnalyticsCreator", clazz.type.replace("L", "").replace(";", ""))
+            context.addMapping("PlatformAnalyticsCreator", clazz.getClassName())
             return
         }
     }
diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlusSubscriptionMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlusSubscriptionMapper.kt
@@ -3,6 +3,7 @@ package me.rhunk.snapenhance.mapper.impl
 import me.rhunk.snapenhance.mapper.AbstractClassMapper
 import me.rhunk.snapenhance.mapper.MapperContext
 import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getClassName
 
 class PlusSubscriptionMapper : AbstractClassMapper(){
     override fun run(context: MapperContext) {
@@ -20,7 +21,7 @@ class PlusSubscriptionMapper : AbstractClassMapper(){
             }
 
             if (isPlusSubscriptionInfoClass == true) {
-                context.addMapping("SubscriptionInfoClass", clazz.type.replace("L", "").replace(";", ""))
+                context.addMapping("SubscriptionInfoClass", clazz.getClassName())
                 return
             }
         }
diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScCameraSettingsMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScCameraSettingsMapper.kt
@@ -3,6 +3,7 @@ package me.rhunk.snapenhance.mapper.impl
 import me.rhunk.snapenhance.mapper.AbstractClassMapper
 import me.rhunk.snapenhance.mapper.MapperContext
 import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getClassName
 import me.rhunk.snapenhance.mapper.ext.getStaticConstructor
 import me.rhunk.snapenhance.mapper.ext.isEnum
 
@@ -14,7 +15,7 @@ class ScCameraSettingsMapper : AbstractClassMapper() {
             val firstParameter = context.getClass(firstConstructor.parameterTypes[0]) ?: continue
             if (!firstParameter.isEnum() || firstParameter.getStaticConstructor()?.implementation?.findConstString("CONTINUOUS_PICTURE") != true) continue
 
-            context.addMapping("ScCameraSettings", clazz.type.replace("L", "").replace(";", ""))
+            context.addMapping("ScCameraSettings", clazz.getClassName())
             return
         }
     }
diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/StoryBoostStateMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/StoryBoostStateMapper.kt
@@ -3,6 +3,7 @@ package me.rhunk.snapenhance.mapper.impl
 import me.rhunk.snapenhance.mapper.AbstractClassMapper
 import me.rhunk.snapenhance.mapper.MapperContext
 import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getClassName
 
 class StoryBoostStateMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
@@ -13,7 +14,7 @@ class StoryBoostStateMapper : AbstractClassMapper() {
 
             if (clazz.methods.firstOrNull { it.name == "toString" }?.implementation?.findConstString("StoryBoostState", contains = true) != true) continue
 
-            context.addMapping("StoryBoostStateClass", clazz.type.replace("L", "").replace(";", ""))
+            context.addMapping("StoryBoostStateClass", clazz.getClassName())
             return
         }
     }