STDEV-13280

.editorconfig

@@ -2,7 +2,8 @@
 # Если установлена в true, парсер не будет искать другие конфиги родительских папках
 root = true
 
-[*.{kt, kts}]
+# noinspection EditorConfigKeyCorrectness
+[*.{kt,kts}]
 # possible values: number (e.g. 2), "unset" (makes ktlint ignore indentation completely)
 indent_size = 4
 
@@ -16,4 +17,17 @@ trim_trailing_whitespace = true
 # it's automatically set to 100 on `ktlint --android ...` (per Android Kotlin Style Guide)
 max_line_length = off
 
-disabled_rules = no-wildcard-imports
+ktlint_standard_package-name = disabled
+ktlint_standard_import-ordering = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_annotation = disabled
+ktlint_standard_function-type-modifier-spacing = disabled
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_parameter-list-wrapping = disabled
+ktlint_standard_chain-method-continuation = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_class-signature = disabled
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 8

.gitignore

@@ -7,4 +7,4 @@ codeiris
 /captures
 /.idea
 */build
-projectFilesBackup/
+projectFilesBackup/

build.gradle

@@ -6,19 +6,21 @@ apply plugin: 'maven-publish'
 apply plugin: 'org.jetbrains.dokka'
 
 android {
-    def version = 35
+    namespace = "ru.evotor.integrations"
+    def version = 39
 
-    compileSdk 29
+    compileSdk 30
 
     defaultConfig {
         minSdkVersion 23
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode version
-        versionName "0.6.08"
+        versionName "v0.6.27.1"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         resValue "integer", "versionCodeIntegrationLibrary", "$version"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -29,8 +31,11 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
+    }
+    buildFeatures {
+        aidl = true
     }
 }
 
@@ -41,7 +46,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     api 'com.github.evotor:push-notifications:v0.2.1'
-    api 'com.github.evotor:query-api:1.0.0'
+    api 'com.github.evotor:query-api:1.2.0'
 
     implementation 'com.google.code.gson:gson:2.8.9'
 
@@ -54,13 +59,13 @@ repositories {
 }
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.22'
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.21"
     }
@@ -97,7 +102,7 @@ dokkaHtml.configure {
 }
 
 task sourceJar(type: Jar) {
-    classifier "sources"
+    archiveClassifier = "sources"
     from android.sourceSets.main.java.srcDirs
 }
 
@@ -107,6 +112,12 @@ task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
     from dokkaJavadoc.outputDirectory
 }
 
+tasks.configureEach {
+    if (it.name.startsWith("publish")) {
+        dependsOn(tasks.named("bundleReleaseAar"))
+    }
+}
+
 publishing {
     publications {
         mavenKotlin(MavenPublication) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Sep 09 13:53:43 MSK 2022
+#Fri Jun 06 16:11:07 NOVT 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

src/main/aidl/ru/evotor/devices/commons/printer/PrinterDocument.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.printer;
 
-parcelable PrinterDocument;
+parcelable PrinterDocument;

src/main/aidl/ru/evotor/devices/commons/result/ResultBoolean.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.result;
 
-parcelable ResultBoolean;
+parcelable ResultBoolean;

src/main/aidl/ru/evotor/devices/commons/result/ResultDouble.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.result;
 
-parcelable ResultDouble;
+parcelable ResultDouble;

src/main/aidl/ru/evotor/devices/commons/result/ResultInt.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.result;
 
-parcelable ResultInt;
+parcelable ResultInt;

src/main/aidl/ru/evotor/devices/commons/result/ResultIntArray.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.result;
 
-parcelable ResultIntArray;
+parcelable ResultIntArray;

src/main/aidl/ru/evotor/devices/commons/result/ResultLong.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.result;
 
-parcelable ResultLong;
+parcelable ResultLong;

src/main/aidl/ru/evotor/devices/commons/result/ResultString.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.result;
 
-parcelable ResultString;
+parcelable ResultString;

src/main/aidl/ru/evotor/devices/commons/result/ResultVoid.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.result;
 
-parcelable ResultVoid;
+parcelable ResultVoid;

src/main/aidl/ru/evotor/devices/commons/result/ResultWeight.aidl

@@ -1,3 +1,3 @@
 package ru.evotor.devices.commons.result;
 
-parcelable ResultWeight;
+parcelable ResultWeight;

src/main/aidl/ru/evotor/framework/core/IIntegrationManagerResponse.aidl

@@ -4,4 +4,4 @@ import android.os.Bundle;
 oneway interface IIntegrationManagerResponse {
     void onResult(in Bundle value);
     void onError(int errorCode, String errorMessage, in Bundle data);
-}
+}

src/main/java/ru/evotor/Bundles.kt

@@ -0,0 +1,11 @@
+package ru.evotor
+
+import android.os.Bundle
+
+fun Bundle?.sanitizeInput(): Bundle? {
+    return this
+}
+
+fun Bundle?.sanitizeOutput(): Bundle? {
+    return this
+}

src/main/java/ru/evotor/IBundlable.kt

@@ -2,7 +2,6 @@ package ru.evotor
 
 import android.os.Bundle
 
-
 interface IBundlable {
     fun toBundle(): Bundle
-}
+}

