Merge branch 'release/1.0.0'

.crowdin.yml

@@ -0,0 +1,6 @@
+commit_message: '[ci skip]'
+files:
+  - source: /src/main/resources/WinIntegrationsBundle.properties
+    translation: /src/main/resources/WinIntegrationsBundle_%two_letters_code%.properties
+    escape_quotes: 0
+    escape_special_characters: 0

.github/workflows/build.yml

@@ -20,8 +20,7 @@ jobs:
       - name: Ensure to use tagged version
         if: startsWith(github.ref, 'refs/tags/')
         shell: bash
-        run: |
-          mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
+        run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
       - name: Build and Test
         id: buildAndTest
         run: mvn -B clean install -Pdependency-check

.github/workflows/publish-central.yml

@@ -28,9 +28,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Enforce project version ${{ github.event.inputs.tag }}
-        run: mvn versions:set -B -DnewVersion=${{ github.event.inputs.tag }}
+        run: mvn versions:set -B -DnewVersion="${{ github.event.inputs.tag }}"
       - name: Deploy
-        run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
+        run: mvn deploy -B -DskipTests -Psign -Pdeploy-central --no-transfer-progress
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.github/workflows/publish-github.yml

@@ -20,21 +20,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Enforce project version ${{ github.event.release.tag_name }}
-        run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}
+        run: mvn versions:set -B -DnewVersion="${{ github.event.release.tag_name }}"
       - name: Deploy
-        run: mvn deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
+        run: mvn deploy -B -DskipTests -Psign -Pdeploy-github --no-transfer-progress
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
-      - name: Slack Notification
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_USERNAME: 'Cryptobot'
-          SLACK_ICON:
-          SLACK_ICON_EMOJI: ':bot:'
-          SLACK_CHANNEL: 'cryptomator-desktop'
-          SLACK_TITLE: "Published ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}"
-          SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions?query=workflow%3A%22Publish+to+Maven+Central%22|deploy to Maven Central>."
-          SLACK_FOOTER:
-          MSG_MINIMAL: true
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cryptomator</groupId>
     <artifactId>integrations-win</artifactId>
-    <version>1.0.1-beta1</version>
+    <version>1.0.0</version>
 
     <name>Cryptomator Integrations for Windows</name>
     <description>Provides optional Windows services used by Cryptomator</description>
@@ -36,14 +36,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- runtime dependencies -->
-        <api.version>1.0.0-beta2</api.version>
-        <slf4j.version>1.7.30</slf4j.version>
-        <guava.version>30.0-jre</guava.version>
-        <gson.version>2.8.6</gson.version>
+        <api.version>1.0.0</api.version>
+        <slf4j.version>1.7.32</slf4j.version>
+        <guava.version>31.0-jre</guava.version>
+        <gson.version>2.8.8</gson.version>
 
         <!-- test dependencies -->
-        <junit.jupiter.version>5.6.2</junit.jupiter.version>
-        <mockito.version>3.3.3</mockito.version>
+		<junit.jupiter.version>5.8.1</junit.jupiter.version>
+		<mockito.version>3.12.4</mockito.version>
     </properties>
 
     <licenses>
@@ -130,7 +130,7 @@
             <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0-M3</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<id>check-preconditions</id>
@@ -151,7 +151,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -199,11 +199,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.0.0-M5</version>
             </plugin>
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -215,7 +215,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -265,7 +265,7 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>6.1.0</version>
+                        <version>6.3.1</version>
                         <configuration>
                             <cveValidForHours>24</cveValidForHours>
                             <failBuildOnCVSS>0</failBuildOnCVSS>
@@ -290,7 +290,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>3.0.1</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

src/main/java/org/cryptomator/windows/common/Localization.java

@@ -0,0 +1,14 @@
+package org.cryptomator.windows.common;
+
+import java.util.ResourceBundle;
+
+public enum Localization {
+	INSTANCE;
+
+	private final ResourceBundle resourceBundle = ResourceBundle.getBundle("WinIntegrationsBundle");
+
+	public static ResourceBundle get() {
+		return INSTANCE.resourceBundle;
+	}
+
+}

