use absolute import path for IdTuple in Kotlin ipc

tutao · Jan 2, 2025 · 1c86a22 · 1c86a22
1 parent 1b57416
commit 1c86a22
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 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
@@ -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/...ndroid/tutashared/src/main/java/de/tutao/tutashared/generated_ipc/LocalImportMailState.kt b/...ndroid/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
@@ -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
@@ -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) }
 	}