Do not set a default app activation for terminal-notifier

As using -activate is blocking terminal-notifier execution (julienXX/terminal-notifier#223), a default value is not set anymore. It will only block users that really want the feature.
jcgay · Nov 1, 2017 · 61f142f · 61f142f
1 parent ab8c0d1
commit 61f142f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/...ion/src/main/java/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifier.java b/...ion/src/main/java/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifier.java
@@ -57,8 +57,10 @@ public void send(Notification notification) {
         commands.add(notification.message());
         commands.add(CMD_GROUP);
         commands.add(application.id());
-        commands.add(CMD_ACTIVATE);
-        commands.add(configuration.activateApplication());
+        if (configuration.activateApplication() != null) {
+            commands.add(CMD_ACTIVATE);
+            commands.add(configuration.activateApplication());
+        }
         commands.add(CMD_CONTENT_IMAGE);
         commands.add(notification.icon().asPath());
         if (configuration.sound() != null) {

diff --git a/...java/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifierConfiguration.java b/...java/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifierConfiguration.java
@@ -9,11 +9,12 @@
 public abstract class TerminalNotifierConfiguration {
 
     private static final TerminalNotifierConfiguration DEFAULT = new AutoValue_TerminalNotifierConfiguration(
-            "terminal-notifier", "com.apple.Terminal", null
+            "terminal-notifier", null, null
     );
 
     public abstract String bin();
 
+    @Nullable
     public abstract String activateApplication();
 
     @Nullable

diff --git a/...ovy/fr/jcgay/notification/notifier/notificationcenter/SimpleNotificationCenterSpec.groovy b/...ovy/fr/jcgay/notification/notifier/notificationcenter/SimpleNotificationCenterSpec.groovy
@@ -16,7 +16,6 @@ class SimpleNotificationCenterSpec extends Specification {
     def setup() {
         def configuration = TerminalNotifierConfiguration.create([
             'notifier.notification-center.path':TerminalNotifierConfiguration.byDefault().bin(),
-            'notifier.notification-center.activate':TerminalNotifierConfiguration.byDefault().activateApplication(),
             'notifier.notification-center.sound':'default'
         ] as Properties)
         notifier = new SimpleNotificationCenterNotifier(configuration, executor)

diff --git a/...test/groovy/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifierSpec.groovy b/...test/groovy/fr/jcgay/notification/notifier/notificationcenter/TerminalNotifierSpec.groovy
@@ -21,7 +21,7 @@ class TerminalNotifierSpec extends Specification {
     def setup() {
         def configuration = TerminalNotifierConfiguration.create([
             'notifier.notification-center.path':TerminalNotifierConfiguration.byDefault().bin(),
-            'notifier.notification-center.activate':TerminalNotifierConfiguration.byDefault().activateApplication(),
+            'notifier.notification-center.activate':'com.apple.Terminal',
             'notifier.notification-center.sound':'default'
         ] as Properties)
         notifier = new TerminalNotifier(application, configuration, executor)
@@ -61,7 +61,7 @@ class TerminalNotifierSpec extends Specification {
         !executor.executedCommand.contains('-subtitle')
     }
 
-    def "should not set sound when configuration does not includes one"() {
+    def "should not set sound when configuration does not include one"() {
         given:
         def notifier = new TerminalNotifier(application, TerminalNotifierConfiguration.byDefault(), executor)
         def notification = Notification.builder('title', 'message', TestIcon.ok()).build()
@@ -73,6 +73,18 @@ class TerminalNotifierSpec extends Specification {
         !executor.executedCommand.contains('-sound')
     }
 
+    def "should not set activation when configuration does not include one"() {
+        given:
+        def notifier = new TerminalNotifier(application, TerminalNotifierConfiguration.byDefault(), executor)
+        def notification = Notification.builder('title', 'message', TestIcon.ok()).build()
+
+        when:
+        notifier.send(notification)
+
+        then:
+        !executor.executedCommand.contains('-activate')
+    }
+
     def "should return true when binary is available"() {
         given:
         RuntimeExecutor executor = Mock()