src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java

@@ -8,6 +8,7 @@
 import com.google.gson.reflect.TypeToken;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
+import org.cryptomator.windows.common.Localization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,6 +85,11 @@ private static Path resolveHomeDir(Path path) {
 		}
 	}
 
+	@Override
+	public String displayName() {
+		return Localization.get().getString("org.cryptomator.windows.keychain.displayName");
+	}
+
 	@Override
 	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
 		loadKeychainEntriesIfNeeded();

src/main/java/org/cryptomator/windows/uiappearance/WinUiAppearanceProvider.java

@@ -1,7 +1,6 @@
 package org.cryptomator.windows.uiappearance;
 
 import org.cryptomator.integrations.uiappearance.Theme;
-import org.cryptomator.integrations.uiappearance.UiAppearanceException;
 import org.cryptomator.integrations.uiappearance.UiAppearanceListener;
 import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 
@@ -42,7 +41,7 @@ public synchronized void addListener(UiAppearanceListener listener) {
 	@Override
 	public synchronized void removeListener(UiAppearanceListener listener) {
 		registeredListeners.remove(listener);
-		if (registeredListeners.isEmpty()) {
+		if (appearanceObserver != null && registeredListeners.isEmpty()) {
 			this.appearanceObserver.interrupt();
 			this.appearanceObserver = null;
 		}

src/main/resources/WinIntegrationsBundle.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_ar.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=حماية بيانات ويندوز

src/main/resources/WinIntegrationsBundle_bs.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_ca.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_cs.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection klíčenka

src/main/resources/WinIntegrationsBundle_de.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows-Datenschutz

src/main/resources/WinIntegrationsBundle_el.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Προστασία δεδομένων Windows

src/main/resources/WinIntegrationsBundle_es.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Protección de Datos de Windows

src/main/resources/WinIntegrationsBundle_fr.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Protection des données Windows

src/main/resources/WinIntegrationsBundle_hi.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_hr.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_hu.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_id.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Perlindungan Data Windows

src/main/resources/WinIntegrationsBundle_it.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Protezione Dati Di Windows

src/main/resources/WinIntegrationsBundle_ja.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows のデータ保護

src/main/resources/WinIntegrationsBundle_ko.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=윈도우 데이터 보호

src/main/resources/WinIntegrationsBundle_lv.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_nb.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_nl.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows-gegevensbescherming

src/main/resources/WinIntegrationsBundle_nn.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_pa.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=ਵਿੰਡੋ ਡਾਟਾ ਪਰੋਟੈਕਸ਼ਨ

src/main/resources/WinIntegrationsBundle_pl.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Ochrona danych w systemie Windows

src/main/resources/WinIntegrationsBundle_pt.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_pt_BR.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Proteção de Dados do Windows

src/main/resources/WinIntegrationsBundle_ro.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Protecție de date Windows

src/main/resources/WinIntegrationsBundle_ru.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Защита данных Windows

src/main/resources/WinIntegrationsBundle_sk.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows ochrana dát

src/main/resources/WinIntegrationsBundle_sr.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_sr_Latn.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_sv.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_th.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_tr.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows Veri Koruması

src/main/resources/WinIntegrationsBundle_zh.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows 数据保护

src/main/resources/WinIntegrationsBundle_zh_TW.properties

@@ -0,0 +1 @@
+org.cryptomator.windows.keychain.displayName=Windows 數據保護

src/test/java/org/cryptomator/integrations/uiappearance/WinUiAppearanceProviderTest.java

@@ -44,4 +44,11 @@ public void testAddAndRemoveListener() {
 		appearanceProvider.removeListener(listener);
 	}
 
+	@Test
+	@DisplayName("test removing a non-registered listener is a no-op")
+	public void testRemoveListenerIfNoneIsRegistered() {
+		UiAppearanceListener listener = theme -> System.out.println(theme.toString());
+		appearanceProvider.removeListener(listener);
+	}
+
 }