From a67b03f1d1d9032f2adc5073c98df1503373a721 Mon Sep 17 00:00:00 2001
From: Evgenii Kozlov <ubuphobos@gmail.com>
Date: Fri, 8 Nov 2024 12:30:50 +0100
Subject: [PATCH] DROID-3053 Protocol | Enhancement | 0.37.0-alpha03 (#1785)

---
 gradle/libs.versions.toml                     |  2 +-
 .../middleware/mappers/ToCoreModelMappers.kt  | 11 +++++--
 protocol/src/main/proto/commands.proto        |  3 ++
 protocol/src/main/proto/models.proto          | 31 +++++++++++++------
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6e563c1c94..3b5d9b79bc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-middlewareVersion = "v0.37.0-alpha02"
+middlewareVersion = "v0.37.0-alpha03"
 kotlinVersion = '2.0.21'
 kspVersion = "2.0.21-1.0.25"
 
diff --git a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt
index 8e07df3fc4..f7489630f3 100644
--- a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt
+++ b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt
@@ -3,6 +3,7 @@ package com.anytypeio.anytype.middleware.mappers
 import anytype.ResponseEvent
 import anytype.Rpc
 import anytype.model.Account
+import anytype.model.Import
 import anytype.model.NameserviceNameType
 import anytype.model.ParticipantPermissions
 import anytype.model.Restrictions
@@ -895,11 +896,17 @@ fun MImportErrorCode.toCoreModel(): ImportErrorCode {
         MImportErrorCode.UNKNOWN_ERROR -> ImportErrorCode.UNKNOWN_ERROR
         MImportErrorCode.BAD_INPUT -> ImportErrorCode.BAD_INPUT
         MImportErrorCode.INTERNAL_ERROR -> ImportErrorCode.INTERNAL_ERROR
-        MImportErrorCode.NO_OBJECTS_TO_IMPORT -> ImportErrorCode.NO_OBJECTS_TO_IMPORT
         MImportErrorCode.IMPORT_IS_CANCELED -> ImportErrorCode.IMPORT_IS_CANCELED
-        MImportErrorCode.LIMIT_OF_ROWS_OR_RELATIONS_EXCEEDED -> ImportErrorCode.LIMIT_OF_ROWS_OR_RELATIONS_EXCEEDED
         MImportErrorCode.FILE_LOAD_ERROR -> ImportErrorCode.FILE_LOAD_ERROR
         MImportErrorCode.INSUFFICIENT_PERMISSIONS -> ImportErrorCode.INSUFFICIENT_PERMISSIONS
+        MImportErrorCode.NOTION_NO_OBJECTS_IN_INTEGRATION -> ImportErrorCode.UNKNOWN_ERROR
+        MImportErrorCode.NOTION_SERVER_IS_UNAVAILABLE -> ImportErrorCode.UNKNOWN_ERROR
+        MImportErrorCode.NOTION_RATE_LIMIT_EXCEEDED -> ImportErrorCode.UNKNOWN_ERROR
+        MImportErrorCode.FILE_IMPORT_NO_OBJECTS_IN_ZIP_ARCHIVE -> ImportErrorCode.UNKNOWN_ERROR
+        MImportErrorCode.FILE_IMPORT_NO_OBJECTS_IN_DIRECTORY -> ImportErrorCode.UNKNOWN_ERROR
+        MImportErrorCode.HTML_WRONG_HTML_STRUCTURE -> ImportErrorCode.UNKNOWN_ERROR
+        MImportErrorCode.PB_NOT_ANYBLOCK_FORMAT -> ImportErrorCode.UNKNOWN_ERROR
+        MImportErrorCode.CSV_LIMIT_OF_ROWS_OR_RELATIONS_EXCEEDED -> ImportErrorCode.UNKNOWN_ERROR
     }
 }
 //endregion
diff --git a/protocol/src/main/proto/commands.proto b/protocol/src/main/proto/commands.proto
index c0f9e1df5b..93ebadf894 100644
--- a/protocol/src/main/proto/commands.proto
+++ b/protocol/src/main/proto/commands.proto
@@ -3357,6 +3357,7 @@ message Rpc {
                 anytype.model.Block.Content.File.Style style = 5;
                 google.protobuf.Struct details = 7; // additional details for file object
                 anytype.model.ObjectOrigin origin = 8;
+                anytype.model.ImageKind imageKind = 9;
             }
 
             message Response {
@@ -3690,6 +3691,7 @@ message Rpc {
             message Request {
                 string pictureId = 1;
                 string spaceId = 2;
+                anytype.model.ImageKind imageKind = 3;
             }
 
             message Response {
@@ -5212,6 +5214,7 @@ message Rpc {
                 string url = 4;
                 string localPath = 5;
                 anytype.model.Block.Content.File.Type fileType = 6;
+                anytype.model.ImageKind imageKind = 7;
             }
 
             message Response {
diff --git a/protocol/src/main/proto/models.proto b/protocol/src/main/proto/models.proto
index e69d075989..c71f5c1b8d 100644
--- a/protocol/src/main/proto/models.proto
+++ b/protocol/src/main/proto/models.proto
@@ -1122,15 +1122,27 @@ message Import {
     }
 
     enum ErrorCode {
-        NULL = 0;
-        UNKNOWN_ERROR = 1;
-        BAD_INPUT = 2;
-        INTERNAL_ERROR = 3;
-        NO_OBJECTS_TO_IMPORT = 5;
-        IMPORT_IS_CANCELED = 6;
-        LIMIT_OF_ROWS_OR_RELATIONS_EXCEEDED = 7;
-        FILE_LOAD_ERROR = 8;
-        INSUFFICIENT_PERMISSIONS = 9;
+      NULL = 0;
+      UNKNOWN_ERROR = 1;
+      BAD_INPUT = 2;
+      INTERNAL_ERROR = 3;
+      FILE_LOAD_ERROR = 8;
+      IMPORT_IS_CANCELED = 6;
+
+      NOTION_NO_OBJECTS_IN_INTEGRATION= 5;
+      NOTION_SERVER_IS_UNAVAILABLE = 12;
+      NOTION_RATE_LIMIT_EXCEEDED= 13;
+
+      FILE_IMPORT_NO_OBJECTS_IN_ZIP_ARCHIVE = 14;
+      FILE_IMPORT_NO_OBJECTS_IN_DIRECTORY = 17;
+
+      HTML_WRONG_HTML_STRUCTURE = 10;
+
+      PB_NOT_ANYBLOCK_FORMAT = 11;
+
+      CSV_LIMIT_OF_ROWS_OR_RELATIONS_EXCEEDED = 7;
+
+      INSUFFICIENT_PERMISSIONS = 9;
     }
 }
 
@@ -1172,6 +1184,7 @@ enum ImageKind {
     Basic = 0;
     Cover = 1;
     Icon = 2;
+    AutomaticallyAdded = 3;
 }
 
 enum FileIndexingStatus {