Merge branch 'release/1.2.2'

tobihagemann · tobihagemann · commit 369bd6c9545b · 2023-09-19T11:52:33.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-mac</artifactId>
-	<version>1.2.1</version>
+	<version>1.2.2</version>
 
 	<name>Cryptomator Integrations for macOS</name>
 	<description>Provides optional macOS services used by Cryptomator</description>
diff --git a/src/main/native/org_cryptomator_macos_tray_ActivationPolicy_Native.m b/src/main/native/org_cryptomator_macos_tray_ActivationPolicy_Native.m
@@ -11,11 +11,15 @@
 
 JNIEXPORT void JNICALL Java_org_cryptomator_macos_tray_ActivationPolicy_00024Native_transformToAccessory
 (JNIEnv *env, jobject thisObj) {
-    [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
+	if (NSApp.activationPolicy != NSApplicationActivationPolicyAccessory) {
+		[NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
+	}
 }
 
 JNIEXPORT void JNICALL Java_org_cryptomator_macos_tray_ActivationPolicy_00024Native_transformToRegular
 (JNIEnv *env, jobject thisObj) {
-    [NSApp activateIgnoringOtherApps:YES];
-    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+	if (NSApp.activationPolicy != NSApplicationActivationPolicyRegular) {
+		[NSApp activateIgnoringOtherApps:YES];
+		[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+	}
 }
diff --git a/src/main/resources/MacIntegrationsBundle_bg.properties b/src/main/resources/MacIntegrationsBundle_bg.properties
@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=macOS Keychain
diff --git a/src/main/resources/MacIntegrationsBundle_fi.properties b/src/main/resources/MacIntegrationsBundle_fi.properties
diff --git a/src/main/resources/MacIntegrationsBundle_fil.properties b/src/main/resources/MacIntegrationsBundle_fil.properties
@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=macOS Keychain
diff --git a/src/main/resources/MacIntegrationsBundle_hu.properties b/src/main/resources/MacIntegrationsBundle_hu.properties
@@ -1 +1 @@
-org.cryptomator.macos.keychain.displayName=macOS Keychain
+org.cryptomator.macos.keychain.displayName=macOS Kulcskarika
diff --git a/src/main/resources/MacIntegrationsBundle_ta.properties b/src/main/resources/MacIntegrationsBundle_ta.properties
@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=macOS கீச்செயின்
diff --git a/src/main/resources/MacIntegrationsBundle_zh.properties b/src/main/resources/MacIntegrationsBundle_zh.properties
@@ -1 +1 @@
-org.cryptomator.macos.keychain.displayName=macOS Keychain
+org.cryptomator.macos.keychain.displayName=macOS 钥匙串访问

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.cryptomator.macos.keychain.displayName=macOS Keychain`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.cryptomator.macos.keychain.displayName=macOS Keychain`
	`1`	`+org.cryptomator.macos.keychain.displayName=macOS Kulcskarika`