src/main/java/ru/evotor/Parcelables.kt

@@ -0,0 +1,36 @@
+package ru.evotor
+
+import android.os.Parcel
+import android.os.Parcelable
+
+inline fun <reified T : Parcelable> Parcel.readParcelable(): T? {
+    return readParcelable(this, T::class.java)
+}
+
+fun <T : Parcelable> readParcelable(parcel: Parcel, clazzT: Class<T>): T? {
+    val dataPosition = parcel.dataPosition()
+    return try {
+        parcel.readParcelable(clazzT.classLoader)
+    } catch (t: Throwable) {
+        parcel.setDataPosition(dataPosition)
+        parcel.readValue(clazzT.classLoader) as? T
+    }
+}
+
+fun Parcel.writeAliased(p: Parcelable?, flags: Int) {
+    writeParcelable(p, flags)
+}
+
+fun <T : Parcelable> Parcel.readAliased(creator: Parcelable.Creator<T?>): T? {
+    val ignoredClass = readString() ?: return null
+    println("read class $ignoredClass, but ignore this and read with $creator")
+    return creator.createFromParcel(this)
+}
+
+fun <T : Parcelable> Parcel.writeAliasedArray(value: Array<T>?, flags: Int) {
+    writeParcelableArray(value, flags)
+}
+
+fun Parcel.readParcelableArray(clazz: Class<out Parcelable>): Array<Parcelable?>? {
+    return readParcelableArray(clazz.classLoader)
+}

src/main/java/ru/evotor/UuidValidationUtils.kt

@@ -3,7 +3,6 @@ package ru.evotor
 import java.util.regex.Pattern
 
 object UuidValidationUtils {
-
     private val UUID_REGEX: Pattern = Pattern.compile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
 
     @JvmStatic
@@ -15,5 +14,5 @@ object UuidValidationUtils {
     }
 }
 
-class IncorrectUuidException(value: String?)
-    : IllegalArgumentException("Invalid UUID String $value : UUID has to be represented by standard 36-char representation")
+class IncorrectUuidException(value: String?) :
+    IllegalArgumentException("Invalid UUID String $value : UUID has to be represented by standard 36-char representation")

src/main/java/ru/evotor/devices/commons/Constants.java

@@ -1,5 +1,6 @@
 package ru.evotor.devices.commons;
 
