implemented TrayIntegrationProvider

Author: overheadhunter

pom.xml

@@ -29,7 +29,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- runtime dependencies -->
-		<api.version>0.1.5</api.version>
+		<api.version>0.1.6</api.version>
 		<slf4j.version>1.7.30</slf4j.version>
 		<guava.version>30.0-jre</guava.version>
 		<gson.version>2.8.6</gson.version>

src/main/headers/org_cryptomator_macos_tray_ActivationPolicy_Native.h

@@ -0,0 +1,32 @@
+package org.cryptomator.macos.tray;
+
+import org.cryptomator.macos.common.NativeLibLoader;
+
+class ActivationPolicy {
+
+	/**
+	 * Sets the application's activation policy to <a href="https://developer.apple.com/documentation/appkit/nsapplicationactivationpolicy/nsapplicationactivationpolicyaccessory?language=objc">NSApplicationActivationPolicyAccessory</a>
+	 */
+	void transformToAccessory() {
+		Native.INSTANCE.transformToAccessory();
+	}
+
+	/**
+	 * Requests to focus the current app and sets its activation policy to <a href="https://developer.apple.com/documentation/appkit/nsapplicationactivationpolicy/nsapplicationactivationpolicyregular?language=objc">NSApplicationActivationPolicyRegular</a>
+	 */
+	void transformToRegular() {
+		Native.INSTANCE.transformToRegular();
+	}
+
+	private static class Native {
+		static final Native INSTANCE = new Native();
+
+		private Native() {
+			NativeLibLoader.loadLib();
+		}
+
+		public native void transformToAccessory();
+
+		public native void transformToRegular();
+	}
+}

src/main/java/org/cryptomator/macos/tray/ActivationPolicy.java

@@ -0,0 +1,22 @@
+package org.cryptomator.macos.tray;
+
+import org.cryptomator.integrations.tray.TrayIntegrationProvider;
+
+public class MacTrayIntegrationProvider implements TrayIntegrationProvider {
+
+	private final ActivationPolicy activationPolicy;
+
+	public MacTrayIntegrationProvider() {
+		this.activationPolicy = new ActivationPolicy();
+	}
+
+	@Override
+	public void minimizedToTray() {
+		activationPolicy.transformToAccessory();
+	}
+
+	@Override
+	public void restoredFromTray() {
+		activationPolicy.transformToRegular();
+	}
+}

src/main/java/org/cryptomator/macos/tray/MacTrayIntegrationProvider.java

@@ -15,6 +15,7 @@
 		9E21340C255429CA006EA872 /* SKYAppearanceObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E21340A255429CA006EA872 /* SKYAppearanceObserver.m */; };
 		9E21341125542ECE006EA872 /* SKYAppearanceNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E21340F25542ECE006EA872 /* SKYAppearanceNotifier.h */; };
 		9E21341225542ECE006EA872 /* SKYAppearanceNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E21341025542ECE006EA872 /* SKYAppearanceNotifier.m */; };
+		9EACB1B425557865000F3214 /* org_cryptomator_macos_tray_ActivationPolicy_Native.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EACB1B325557865000F3214 /* org_cryptomator_macos_tray_ActivationPolicy_Native.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,6 +28,7 @@
 		9E21340A255429CA006EA872 /* SKYAppearanceObserver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SKYAppearanceObserver.m; sourceTree = "<group>"; };
 		9E21340F25542ECE006EA872 /* SKYAppearanceNotifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SKYAppearanceNotifier.h; sourceTree = "<group>"; };
 		9E21341025542ECE006EA872 /* SKYAppearanceNotifier.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SKYAppearanceNotifier.m; sourceTree = "<group>"; };
+		9EACB1B325557865000F3214 /* org_cryptomator_macos_tray_ActivationPolicy_Native.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = org_cryptomator_macos_tray_ActivationPolicy_Native.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -43,8 +45,9 @@
 		9E0819AE1D748ECC000C89E6 = {
 			isa = PBXGroup;
 			children = (
-				9E0819C71D75CABC000C89E6 /* org_cryptomator_macos_keychain_MacKeychain_Native.m */,
 				74CF2E7A254C295A006266D6 /* org_cryptomator_macos_autostart_MacLaunchServices_Native.m */,
+				9E0819C71D75CABC000C89E6 /* org_cryptomator_macos_keychain_MacKeychain_Native.m */,
+				9EACB1B325557865000F3214 /* org_cryptomator_macos_tray_ActivationPolicy_Native.m */,
 				9E2133FF25542735006EA872 /* org_cryptomator_macos_uiappearance_AppAppearance_Native.m */,
 				9E2134022554275D006EA872 /* org_cryptomator_macos_uiappearance_MacSystemAppearance_Native.m */,
 				9E21340F25542ECE006EA872 /* SKYAppearanceNotifier.h */,
@@ -132,6 +135,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9EACB1B425557865000F3214 /* org_cryptomator_macos_tray_ActivationPolicy_Native.m in Sources */,
 				74CF2E7B254C295A006266D6 /* org_cryptomator_macos_autostart_MacLaunchServices_Native.m in Sources */,
 				9E21340C255429CA006EA872 /* SKYAppearanceObserver.m in Sources */,
 				9E21340025542735006EA872 /* org_cryptomator_macos_uiappearance_AppAppearance_Native.m in Sources */,

src/main/native/Integrations.xcodeproj/project.pbxproj

@@ -0,0 +1,21 @@
+//
+//  org_cryptomator_macos_tray_ActivationPolicy_Native.m
+//  Integrations
+//
+//  Created by Sebastian Stenzel on 06.11.20.
+//  Copyright © 2020 Cryptomator. All rights reserved.
+//
+
+#import "org_cryptomator_macos_tray_ActivationPolicy_Native.h"
+#import <AppKit/AppKit.h>
+
+JNIEXPORT void JNICALL Java_org_cryptomator_macos_tray_ActivationPolicy_00024Native_transformToAccessory
+(JNIEnv *env, jobject thisObj) {
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
+}
+
+JNIEXPORT void JNICALL Java_org_cryptomator_macos_tray_ActivationPolicy_00024Native_transformToRegular
+(JNIEnv *env, jobject thisObj) {
+    [NSApp activateIgnoringOtherApps:YES];
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+}

src/main/native/org_cryptomator_macos_tray_ActivationPolicy_Native.m

@@ -0,0 +1 @@
+org.cryptomator.macos.tray.MacTrayIntegrationProvider

src/main/resources/META-INF/services/org.cryptomator.integrations.tray.TrayIntegrationProvider

@@ -0,0 +1,23 @@
+package org.cryptomator.macos.tray;
+
+import org.cryptomator.integrations.tray.TrayIntegrationProvider;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.util.ServiceLoader;
+
+public class MacTrayIntegrationProviderTest {
+
+	@Test
+	@DisplayName("MacTrayIntegrationProvider can be loaded")
+	public void testLoadMacTrayIntegrationProvider() {
+		var loadedProviders = ServiceLoader.load(TrayIntegrationProvider.class);
+		var provider = loadedProviders.stream()
+				.filter(p -> p.type().equals(MacTrayIntegrationProvider.class))
+				.map(ServiceLoader.Provider::get)
+				.findAny();
+		Assertions.assertTrue(provider.isPresent());
+	}
+
+}