From c482dff17c44cfc0c59d0d303b9565051a2eec87 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Fri, 26 Jul 2024 03:09:03 +0200
Subject: [PATCH] refactor: Convert method bodies to single expression
functions
---
.../proxy/mutableTypes/MutableAnnotation.kt | 16 ++----
.../mutableTypes/MutableAnnotationElement.kt | 12 +---
.../util/proxy/mutableTypes/MutableClass.kt | 56 ++++++-------------
.../util/proxy/mutableTypes/MutableField.kt | 36 ++++--------
.../util/proxy/mutableTypes/MutableMethod.kt | 44 +++++----------
.../mutableTypes/MutableMethodParameter.kt | 24 +++-----
.../MutableAnnotationEncodedValue.kt | 12 +---
.../encodedValue/MutableArrayEncodedValue.kt | 12 ++--
.../MutableBooleanEncodedValue.kt | 8 +--
.../encodedValue/MutableByteEncodedValue.kt | 12 ++--
.../encodedValue/MutableCharEncodedValue.kt | 12 ++--
.../encodedValue/MutableDoubleEncodedValue.kt | 8 +--
.../encodedValue/MutableEnumEncodedValue.kt | 12 ++--
.../encodedValue/MutableFieldEncodedValue.kt | 16 ++----
.../encodedValue/MutableFloatEncodedValue.kt | 12 ++--
.../encodedValue/MutableIntEncodedValue.kt | 12 ++--
.../encodedValue/MutableLongEncodedValue.kt | 12 ++--
.../encodedValue/MutableMethodEncodedValue.kt | 8 +--
.../MutableMethodHandleEncodedValue.kt | 8 +--
.../MutableMethodTypeEncodedValue.kt | 8 +--
.../encodedValue/MutableNullEncodedValue.kt | 8 +--
.../encodedValue/MutableShortEncodedValue.kt | 12 ++--
.../encodedValue/MutableStringEncodedValue.kt | 8 +--
.../encodedValue/MutableTypeEncodedValue.kt | 12 ++--
24 files changed, 125 insertions(+), 255 deletions(-)
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
index e1040de..49769fe 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
@@ -9,21 +9,13 @@ class MutableAnnotation(annotation: Annotation) : BaseAnnotation() {
private val type = annotation.type
private val _elements by lazy { annotation.elements.map { element -> element.toMutable() }.toMutableSet() }
- override fun getType(): String {
- return type
- }
+ override fun getType(): String = type
- override fun getElements(): MutableSet<MutableAnnotationElement> {
- return _elements
- }
+ override fun getElements(): MutableSet<MutableAnnotationElement> = _elements
- override fun getVisibility(): Int {
- return visibility
- }
+ override fun getVisibility(): Int = visibility
companion object {
- fun Annotation.toMutable(): MutableAnnotation {
- return MutableAnnotation(this)
- }
+ fun Annotation.toMutable(): MutableAnnotation = MutableAnnotation(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt
index 5bb8bfc..11261f5 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt
@@ -18,17 +18,11 @@ class MutableAnnotationElement(annotationElement: AnnotationElement) : BaseAnnot
this.value = value
}
- override fun getName(): String {
- return name
- }
+ override fun getName(): String = name
- override fun getValue(): EncodedValue {
- return value
- }
+ override fun getValue(): EncodedValue = value
companion object {
- fun AnnotationElement.toMutable(): MutableAnnotationElement {
- return MutableAnnotationElement(this)
- }
+ fun AnnotationElement.toMutable(): MutableAnnotationElement = MutableAnnotationElement(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt
index af6066c..88b33e5 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt
@@ -8,7 +8,9 @@ import com.android.tools.smali.dexlib2.iface.ClassDef
import com.android.tools.smali.dexlib2.util.FieldUtil
import com.android.tools.smali.dexlib2.util.MethodUtil
-class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
+class MutableClass(classDef: ClassDef) :
+ BaseTypeReference(),
+ ClassDef {
// Class
private var type = classDef.type
private var sourceFile = classDef.sourceFile
@@ -46,57 +48,31 @@ class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
this.superclass = superclass
}
- override fun getType(): String {
- return type
- }
+ override fun getType(): String = type
- override fun getAccessFlags(): Int {
- return accessFlags
- }
+ override fun getAccessFlags(): Int = accessFlags
- override fun getSourceFile(): String? {
- return sourceFile
- }
+ override fun getSourceFile(): String? = sourceFile
- override fun getSuperclass(): String? {
- return superclass
- }
+ override fun getSuperclass(): String? = superclass
- override fun getInterfaces(): MutableList<String> {
- return _interfaces
- }
+ override fun getInterfaces(): MutableList<String> = _interfaces
- override fun getAnnotations(): MutableSet<MutableAnnotation> {
- return _annotations
- }
+ override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations
- override fun getStaticFields(): MutableSet<MutableField> {
- return _staticFields
- }
+ override fun getStaticFields(): MutableSet<MutableField> = _staticFields
- override fun getInstanceFields(): MutableSet<MutableField> {
- return _instanceFields
- }
+ override fun getInstanceFields(): MutableSet<MutableField> = _instanceFields
- override fun getFields(): MutableSet<MutableField> {
- return _fields
- }
+ override fun getFields(): MutableSet<MutableField> = _fields
- override fun getDirectMethods(): MutableSet<MutableMethod> {
- return _directMethods
- }
+ override fun getDirectMethods(): MutableSet<MutableMethod> = _directMethods
- override fun getVirtualMethods(): MutableSet<MutableMethod> {
- return _virtualMethods
- }
+ override fun getVirtualMethods(): MutableSet<MutableMethod> = _virtualMethods
- override fun getMethods(): MutableSet<MutableMethod> {
- return _methods
- }
+ override fun getMethods(): MutableSet<MutableMethod> = _methods
companion object {
- fun ClassDef.toMutable(): MutableClass {
- return MutableClass(this)
- }
+ fun ClassDef.toMutable(): MutableClass = MutableClass(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt
index 1c0dec3..456c9b9 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt
@@ -7,7 +7,9 @@ import com.android.tools.smali.dexlib2.HiddenApiRestriction
import com.android.tools.smali.dexlib2.base.reference.BaseFieldReference
import com.android.tools.smali.dexlib2.iface.Field
-class MutableField(field: Field) : Field, BaseFieldReference() {
+class MutableField(field: Field) :
+ BaseFieldReference(),
+ Field {
private var definingClass = field.definingClass
private var name = field.name
private var type = field.type
@@ -37,37 +39,21 @@ class MutableField(field: Field) : Field, BaseFieldReference() {
this.initialValue = initialValue
}
- override fun getDefiningClass(): String {
- return this.definingClass
- }
+ override fun getDefiningClass(): String = this.definingClass
- override fun getName(): String {
- return this.name
- }
+ override fun getName(): String = this.name
- override fun getType(): String {
- return this.type
- }
+ override fun getType(): String = this.type
- override fun getAnnotations(): MutableSet<MutableAnnotation> {
- return this._annotations
- }
+ override fun getAnnotations(): MutableSet<MutableAnnotation> = this._annotations
- override fun getAccessFlags(): Int {
- return this.accessFlags
- }
+ override fun getAccessFlags(): Int = this.accessFlags
- override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> {
- return this._hiddenApiRestrictions
- }
+ override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> = this._hiddenApiRestrictions
- override fun getInitialValue(): MutableEncodedValue? {
- return this.initialValue
- }
+ override fun getInitialValue(): MutableEncodedValue? = this.initialValue
companion object {
- fun Field.toMutable(): MutableField {
- return MutableField(this)
- }
+ fun Field.toMutable(): MutableField = MutableField(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt
index 5d29be7..5f0bb5b 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt
@@ -7,7 +7,9 @@ import com.android.tools.smali.dexlib2.base.reference.BaseMethodReference
import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
import com.android.tools.smali.dexlib2.iface.Method
-class MutableMethod(method: Method) : Method, BaseMethodReference() {
+class MutableMethod(method: Method) :
+ BaseMethodReference(),
+ Method {
private var definingClass = method.definingClass
private var name = method.name
private var accessFlags = method.accessFlags
@@ -36,45 +38,25 @@ class MutableMethod(method: Method) : Method, BaseMethodReference() {
this.returnType = returnType
}
- override fun getDefiningClass(): String {
- return definingClass
- }
+ override fun getDefiningClass(): String = definingClass
- override fun getName(): String {
- return name
- }
+ override fun getName(): String = name
- override fun getParameterTypes(): MutableList<CharSequence> {
- return _parameterTypes
- }
+ override fun getParameterTypes(): MutableList<CharSequence> = _parameterTypes
- override fun getReturnType(): String {
- return returnType
- }
+ override fun getReturnType(): String = returnType
- override fun getAnnotations(): MutableSet<MutableAnnotation> {
- return _annotations
- }
+ override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations
- override fun getAccessFlags(): Int {
- return accessFlags
- }
+ override fun getAccessFlags(): Int = accessFlags
- override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> {
- return _hiddenApiRestrictions
- }
+ override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> = _hiddenApiRestrictions
- override fun getParameters(): MutableList<MutableMethodParameter> {
- return _parameters
- }
+ override fun getParameters(): MutableList<MutableMethodParameter> = _parameters
- override fun getImplementation(): MutableMethodImplementation? {
- return _implementation
- }
+ override fun getImplementation(): MutableMethodImplementation? = _implementation
companion object {
- fun Method.toMutable(): MutableMethod {
- return MutableMethod(this)
- }
+ fun Method.toMutable(): MutableMethod = MutableMethod(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt
index bba8f37..5bc0caa 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt
@@ -5,7 +5,9 @@ import com.android.tools.smali.dexlib2.base.BaseMethodParameter
import com.android.tools.smali.dexlib2.iface.MethodParameter
// TODO: finish overriding all members if necessary
-class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, BaseMethodParameter() {
+class MutableMethodParameter(parameter: MethodParameter) :
+ BaseMethodParameter(),
+ MethodParameter {
private var type = parameter.type
private var name = parameter.name
private var signature = parameter.signature
@@ -13,25 +15,15 @@ class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, Base
parameter.annotations.map { annotation -> annotation.toMutable() }.toMutableSet()
}
- override fun getType(): String {
- return type
- }
+ override fun getType(): String = type
- override fun getName(): String? {
- return name
- }
+ override fun getName(): String? = name
- override fun getSignature(): String? {
- return signature
- }
+ override fun getSignature(): String? = signature
- override fun getAnnotations(): MutableSet<MutableAnnotation> {
- return _annotations
- }
+ override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations
companion object {
- fun MethodParameter.toMutable(): MutableMethodParameter {
- return MutableMethodParameter(this)
- }
+ fun MethodParameter.toMutable(): MutableMethodParameter = MutableMethodParameter(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt
index 1993115..cddf148 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt
@@ -14,21 +14,15 @@ class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedVal
annotationEncodedValue.elements.map { annotationElement -> annotationElement.toMutable() }.toMutableSet()
}
- override fun getType(): String {
- return this.type
- }
+ override fun getType(): String = this.type
fun setType(type: String) {
this.type = type
}
- override fun getElements(): MutableSet<out AnnotationElement> {
- return _elements
- }
+ override fun getElements(): MutableSet<out AnnotationElement> = _elements
companion object {
- fun AnnotationEncodedValue.toMutable(): MutableAnnotationEncodedValue {
- return MutableAnnotationEncodedValue(this)
- }
+ fun AnnotationEncodedValue.toMutable(): MutableAnnotationEncodedValue = MutableAnnotationEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt
index 06b6067..a4bb134 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt
@@ -5,18 +5,16 @@ import com.android.tools.smali.dexlib2.base.value.BaseArrayEncodedValue
import com.android.tools.smali.dexlib2.iface.value.ArrayEncodedValue
import com.android.tools.smali.dexlib2.iface.value.EncodedValue
-class MutableArrayEncodedValue(arrayEncodedValue: ArrayEncodedValue) : BaseArrayEncodedValue(), MutableEncodedValue {
+class MutableArrayEncodedValue(arrayEncodedValue: ArrayEncodedValue) :
+ BaseArrayEncodedValue(),
+ MutableEncodedValue {
private val _value by lazy {
arrayEncodedValue.value.map { encodedValue -> encodedValue.toMutable() }.toMutableList()
}
- override fun getValue(): MutableList<out EncodedValue> {
- return _value
- }
+ override fun getValue(): MutableList<out EncodedValue> = _value
companion object {
- fun ArrayEncodedValue.toMutable(): MutableArrayEncodedValue {
- return MutableArrayEncodedValue(this)
- }
+ fun ArrayEncodedValue.toMutable(): MutableArrayEncodedValue = MutableArrayEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt
index 282b24c..53bde5d 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt
@@ -8,17 +8,13 @@ class MutableBooleanEncodedValue(booleanEncodedValue: BooleanEncodedValue) :
MutableEncodedValue {
private var value = booleanEncodedValue.value
- override fun getValue(): Boolean {
- return this.value
- }
+ override fun getValue(): Boolean = this.value
fun setValue(value: Boolean) {
this.value = value
}
companion object {
- fun BooleanEncodedValue.toMutable(): MutableBooleanEncodedValue {
- return MutableBooleanEncodedValue(this)
- }
+ fun BooleanEncodedValue.toMutable(): MutableBooleanEncodedValue = MutableBooleanEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt
index cbb076a..b1d71ed 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
import com.android.tools.smali.dexlib2.base.value.BaseByteEncodedValue
import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue
-class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) : BaseByteEncodedValue(), MutableEncodedValue {
+class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) :
+ BaseByteEncodedValue(),
+ MutableEncodedValue {
private var value = byteEncodedValue.value
- override fun getValue(): Byte {
- return this.value
- }
+ override fun getValue(): Byte = this.value
fun setValue(value: Byte) {
this.value = value
}
companion object {
- fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
- return MutableByteEncodedValue(this)
- }
+ fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt
index 4070c46..d2fe8f7 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
import com.android.tools.smali.dexlib2.base.value.BaseCharEncodedValue
import com.android.tools.smali.dexlib2.iface.value.CharEncodedValue
-class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) : BaseCharEncodedValue(), MutableEncodedValue {
+class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) :
+ BaseCharEncodedValue(),
+ MutableEncodedValue {
private var value = charEncodedValue.value
- override fun getValue(): Char {
- return this.value
- }
+ override fun getValue(): Char = this.value
fun setValue(value: Char) {
this.value = value
}
companion object {
- fun CharEncodedValue.toMutable(): MutableCharEncodedValue {
- return MutableCharEncodedValue(this)
- }
+ fun CharEncodedValue.toMutable(): MutableCharEncodedValue = MutableCharEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt
index 7258c40..8358307 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt
@@ -8,17 +8,13 @@ class MutableDoubleEncodedValue(doubleEncodedValue: DoubleEncodedValue) :
MutableEncodedValue {
private var value = doubleEncodedValue.value
- override fun getValue(): Double {
- return this.value
- }
+ override fun getValue(): Double = this.value
fun setValue(value: Double) {
this.value = value
}
companion object {
- fun DoubleEncodedValue.toMutable(): MutableDoubleEncodedValue {
- return MutableDoubleEncodedValue(this)
- }
+ fun DoubleEncodedValue.toMutable(): MutableDoubleEncodedValue = MutableDoubleEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt
index 5b9fb74..27102ed 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt
@@ -4,20 +4,18 @@ import com.android.tools.smali.dexlib2.base.value.BaseEnumEncodedValue
import com.android.tools.smali.dexlib2.iface.reference.FieldReference
import com.android.tools.smali.dexlib2.iface.value.EnumEncodedValue
-class MutableEnumEncodedValue(enumEncodedValue: EnumEncodedValue) : BaseEnumEncodedValue(), MutableEncodedValue {
+class MutableEnumEncodedValue(enumEncodedValue: EnumEncodedValue) :
+ BaseEnumEncodedValue(),
+ MutableEncodedValue {
private var value = enumEncodedValue.value
- override fun getValue(): FieldReference {
- return this.value
- }
+ override fun getValue(): FieldReference = this.value
fun setValue(value: FieldReference) {
this.value = value
}
companion object {
- fun EnumEncodedValue.toMutable(): MutableEnumEncodedValue {
- return MutableEnumEncodedValue(this)
- }
+ fun EnumEncodedValue.toMutable(): MutableEnumEncodedValue = MutableEnumEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt
index 1a2d87c..ca20e71 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt
@@ -5,24 +5,20 @@ import com.android.tools.smali.dexlib2.base.value.BaseFieldEncodedValue
import com.android.tools.smali.dexlib2.iface.reference.FieldReference
import com.android.tools.smali.dexlib2.iface.value.FieldEncodedValue
-class MutableFieldEncodedValue(fieldEncodedValue: FieldEncodedValue) : BaseFieldEncodedValue(), MutableEncodedValue {
+class MutableFieldEncodedValue(fieldEncodedValue: FieldEncodedValue) :
+ BaseFieldEncodedValue(),
+ MutableEncodedValue {
private var value = fieldEncodedValue.value
- override fun getValueType(): Int {
- return ValueType.FIELD
- }
+ override fun getValueType(): Int = ValueType.FIELD
- override fun getValue(): FieldReference {
- return this.value
- }
+ override fun getValue(): FieldReference = this.value
fun setValue(value: FieldReference) {
this.value = value
}
companion object {
- fun FieldEncodedValue.toMutable(): MutableFieldEncodedValue {
- return MutableFieldEncodedValue(this)
- }
+ fun FieldEncodedValue.toMutable(): MutableFieldEncodedValue = MutableFieldEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt
index f3a914a..e3c0aa4 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
import com.android.tools.smali.dexlib2.base.value.BaseFloatEncodedValue
import com.android.tools.smali.dexlib2.iface.value.FloatEncodedValue
-class MutableFloatEncodedValue(floatEncodedValue: FloatEncodedValue) : BaseFloatEncodedValue(), MutableEncodedValue {
+class MutableFloatEncodedValue(floatEncodedValue: FloatEncodedValue) :
+ BaseFloatEncodedValue(),
+ MutableEncodedValue {
private var value = floatEncodedValue.value
- override fun getValue(): Float {
- return this.value
- }
+ override fun getValue(): Float = this.value
fun setValue(value: Float) {
this.value = value
}
companion object {
- fun FloatEncodedValue.toMutable(): MutableFloatEncodedValue {
- return MutableFloatEncodedValue(this)
- }
+ fun FloatEncodedValue.toMutable(): MutableFloatEncodedValue = MutableFloatEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt
index db06751..a648ea6 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
import com.android.tools.smali.dexlib2.base.value.BaseIntEncodedValue
import com.android.tools.smali.dexlib2.iface.value.IntEncodedValue
-class MutableIntEncodedValue(intEncodedValue: IntEncodedValue) : BaseIntEncodedValue(), MutableEncodedValue {
+class MutableIntEncodedValue(intEncodedValue: IntEncodedValue) :
+ BaseIntEncodedValue(),
+ MutableEncodedValue {
private var value = intEncodedValue.value
- override fun getValue(): Int {
- return this.value
- }
+ override fun getValue(): Int = this.value
fun setValue(value: Int) {
this.value = value
}
companion object {
- fun IntEncodedValue.toMutable(): MutableIntEncodedValue {
- return MutableIntEncodedValue(this)
- }
+ fun IntEncodedValue.toMutable(): MutableIntEncodedValue = MutableIntEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt
index cc4194b..eb409fd 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
import com.android.tools.smali.dexlib2.base.value.BaseLongEncodedValue
import com.android.tools.smali.dexlib2.iface.value.LongEncodedValue
-class MutableLongEncodedValue(longEncodedValue: LongEncodedValue) : BaseLongEncodedValue(), MutableEncodedValue {
+class MutableLongEncodedValue(longEncodedValue: LongEncodedValue) :
+ BaseLongEncodedValue(),
+ MutableEncodedValue {
private var value = longEncodedValue.value
- override fun getValue(): Long {
- return this.value
- }
+ override fun getValue(): Long = this.value
fun setValue(value: Long) {
this.value = value
}
companion object {
- fun LongEncodedValue.toMutable(): MutableLongEncodedValue {
- return MutableLongEncodedValue(this)
- }
+ fun LongEncodedValue.toMutable(): MutableLongEncodedValue = MutableLongEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt
index 49f5ccc..c1fbd27 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt
@@ -9,17 +9,13 @@ class MutableMethodEncodedValue(methodEncodedValue: MethodEncodedValue) :
MutableEncodedValue {
private var value = methodEncodedValue.value
- override fun getValue(): MethodReference {
- return this.value
- }
+ override fun getValue(): MethodReference = this.value
fun setValue(value: MethodReference) {
this.value = value
}
companion object {
- fun MethodEncodedValue.toMutable(): MutableMethodEncodedValue {
- return MutableMethodEncodedValue(this)
- }
+ fun MethodEncodedValue.toMutable(): MutableMethodEncodedValue = MutableMethodEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt
index aa93bda..b982f8c 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt
@@ -9,17 +9,13 @@ class MutableMethodHandleEncodedValue(methodHandleEncodedValue: MethodHandleEnco
MutableEncodedValue {
private var value = methodHandleEncodedValue.value
- override fun getValue(): MethodHandleReference {
- return this.value
- }
+ override fun getValue(): MethodHandleReference = this.value
fun setValue(value: MethodHandleReference) {
this.value = value
}
companion object {
- fun MethodHandleEncodedValue.toMutable(): MutableMethodHandleEncodedValue {
- return MutableMethodHandleEncodedValue(this)
- }
+ fun MethodHandleEncodedValue.toMutable(): MutableMethodHandleEncodedValue = MutableMethodHandleEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt
index 2d67f5f..9d2f0d6 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt
@@ -9,17 +9,13 @@ class MutableMethodTypeEncodedValue(methodTypeEncodedValue: MethodTypeEncodedVal
MutableEncodedValue {
private var value = methodTypeEncodedValue.value
- override fun getValue(): MethodProtoReference {
- return this.value
- }
+ override fun getValue(): MethodProtoReference = this.value
fun setValue(value: MethodProtoReference) {
this.value = value
}
companion object {
- fun MethodTypeEncodedValue.toMutable(): MutableMethodTypeEncodedValue {
- return MutableMethodTypeEncodedValue(this)
- }
+ fun MethodTypeEncodedValue.toMutable(): MutableMethodTypeEncodedValue = MutableMethodTypeEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt
index 4513ab6..28f0208 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt
@@ -3,10 +3,10 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
import com.android.tools.smali.dexlib2.base.value.BaseNullEncodedValue
import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue
-class MutableNullEncodedValue : BaseNullEncodedValue(), MutableEncodedValue {
+class MutableNullEncodedValue :
+ BaseNullEncodedValue(),
+ MutableEncodedValue {
companion object {
- fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
- return MutableByteEncodedValue(this)
- }
+ fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt
index 36a2465..f29d46a 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
import com.android.tools.smali.dexlib2.base.value.BaseShortEncodedValue
import com.android.tools.smali.dexlib2.iface.value.ShortEncodedValue
-class MutableShortEncodedValue(shortEncodedValue: ShortEncodedValue) : BaseShortEncodedValue(), MutableEncodedValue {
+class MutableShortEncodedValue(shortEncodedValue: ShortEncodedValue) :
+ BaseShortEncodedValue(),
+ MutableEncodedValue {
private var value = shortEncodedValue.value
- override fun getValue(): Short {
- return this.value
- }
+ override fun getValue(): Short = this.value
fun setValue(value: Short) {
this.value = value
}
companion object {
- fun ShortEncodedValue.toMutable(): MutableShortEncodedValue {
- return MutableShortEncodedValue(this)
- }
+ fun ShortEncodedValue.toMutable(): MutableShortEncodedValue = MutableShortEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt
index 290276d..ea59637 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt
@@ -9,17 +9,13 @@ class MutableStringEncodedValue(stringEncodedValue: StringEncodedValue) :
MutableEncodedValue {
private var value = stringEncodedValue.value
- override fun getValue(): String {
- return this.value
- }
+ override fun getValue(): String = this.value
fun setValue(value: String) {
this.value = value
}
companion object {
- fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
- return MutableByteEncodedValue(this)
- }
+ fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
}
}
diff --git a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt
index a3b27c7..3e3c9ff 100644
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
import com.android.tools.smali.dexlib2.base.value.BaseTypeEncodedValue
import com.android.tools.smali.dexlib2.iface.value.TypeEncodedValue
-class MutableTypeEncodedValue(typeEncodedValue: TypeEncodedValue) : BaseTypeEncodedValue(), MutableEncodedValue {
+class MutableTypeEncodedValue(typeEncodedValue: TypeEncodedValue) :
+ BaseTypeEncodedValue(),
+ MutableEncodedValue {
private var value = typeEncodedValue.value
- override fun getValue(): String {
- return this.value
- }
+ override fun getValue(): String = this.value
fun setValue(value: String) {
this.value = value
}
companion object {
- fun TypeEncodedValue.toMutable(): MutableTypeEncodedValue {
- return MutableTypeEncodedValue(this)
- }
+ fun TypeEncodedValue.toMutable(): MutableTypeEncodedValue = MutableTypeEncodedValue(this)
}
}