+
 public final class Constants {
 
     public static final String ACTION_DEVICE_LIST_CHANGED = "ru.evotor.devices.DeviceConfigChanged";

src/main/java/ru/evotor/devices/commons/DeviceServiceConnector.java

@@ -1,10 +1,9 @@
 package ru.evotor.devices.commons;
 
+
 import android.content.Context;
 import android.os.DeadObjectException;
 
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import ru.evotor.devices.commons.exception.DeviceServiceException;
 import ru.evotor.devices.commons.exception.DeviceServiceOperationOnMainThreadException;
 import ru.evotor.devices.commons.exception.DeviceServiceRuntimeException;
@@ -14,6 +13,8 @@
 import ru.evotor.devices.commons.services.PrinterService;
 import ru.evotor.devices.commons.services.ScalesService;
 
+import java.util.concurrent.CopyOnWriteArrayList;
+
 /**
  * Класс, необходимый для инициализации встроенного или подключённого оборудования.
  */
@@ -40,6 +41,7 @@ public static CopyOnWriteArrayList<ConnectionWrapper> getConnectionWrappers() {
 
     /**
      * Получает событие о подключении оборудования.
+     *
      * @param connectionWrapper интерфейс для выполнения дейтвий при подключении и отключении принтера и весов.
      */
     public static void addConnectionWrapper(ConnectionWrapper connectionWrapper) {
@@ -75,6 +77,7 @@ public static IScalesServiceWrapper getScalesService() throws ServiceNotConnecte
 
     /**
      * Инициализирует встроенное и подключённое оборудование
+     *
      * @param appContext контекст приложения.
      */
     public static void startInitConnections(final Context appContext) {
@@ -110,4 +113,4 @@ public static void processException(Exception exc) throws DeviceServiceException
         }
         exc.printStackTrace();
     }
-}
+}

src/main/java/ru/evotor/devices/commons/printer/PrinterDocument.java

@@ -3,6 +3,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import ru.evotor.ParcelablesKt;
 import ru.evotor.devices.commons.printer.printable.IPrintable;
 
 /**
@@ -17,7 +18,7 @@ public PrinterDocument(IPrintable... printables) {
     }
 
     private PrinterDocument(Parcel parcel) {
-        Parcelable[] parcelables = (Parcelable[]) parcel.readParcelableArray(IPrintable.class.getClassLoader());
+        Parcelable[] parcelables = (Parcelable[]) ParcelablesKt.readParcelableArray(parcel, IPrintable.class);
         if (parcelables != null) {
             printables = new IPrintable[parcelables.length];
             for (int i = 0; i < printables.length; i++) {
@@ -39,7 +40,7 @@ public int describeContents() {
 
     @Override
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeParcelableArray(printables, 0);
+        ParcelablesKt.writeAliasedArray(parcel, printables, 0);
     }
 
     public static final Creator<PrinterDocument> CREATOR = new Creator<PrinterDocument>() {

src/main/java/ru/evotor/devices/commons/printer/printable/PrintableImage.java

@@ -3,6 +3,8 @@
 import android.graphics.Bitmap;
 import android.os.Parcel;
 
+import ru.evotor.ParcelablesKt;
+
 public class PrintableImage implements IPrintable {
 
     /**
@@ -15,7 +17,7 @@ public PrintableImage(Bitmap bitmap) {
     }
 
     private PrintableImage(Parcel parcel) {
-        bitmap = parcel.readParcelable(Bitmap.class.getClassLoader());
+        bitmap = ParcelablesKt.readAliased(parcel, Bitmap.CREATOR);
     }
 
     public Bitmap getBitmap() {
@@ -29,7 +31,7 @@ public int describeContents() {
 
     @Override
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeParcelable(bitmap, 0);
+        ParcelablesKt.writeAliased(parcel, bitmap, 0);
     }
 
     public static final Creator<PrintableImage> CREATOR = new Creator<PrintableImage>() {

src/main/java/ru/evotor/devices/commons/result/AbstractResult.java

@@ -18,4 +18,4 @@ protected void unpackException() throws DeviceServiceException {
 
     abstract ErrorDescription getErrorDescription();
 
-}
+}

src/main/java/ru/evotor/devices/commons/result/ErrorDescription.java

@@ -46,4 +46,4 @@ public void writeToParcel(Parcel parcel) {
         }
     }
 
-}
+}

src/main/java/ru/evotor/devices/commons/result/ErrorDescriptionPacker.java

@@ -97,4 +97,4 @@ public static AbstractErrorExtension createErrorExtension(int errorCode, Parcel
                 return null;
         }
     }
-}
+}