Merge pull request #215 from IBM/development

Version 3.2.0 Build 125
IBM · Jul 16, 2024 · 648fb69 · 648fb69
2 parents a8e87c8 + 464af25
commit 648fb69
Show file tree

Hide file tree

Showing 116 changed files with 470 additions and 364 deletions.
diff --git a/Notification Agent Alert Tests/NAATriggersTests.swift b/Notification Agent Alert Tests/NAATriggersTests.swift
@@ -3,7 +3,7 @@
 //  Notification Agent Alert Tests
 //
 //  Created by Simone Martorelli on 01/06/22.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Alerts/AppDelegate.swift b/Notification Agent Alerts/AppDelegate.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 18/06/2021.
-//  Copyright © 2021 IBM. All rights reserved
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Alerts/Extensions/NotificationDispatch-Extension.swift b/Notification Agent Alerts/Extensions/NotificationDispatch-Extension.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 5/27/21.
-//  Copyright © 2021 IBM. All rights reserved
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Alerts/Info.plist b/Notification Agent Alerts/Info.plist
@@ -32,7 +32,7 @@
 		<true/>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 IBM. All rights reserved.</string>
+	<string>© Copyright IBM Corp. 2021, 2024</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

diff --git a/Notification Agent Banner Tests/NABTriggersTests.swift b/Notification Agent Banner Tests/NABTriggersTests.swift
@@ -3,7 +3,7 @@
 //  Notification Agent Alert Tests
 //
 //  Created by Simone Martorelli on 01/06/22.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Banners/AppDelegate.swift b/Notification Agent Banners/AppDelegate.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Jan Valentik on 18/06/2021.
-//  Copyright © 2021 IBM. All rights reserved
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Banners/Extensions/NotificationDispatch-Extension.swift b/Notification Agent Banners/Extensions/NotificationDispatch-Extension.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 5/27/21.
-//  Copyright © 2021 IBM. All rights reserved
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Banners/Info.plist b/Notification Agent Banners/Info.plist
@@ -32,7 +32,7 @@
 		<true/>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 IBM. All rights reserved.</string>
+	<string>© Copyright IBM Corp. 2021, 2024</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

diff --git a/Notification Agent Core Tests/NACInteractiveEFCLControllerTests.swift b/Notification Agent Core Tests/NACInteractiveEFCLControllerTests.swift
@@ -3,7 +3,7 @@
 //  Notification Agent Core Tests
 //
 //  Created by Simone Martorelli on 27/05/22.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core Tests/NACTriggersTests.swift b/Notification Agent Core Tests/NACTriggersTests.swift
@@ -3,7 +3,7 @@
 //  Notification Agent Core Tests
 //
 //  Created by Simone Martorelli on 26/05/22.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core/AppDelegate.swift b/Notification Agent Core/AppDelegate.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Jan Valentik on 18/06/2021.
