From 1c86a22c92e20c0adb6b2c57cfbdb6a77013c11f Mon Sep 17 00:00:00 2001 From: sug Date: Thu, 2 Jan 2025 15:20:50 +0100 Subject: [PATCH] use absolute import path for IdTuple in Kotlin ipc --- .../main/java/de/tutao/tutashared/AndroidNativeCryptoFacade.kt | 2 +- .../de/tutao/tutashared/generated_ipc/LocalImportMailState.kt | 2 +- .../java/de/tutao/tutashared/generated_ipc/ResumableImport.kt | 2 +- packages/licc/lib/KotlinGenerator.ts | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app-android/tutashared/src/main/java/de/tutao/tutashared/AndroidNativeCryptoFacade.kt b/app-android/tutashared/src/main/java/de/tutao/tutashared/AndroidNativeCryptoFacade.kt index 09b3ec39a7b9..e34d95df55cc 100644 --- a/app-android/tutashared/src/main/java/de/tutao/tutashared/AndroidNativeCryptoFacade.kt +++ b/app-android/tutashared/src/main/java/de/tutao/tutashared/AndroidNativeCryptoFacade.kt @@ -89,7 +89,7 @@ class AndroidNativeCryptoFacade( subkeys } else { if (keyLength == AesKeyLength.Aes256) { - throw java.lang.IllegalArgumentException("must use mac with AES-256") + throw IllegalArgumentException("must use mac with AES-256") } SubKeys( cKey = key, diff --git a/app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/LocalImportMailState.kt b/app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/LocalImportMailState.kt index 2c8b063f2c93..dc8babefb352 100644 --- a/app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/LocalImportMailState.kt +++ b/app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/LocalImportMailState.kt @@ -12,7 +12,7 @@ import kotlinx.serialization.json.* */ @Serializable data class LocalImportMailState( - val remoteStateId: IdTuple, + val remoteStateId: de.tutao.tutashared.IdTuple, val status: Int, val start_timestamp: Int, val totalMails: Int, diff --git a/app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/ResumableImport.kt b/app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/ResumableImport.kt index 88bcf37a6f4b..af3eefadb95a 100644 --- a/app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/ResumableImport.kt +++ b/app-android/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/ResumableImport.kt @@ -12,6 +12,6 @@ import kotlinx.serialization.json.* */ @Serializable data class ResumableImport( - val remoteStateId: IdTuple, + val remoteStateId: de.tutao.tutashared.IdTuple, val remainingEmlCount: Int, ) diff --git a/packages/licc/lib/KotlinGenerator.ts b/packages/licc/lib/KotlinGenerator.ts index 6d1ab459ba0c..613999b7c4a1 100644 --- a/packages/licc/lib/KotlinGenerator.ts +++ b/packages/licc/lib/KotlinGenerator.ts @@ -280,6 +280,8 @@ function renderKotlinType(parsed: ParsedType): RenderedType { return { externals: [], name: maybeNullable("DataWrapper", nullable) } case "void": return { externals: [], name: maybeNullable("Unit", nullable) } + case "IdTuple": + return { externals: [], name: maybeNullable("de.tutao.tutashared.IdTuple", nullable) } default: return { externals: [baseName], name: maybeNullable(baseName, nullable) } }