Dev infra

.github/shared/swift-common/action.yml

@@ -0,0 +1,39 @@
+name: "Swift Common"
+description: "Common Swift Checks"
+
+runs:
+  using: "composite"
+
+  steps:
+    - name: Setup Swift
+      uses: swift-actions/setup-swift@cdbe0f7f4c77929b6580e71983e8606e55ffe7e4 # v1.26.2
+      with:
+        swift-version: ${{ env.swift-version }}
+    - name: Install Homebrew
+      uses: Homebrew/actions/setup-homebrew@d54a6744d5fcdff54b45a9659f3e17f769389952
+    - name: Install Homebrew dependencies
+      shell: bash
+      run: |
+        brew install swiftlint swift-format xcodegen
+        brew upgrade rustup
+    - name: Versions
+      shell: bash
+      run: |
+        rustup --version
+        cargo --version
+        rustc --version
+    - name: Add rust target
+      shell: bash
+      run: rustup target add aarch64-apple-ios-sim
+    - name: Lint
+      working-directory: ./app-ios
+      shell: bash
+      run: ./lint.sh lint:check
+    - name: Format
+      working-directory: ./app-ios
+      shell: bash
+      run: ./lint.sh style:check
+    - name: Xcodegen sdk
+      working-directory: tuta-sdk/ios
+      shell: bash
+      run: xcodegen

.github/workflows/swift-calendar-test.yml

@@ -0,0 +1,57 @@
+name: Swift CI - Calendar
+
+on:
+  pull_request:
+    types: [ opened, synchronize, edited ]
+    paths:
+      - 'app-ios/**'
+      - '.github/workflows/swift-calendar-test.yml'
+  push:
+    branches:
+      - dev-*
+      - '*/dev'
+    paths:
+      - 'app-ios/**'
+
+env:
+  swift-version: "5.9.2"
+  swift-format-version: "509.0.0"
+
+jobs:
+  test-swift:
+    runs-on: macos-14
+
+    permissions:
+      actions: none
+      checks: none
+      contents: read
+      deployments: none
+      id-token: none
+      issues: none
+      discussions: none
+      packages: none
+      pages: none
+      pull-requests: none
+      repository-projects: none
+      security-events: none
+      statuses: none
+
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+        with:
+          submodules: 'true'
+      - uses: ./.github/shared/swift-common
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 #3.0.2
+        id: filter
+        with:
+          filters: |
+            calendar:
+              - 'app-ios/calendar/**'
+      - name: Test Calendar
+        working-directory: app-ios
+        if: ${{ steps.filter.outputs.calendar == 'true' }}
+        run: |
+          mkdir -p ../build-calendar-app
+          xcodegen --spec calendar-project.yml
+          fastlane test_calendar_github
+

.github/workflows/swift-test.yml → .github/workflows/swift-mail-test.yml

@@ -1,11 +1,11 @@
-name: Swift CI
+name: Swift CI - Mail
 
 on:
   pull_request:
     types: [ opened, synchronize, edited ]
     paths:
       - 'app-ios/**'
-      - '.github/workflows/swift-test.yml'
+      - '.github/workflows/swift-mail-test.yml'
   push:
     branches:
       - dev-*
@@ -40,16 +40,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
         with:
           submodules: 'true'
-      - name: Setup Swift
-        uses: swift-actions/setup-swift@cdbe0f7f4c77929b6580e71983e8606e55ffe7e4 # v1.26.2
-        with:
-          swift-version: ${{ env.swift-version }}
-      - name: Install Homebrew
-        uses: Homebrew/actions/setup-homebrew@d54a6744d5fcdff54b45a9659f3e17f769389952
-      - name: Install Homebrew dependencies
-        run: |
-          brew install swiftlint swift-format xcodegen
-          brew upgrade rustup
+      - uses: ./.github/shared/swift-common
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 #3.0.2
         id: filter
         with:
@@ -58,29 +49,6 @@ jobs:
               - 'app-ios/tutanota/**'
             calendar:
               - 'app-ios/calendar/**'
-      - name: Versions
-        run: |
-          rustup --version
-          cargo --version
-          rustc --version
-      - name: Add rust target
-        run: rustup target add aarch64-apple-ios-sim
-      - name: Lint
-        working-directory: ./app-ios
-        run: ./lint.sh lint:check
-      - name: Format
-        working-directory: ./app-ios
-        run: ./lint.sh style:check
-      - name: Xcodegen sdk
-        working-directory: tuta-sdk/ios
-        run: xcodegen
-      - name: Test Calendar
-        working-directory: app-ios
-        if: ${{ steps.filter.outputs.calendar == 'true' }}
-        run: |
-          mkdir -p ../build-calendar-app
-          xcodegen --spec calendar-project.yml
-          fastlane test_calendar_github
       - name: Test Mail
         working-directory: app-ios
         if: ${{ steps.filter.outputs.calendar == 'false' || steps.filter.outputs.mail == 'true' }} # Runs mail test also as fallback test

packages/node-mimimi/src/importer.rs

