#2664 Allow forward without any added text (#2667)

Ioan Moldovan · web-flow · commit 204da99b0359 · 2025-06-12T22:28:11.000+03:00
* feat: allow forward without any added text

* feat: updated fastlane

* fix: stick to ruby 3.3.1

* fix: gem

* fix: prelaunch_simulator

* fix: build

* temp

* fix: build

* fix: build

* fix: build

* fix

* fix: pr reviews
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -33,7 +33,7 @@ blocks:
             - bundle exec fastlane test
             - git clone https://github.com/appium/WebDriverAgent.git
             - cd WebDriverAgent
-            - xcodebuild build-for-testing -project WebDriverAgent.xcodeproj -derivedDataPath /var/tmp/derived_data/WebDriverAgent -scheme WebDriverAgentRunner -destination "platform=iphonesimulator,OS=18.4,name=iPhone 16"
+            - xcodebuild build-for-testing -project WebDriverAgent.xcodeproj -derivedDataPath /var/tmp/derived_data/WebDriverAgent -scheme WebDriverAgentRunner -destination "platform=iphonesimulator,OS=18.5,name=iPhone 16"
       epilogue:
         always:
           commands:
diff --git a/FlowCrypt.xcodeproj/xcshareddata/xcschemes/Debug FlowCrypt.xcscheme b/FlowCrypt.xcodeproj/xcshareddata/xcschemes/Debug FlowCrypt.xcscheme
@@ -123,6 +123,11 @@
             value = "disable"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DYLD_FALLBACK_LIBRARY_PATH"
+            value = "/Library/Developer/CoreSimulator/Volumes/iOS_22F77/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 18.5.simruntime/Contents/Resources/RuntimeRoot/System/Cryptexes/OS/usr/lib/swift"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
       <LocationScenarioReference
          identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
diff --git a/FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCryptAppTests.xcscheme b/FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCryptAppTests.xcscheme
@@ -44,13 +44,29 @@
             ReferencedContainer = "container:FlowCrypt.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "DYLD_FALLBACK_LIBRARY_PATH"
+            value = "/Library/Developer/CoreSimulator/Volumes/iOS_22F77/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 18.5.simruntime/Contents/Resources/RuntimeRoot/System/Cryptexes/OS/usr/lib/swift"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Debug"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C132B9AF1EC2DBD800763715"
+            BuildableName = "FlowCrypt.app"
+            BlueprintName = "FlowCrypt"
+            ReferencedContainer = "container:FlowCrypt.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/FlowCrypt/Controllers/Compose/ComposeViewControllerInput.swift b/FlowCrypt/Controllers/Compose/ComposeViewControllerInput.swift
@@ -34,6 +34,11 @@ struct ComposeMessageInput: Equatable {
         case reply(MessageQuoteInfo)
         case forward(MessageQuoteInfo)
         case draft(MessageQuoteInfo)
+
+        var isForward: Bool {
+            if case .forward = self { return true }
+            return false
+        }
     }
 
     let type: InputType