-//  Copyright © 2021 IBM. All rights reserved
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core/Controllers/Context.swift b/Notification Agent Core/Controllers/Context.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 31/03/2021.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core/Controllers/DeepLinkEngine.swift b/Notification Agent Core/Controllers/DeepLinkEngine.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 6/22/20.
-//  Copyright © 2021 IBM. All rights reserved
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core/Controllers/HelpBuilder.swift b/Notification Agent Core/Controllers/HelpBuilder.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 8/27/20.
-//  Copyright © 2021 IBM. All rights reserved
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 //  swiftlint:disable type_body_length file_length
@@ -20,8 +20,8 @@ public final class HelpBuilder {
                                            "-icon_height".yellow(),
                                            "-accessory_view_type".yellow(),
                                            "-accessory_view_payload".yellow(),
-                                           "-secondary_accessory_view_type".yellow(),
-                                           "-secondary_accessory_view_payload".yellow(),
+                                           "-accessory_view_type_N".yellow(),
+                                           "-accessory_view_payload_N".yellow(),
                                            "-main_button_label".yellow(),
                                            "-main_button_cta_type".yellow(),
                                            "-main_button_cta_payload".yellow(),
@@ -47,7 +47,9 @@ public final class HelpBuilder {
                                            "-background_panel".yellow(),
                                            "-unmovable".yellow(),
                                            "-disable_quit".yellow(),
-                                           "-custom_width".yellow()]
+                                           "-custom_width".yellow(),
+                                           "-buttonless".yellow(),
+                                           "-hide_title_bar".yellow()]
     static let bannerArguments: [String] = ["-type".green(),
                                             "-title".yellow(),
                                             "-subtitle".yellow(),
@@ -110,8 +112,8 @@ public final class HelpBuilder {
                                               "Example 3: -accessory_view_payload \"/percent indeterminate /top_message This is the top message /bottom_message This is the bottom message\";\n      " +
                                               "Example 4: -accessory_view_payload \"<h1>Hello, world!</h1>this is a line of text<br><br><code>this is a code block<br>this is the second line of a code block</code><br>this is <span style=\"color: #ff0000\">red</span> text\"\n      " +
                                               "Example 5: -accessory_view_payload \"/images /path/to/image.jpg\\nhttps://www.url.to/image.png\\nhttps://www.url.to/image.png /autoplay /delay 3\".",
-                                              "\n      Same as for accessory_view_type argument.",
-                                              "\n      Same as for accessory_view_payload argument.",
+                                              "\n      Same as for accessory_view_type argument. The tool support multiple accessory views on each pop-up;\n      Example 1: accessory_view_type_1 image;\n      Example 2: accessory_view_type_2 dropdown;",
+                                              "\n      Same as for accessory_view_payload argument. The tool support multiple accessory views on each pop-up;\n      Example 1: accessory_view_payload_1 \"path/or/URL/to/file\";\n      Example 2: accessory_view_payload_2 \"/list One\\nTwo\\nThree\";",
                                               "\n      The label of the main button.\n      Example: -main_button_label \"Main button title\"",
                                               "[ none | link ]".red() + "\n      The call to action type for the main button (default: none -> exit).\n      Example: -main_button_cta_type link",
                                               "\n      An URL if " + "[ link ]".red() + " cta type defined.\n      Example: -main_button_cta_payload \"URL\"",
@@ -138,7 +140,8 @@ public final class HelpBuilder {
                                               "\n      Flag that make the UI unmovable for the user.\n      Example: -unmovable",
                                               "\n      Flag that tells the agent to ignore cmd+q shortcut.\n      Example: -disable_quit",
                                               "\n      A custom width for the UI.\n      Example: -custom_width 1000",
-                                              "\n      Flag that tells the agent to not show any destructive CTA (Button).\n      Example: -buttonless"]
+                                              "\n      Flag that tells the agent to not show any destructive CTA (Button).\n      Example: -buttonless",
+                                              "\n      Flag that tells the agent to not show the title bar.\n      Example: -hide_title_bar"]
     static let bannerDescriptions: [String] = ["[ banner | alert ]".red() + "\n      The UI type of the notification.\n      Example: -type banner",
                                                "\n      The title of the notification.\n      Example: -title \"Title\"",
                                                "\n      The subtitle of the notification. It supports MarkDown text.\n      Example: -subtitle \"Subtitle\"",
@@ -177,7 +180,8 @@ public final class HelpBuilder {
                                                     "\n      Flag that tells the agent to show the suppression future notifications button on the UI. If checked by the user the agent will print \"suppressed\" in the output before exit.\n      Example: -showSuppressionButton"]
     static let popupSyntacticRules: [String] = ["At least one argument between" + " [ -title | -subtitle | -accessory_view_type + -accessory_view_payload ] ".red() + "must be defined to present a pop-up.",
                                                 "By default tertiary button is not destructive. Use " + "[ exitlink ]".red() + " cta type to trigger a link (optional) and make it destructive for the pop-up.",
-                                                "In general if a call to action type is defined for a button, must be defined also the related payload. Except for the cta types " + "[ none | exitlink ]".red() + "."]
+                                                "In general if a call to action type is defined for a button, must be defined also the related payload. Except for the cta types " + "[ none | exitlink ]".red() + ".",
+                                                "To setup multiple accessory views on the pop-up use \"-accessory_view_type_N\" and \"-accessory_view_payload_N\" where N is an integer number that goes from 1 to 100. Use only sequential integers (CORRECT: 1, 2 ,3, 4, ... | WRONG: 1, 3, 5, 6, ...)."]
     static let bannerSyntacticRules: [String] = ["At least one argument between" + " [ -title | -subtitle ] ".red() + "must be defined to present a banner.",
                                                  "In general if a call to action type is defined for a button, must be defined also the related payload."]
     static let systemAlertSyntacticRules: [String] = ["At least one argument between" + " [ -title | -subtitle ] ".red() + "must be defined to present a systemAlert."]
@@ -436,7 +440,7 @@ public final class HelpBuilder {
     }
 
     static func printAppVersion() {
-        print("IBM Notifier version: \(Bundle.main.infoDictionary!["CFBundleShortVersionString"] as? String ?? "Unknown")".bold())
+        print("IBM Notifier version: \(Bundle.main.infoDictionary!["CFBundleShortVersionString"] as? String ?? "Unknown") (\(Bundle.main.infoDictionary!["CFBundleVersion"] as? String ?? "Unknown"))\n© Copyright IBM Corp. 2021, 2024".bold())
     }
 }
 