@@ -148,8 +148,7 @@ pub enum ImportParams {
 /// keep in sync with TutanotaConstants.ts
 #[cfg_attr(feature = "javascript", napi_derive::napi)]
 #[cfg_attr(not(feature = "javascript"), derive(Clone))]
-#[derive(PartialEq, Default)]
-#[cfg_attr(test, derive(Debug))]
+#[derive(PartialEq, Default, Debug)]
 #[repr(u8)]
 pub enum ImportStatus {
 	#[default]
@@ -158,6 +157,7 @@ pub enum ImportStatus {
 	Canceled = 2,
 	Finished = 3,
 	Error = 4,
+	ServiceUnavailable = 5,
 }
 
 /// A running import can be stopped or paused
@@ -614,7 +614,8 @@ impl Importer {
 			local_state.current_status == ImportStatus::Finished
 				|| local_state.current_status == ImportStatus::Canceled
 				|| local_state.current_status == ImportStatus::Paused,
-			"only cancel and finished should be final state"
+			"only cancel and finished should be final state {:?}",
+			local_state.current_status
 		);
 
 		// we reached final state before making first call, was either empty mails or was cancelled before making first post call
@@ -741,6 +742,19 @@ impl Importer {
 			}
 		}
 
+		if import_progress_action == ImportProgressAction::Pause {
+			self.update_state(|mut state| state.change_status(ImportStatus::Paused))
+				.await;
+		} else if import_progress_action == ImportProgressAction::Stop {
+			self.update_state(|mut state| state.change_status(ImportStatus::Canceled))
+				.await;
+			Self::delete_import_dir(&self.import_directory)?;
+		}
+
+		let current_state = self.get_state(|state| state.clone()).await;
+		Importer::mark_remote_final_state(&self.essentials.logged_in_sdk, &current_state)
+			.await?;
+
 		Ok(())
 	}
 

packages/node-mimimi/src/importer_api.rs

@@ -150,9 +150,17 @@ impl ImporterApi {
 				Ok(_) => {},
 				Err(e) => {
 					log::error!("Importer task failed: {:?}", e);
-					inner
-						.update_state(|mut state| state.change_status(ImportStatus::Error))
-						.await;
+					if let ImportError::NoImportFeature = e {
+						inner
+							.update_state(|mut state| {
+								state.change_status(ImportStatus::ServiceUnavailable)
+							})
+							.await;
+					} else {
+						inner
+							.update_state(|mut state| state.change_status(ImportStatus::Error))
+							.await;
+					};
 				},
 			};
 		});
@@ -231,34 +239,18 @@ impl ImporterApi {
 
 		match locked_local_state {
 			Some(local_import_state) => {
-				let logged_in_sdk = ImporterApi::create_sdk(tuta_credentials).await?;
 				let mut local_import_state = local_import_state.lock().await;
 				local_import_state.import_progress_action = import_progress_action;
 
-				match import_progress_action {
-					ImportProgressAction::Continue => Ok(()),
-
-					ImportProgressAction::Pause => {
-						local_import_state.current_status = ImportStatus::Paused;
-						Importer::mark_remote_final_state(&logged_in_sdk, &local_import_state)
-							.await?;
-
-						Ok(())
-					},
-
-					ImportProgressAction::Stop => {
-						let previous_status = local_import_state.current_status;
-						local_import_state.current_status = ImportStatus::Canceled;
-						Importer::mark_remote_final_state(&logged_in_sdk, &local_import_state)
-							.await?;
-
-						if previous_status != ImportStatus::Running {
-							Importer::delete_import_dir(&import_directory_path)?;
-						}
-
-						Ok(())
-					},
-				}
+				if local_import_state.current_status != ImportStatus::Running
+					&& import_progress_action == ImportProgressAction::Stop
+				{
+					local_import_state.current_status = ImportStatus::Canceled;
+					Importer::delete_import_dir(&import_directory_path)?;
+					let logged_in_sdk = ImporterApi::create_sdk(tuta_credentials).await?;
+					Importer::mark_remote_final_state(&logged_in_sdk, &local_import_state).await?;
+				};
+				Ok(())
 			},
 
 			None => {

src/common/desktop/mailimport/DesktopMailImportFacade.ts

@@ -64,7 +64,7 @@ export class DesktopMailImportFacade implements NativeMailImportFacade {
 	}
 
 	async setProgressAction(mailboxId: string, apiUrl: string, unencTutaCredentials: UnencryptedCredentials, progressAction: number) {
-		return ImporterApi.setProgressAction(mailboxId, this.createTutaCredentials(unencTutaCredentials, apiUrl), progressAction, this.configDirectory)
+		return await ImporterApi.setProgressAction(mailboxId, this.createTutaCredentials(unencTutaCredentials, apiUrl), progressAction, this.configDirectory)
 	}
 
 	async getResumeableImport(mailboxId: string): Promise<ResumableImport> {
@@ -80,16 +80,7 @@ export class DesktopMailImportFacade implements NativeMailImportFacade {
 			listId: listIdPart(importStateId),
 			elementId: elementIdPart(importStateId),
 		}
-		const tutaCredentials: TutaCredentials = {
-			accessToken: unencTutaCredentials?.accessToken,
-			isInternalCredential: unencTutaCredentials.credentialInfo.type === CredentialType.Internal,
-			encryptedPassphraseKey: unencTutaCredentials.encryptedPassphraseKey ? Array.from(unencTutaCredentials.encryptedPassphraseKey) : [],
-			login: unencTutaCredentials.credentialInfo.login,
-			userId: unencTutaCredentials.credentialInfo.userId,
-			apiUrl: apiUrl,
-			clientVersion: env.versionNumber,
-		}
-
+		const tutaCredentials = this.createTutaCredentials(unencTutaCredentials, apiUrl)
 		await ImporterApi.resumeFileImport(mailboxId, tutaCredentials, importMailStateId, this.configDirectory)
 	}
 }