@@ -69,6 +74,30 @@ struct ComposeMessageInput: Equatable {
     var attachments: [MessageAttachment] {
         type.info?.attachments ?? []
     }
+    
+    var quotedText: String {
+        guard let info = self.type.info else { return "" }
+
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateStyle = .medium
+        dateFormatter.timeStyle = .none
+
+        let date = dateFormatter.string(from: info.sentDate)
+
+        dateFormatter.dateStyle = .none
+        dateFormatter.timeStyle = .short
+        let time = dateFormatter.string(from: info.sentDate)
+
+        let from = info.sender?.formatted ?? "unknown sender"
+
+        let text = "\n\n"
+            + "compose_quote_from".localizeWithArguments(date, time, from)
+            + "\n"
+
+        let message = " > " + info.text.replacingOccurrences(of: "\n", with: "\n > ")
+
+        return text + message
+    }
 }
 
 extension ComposeMessageInput {
diff --git a/FlowCrypt/Controllers/Compose/ComposeViewDecorator.swift b/FlowCrypt/Controllers/Compose/ComposeViewDecorator.swift
@@ -104,30 +104,6 @@ struct ComposeViewDecorator {
         text.attributed(.regular(17))
     }
 
-    func styledQuote(with input: ComposeMessageInput) -> NSAttributedString {
-        guard let info = input.type.info else { return NSAttributedString(string: "") }
-
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateStyle = .medium
-        dateFormatter.timeStyle = .none
-
-        let date = dateFormatter.string(from: info.sentDate)
-
-        dateFormatter.dateStyle = .none
-        dateFormatter.timeStyle = .short
-        let time = dateFormatter.string(from: info.sentDate)
-
-        let from = info.sender?.formatted ?? "unknown sender"
-
-        let text = "\n\n"
-            + "compose_quote_from".localizeWithArguments(date, time, from)
-            + "\n"
-
-        let message = " > " + info.text.replacingOccurrences(of: "\n", with: "\n > ")
-
-        return (text + message).attributed(.regular(17))
-    }
-
     func styledEmptyMessagePasswordInput() -> MessageActionCellNode.Input {
         messageActionInput(
             text: "compose_password_placeholder".localized,
diff --git a/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift b/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
@@ -153,7 +153,7 @@ extension ComposeViewController {
 
     func setupTextNode() {
         let attributedString = decorator.styledMessage(with: contextToSend.message ?? "")
-        let styledQuote = decorator.styledQuote(with: input)
+        let styledQuote = input.quotedText.attributed(.regular(17))
 
         let mutableString = NSMutableAttributedString(attributedString: attributedString)
         if input.isQuote, !mutableString.string.contains(styledQuote.string) {
diff --git a/FlowCrypt/Functionality/Services/Compose Message Helper/ComposeMessageHelper.swift b/FlowCrypt/Functionality/Services/Compose Message Helper/ComposeMessageHelper.swift
@@ -109,6 +109,7 @@ final class ComposeMessageHelper {
     ) async throws -> SendableMsg {
         let subject = contextToSend.subject ?? ""
 
+        var messageContent = contextToSend.message
         if shouldValidate {
             onStateChanged?(.validatingMessage)
 
@@ -131,10 +132,14 @@ final class ComposeMessageHelper {
                 throw MessageValidationError.emptySubject
             }
 
-            let hasText = contextToSend.message?.hasContent ?? false
+            // Allow message forward without any added text
+            if !(contextToSend.message?.hasContent ?? false) && input.type.isForward {
+                messageContent = input.quotedText
+            }
+            let hasText = messageContent?.hasContent ?? false
             let hasAttachments = !contextToSend.attachments.isEmpty
 
-            guard hasText || hasAttachments else {
+            guard hasText || input.type.isForward || hasAttachments else {
                 throw MessageValidationError.emptyMessage
             }
 
@@ -171,7 +176,7 @@ final class ComposeMessageHelper {
         let signingPrv = shouldSign ? try await prepareSigningKey(senderEmail: contextToSend.sender) : nil
 
         return SendableMsg(
-            text: contextToSend.message ?? "",
+            text: messageContent ?? "",
             html: nil,
             to: contextToSend.recipientEmails(type: .to),
             cc: contextToSend.recipientEmails(type: .cc),
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
-gem "fastlane", "2.227.2"
+# until fastlane supports ruby 3.4
+# https://github.com/fastlane/fastlane/issues/29183
 gem "abbrev"
 gem "mutex_m"
-gem "ostruct"
+gem "ostruct"
+
+gem "fastlane", "2.227.2"
diff --git a/appium/config/wdio.live.conf.ts b/appium/config/wdio.live.conf.ts
@@ -11,7 +11,7 @@ config.capabilities = [
     hostname: '127.0.0.1',
     'appium:automationName': 'XCUITest',
     'appium:deviceName': 'iPhone 16',
-    'appium:platformVersion': '18.2',
+    'appium:platformVersion': '18.5',
     'appium:app': join(process.cwd(), './FlowCrypt.app'),
   },
 ];
diff --git a/appium/config/wdio.mock.conf.ts b/appium/config/wdio.mock.conf.ts
@@ -21,7 +21,7 @@ config.capabilities = [
       args: ['--mock-fes-api', '--mock-attester-api', '--mock-gmail-api'],
     },
     'appium:deviceName': 'iPhone 16',
-    'appium:platformVersion': '18.2',
+    'appium:platformVersion': '18.5',
     'appium:orientation': 'PORTRAIT',
     'appium:app': join(process.cwd(), './FlowCrypt.app'),
     'appium:simulatorStartupTimeout': 600000,
diff --git a/appium/tests/specs/mock/composeEmail/CheckAttachmentAfterForward.spec.ts b/appium/tests/specs/mock/composeEmail/CheckAttachmentAfterForward.spec.ts
diff --git a/appium/tests/specs/mock/composeEmail/CheckForward.spec.ts b/appium/tests/specs/mock/composeEmail/CheckForward.spec.ts
@@ -0,0 +1,66 @@
+import { MockApi } from 'api-mocks/mock';
+import { MockApiConfig } from 'api-mocks/mock-config';
+import {
+  EmailScreen,
+  MailFolderScreen,
+  MenuBarScreen,
+  NewMessageScreen,
+  SetupKeyScreen,
+  SplashScreen,
+} from '../../../screenobjects/all-screens';
+
+describe('COMPOSE EMAIL: ', () => {
+  it('check forward', async () => {
+    const mockApi = new MockApi();
+    const subject = 'email with text attachment';
+    const subject2 = 'Test forward message with attached pub key';
+    const subject3 = 'Test 1';
+
+    mockApi.fesConfig = MockApiConfig.defaultEnterpriseFesConfiguration;
+    mockApi.ekmConfig = MockApiConfig.defaultEnterpriseEkmConfiguration;
+    mockApi.addGoogleAccount('e2e.enterprise.test@flowcrypt.com', {
+      messages: [subject, subject2, subject3],
+    });
+
+    await mockApi.withMockedApis(async () => {
+      await SplashScreen.mockLogin();
+      await SetupKeyScreen.setPassPhrase();
+      await MailFolderScreen.checkInboxScreen();
+      await MailFolderScreen.clickOnEmailBySubject(subject);
+
+      // check attachment after forward
+      await EmailScreen.clickMenuButton();
+      await EmailScreen.clickForwardButton();
+      await EmailScreen.checkAttachment('test.txt');
+      await EmailScreen.clickOnAttachmentCell();
+      await EmailScreen.checkAttachmentTextView('email with text attachment');
+
+      await NewMessageScreen.clickBackButton();
+      await NewMessageScreen.clickBackButton();
+      await EmailScreen.clickBackButton();
+      // check forward message with attached pub key
+      await MailFolderScreen.clickOnEmailBySubject(subject2);
+      await browser.pause(1000);
+      await EmailScreen.clickMenuButton();
+      await EmailScreen.clickForwardButton();
+      await NewMessageScreen.checkSubject(`Fwd: ${subject2}`);
+
+      // Check forward without any added text
+      await NewMessageScreen.clickBackButton();
+      await EmailScreen.clickBackButton();
+      await MailFolderScreen.clickOnEmailBySubject(subject3);
+      await EmailScreen.clickMenuButton();
+      await EmailScreen.clickForwardButton();
+      await NewMessageScreen.setAddRecipient('demo@flowcrypt.com');
+      // Check if no error messages are shown when there are no added text
+      await NewMessageScreen.clickSendButton();
+      await NewMessageScreen.clickSendPlainMessageButton();
+      await EmailScreen.clickBackButton();
+      // Check if sent email is displayed correctly
+      await MenuBarScreen.clickMenuBtn();
+      await MenuBarScreen.clickSentButton();
+      await MailFolderScreen.checkSentScreen();
+      await MailFolderScreen.clickOnEmailBySubject(`Fwd: ${subject3}`);
+    });
+  });
+});
diff --git a/appium/tests/specs/mock/composeEmail/CheckForwardMessageWithAttachedPubKey.spec.ts b/appium/tests/specs/mock/composeEmail/CheckForwardMessageWithAttachedPubKey.spec.ts
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -12,11 +12,11 @@ platform :ios do
     scan(
       project: "FlowCrypt.xcodeproj",
       scheme: "Debug FlowCrypt",
-      device: "iPhone 16 (18.2)",
+      device: "iPhone 16 (18.5)",
       derived_data_path: "/var/tmp/derived_data/FlowCrypt",
       skip_detect_devices: true,
       build_for_testing: true,
-      xcargs: "-skipPackagePluginValidation -skipMacroValidation",
+      xcargs: "-skipPackagePluginValidation -skipMacroValidation -allowProvisioningUpdates",
     )
   end
 
@@ -25,7 +25,7 @@ platform :ios do
     scan(
       project: "FlowCrypt.xcodeproj",
       scheme: "FlowCryptAppTests",
-      device: "iPhone 16 (18.2)",
+      device: "iPhone 16 (18.5)",
       test_without_building: true,
       derived_data_path: "/var/tmp/derived_data/FlowCrypt",
       xcargs: "-skipPackagePluginValidation -skipMacroValidation",