diff --git a/Notification Agent Core/Controllers/NALogger.swift b/Notification Agent Core/Controllers/NALogger.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 8/27/20.
-//  Copyright © 2021 IBM. All rights reserved
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core/Controllers/TaskManager.swift b/Notification Agent Core/Controllers/TaskManager.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 16/06/2021.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core/Extensions/EFCLController-Extension.swift b/Notification Agent Core/Extensions/EFCLController-Extension.swift
@@ -3,7 +3,7 @@
 //  Notification Agent Banner
 //
 //  Created by Simone Martorelli on 28/06/2021.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core/Extensions/NotificationDispatch-Extension.swift b/Notification Agent Core/Extensions/NotificationDispatch-Extension.swift
@@ -3,7 +3,7 @@
 //  Notification Agent
 //
 //  Created by Simone Martorelli on 28/06/2021.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //
 

diff --git a/Notification Agent Core/Info.plist b/Notification Agent Core/Info.plist
@@ -45,7 +45,7 @@
 		<true/>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 IBM. All rights reserved.</string>
+	<string>© Copyright IBM Corp. 2021, 2024</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

diff --git a/Notification Agent Core/Resources/NOTICES.rtf b/Notification Agent Core/Resources/NOTICES.rtf
@@ -1,16 +1,48 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2580
+{\rtf1\ansi\ansicpg1252\cocoartf2761
 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 .AppleSystemUIFontMonospaced-Regular;}
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
-\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\paperw12240\paperh15840\margl1440\margr1440\vieww37420\viewh21880\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
 
-\f0\fs24 \cf0   Apache License\
+\f0\fs24 \cf0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\
+THIRD PARTY LICENSING NOTICES \
 \
-                           Version 2.0, January 2004\
+This notices file contains details concerning notices applicable to third party code included in this product. \
 \
-                        http://www.apache.org/licenses/\
+Notwithstanding the terms and conditions of any other agreement you\
+may have with IBM or any of its related or affiliated entities\
+(collectively "IBM"), the third party code identified below is subject\
+to the terms and conditions of the IBM license agreement for this product\
+and not the license terms that may be contained in the notices below.\
+\
+The notices are provided for informational purposes.\
+\
+Please note: This notices file may identify information that is not used\
+by, or that was not shipped with, this product as you installed it.\
+\
+IMPORTANT: IBM does not represent or warrant that the information in this\
+notices file is accurate. Third party websites are independent of IBM and\
+IBM does not represent or warrant that the information on any third party\
+website referenced in this notices file is accurate. IBM disclaims any\
+and all liability for errors and omissions or for any damages accruing\
+from the use of this notices file or its contents, including without\
+limitation URLs or references to any third party websites.\
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\
+\
+TABLE OF CONTENTS\
 \
+THIS NOTICE FILE CONSISTS OF THE FOLLOWING SECTIONS:\
+\
+- Apache-2.0 License\
+\
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\
+\
+								Apache License\
+                           \
+							Version 2.0, January 2004\
+\
+                        http://www.apache.org/licenses/\
 \
 \
 \

diff --git a/Notification Agent Onboarding Tests/NAOTriggersTests.swift b/Notification Agent Onboarding Tests/NAOTriggersTests.swift
@@ -3,7 +3,7 @@
 //  Notification Agent Onboarding Tests
 //
 //  Created by Simone Martorelli on 01/06/22.
-//  Copyright © 2021 IBM. All rights reserved.
+//  © Copyright IBM Corp. 2021, 2024
 //  SPDX-License-Identifier: Apache2.0
 //