From a4070f551bac5a37b2d5e7136be1e4ebeef5c4f9 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias.hagemann@skymatic.de>
Date: Wed, 27 Oct 2021 11:56:49 +0200
Subject: [PATCH] fixes #1404

---
 .github/workflows/release.yml                 |   1 +
 .idea/runConfigurations/Cryptomator_macOS.xml |   2 +-
 .../Cryptomator_macOS_Dev.xml                 |   2 +-
 .../ui/traymenu/TrayIconController.java       |  22 +-----------------
 .../ui/traymenu/TrayImageFactory.java         |   6 +----
 src/main/resources/img/tray_icon_mac.png      | Bin 0 -> 376 bytes
 src/main/resources/img/tray_icon_mac@2x.png   | Bin 0 -> 766 bytes
 .../resources/img/tray_icon_mac_black.png     | Bin 359 -> 0 bytes
 .../resources/img/tray_icon_mac_black@2x.png  | Bin 733 -> 0 bytes
 .../resources/img/tray_icon_mac_white.png     | Bin 367 -> 0 bytes
 .../resources/img/tray_icon_mac_white@2x.png  | Bin 749 -> 0 bytes
 11 files changed, 5 insertions(+), 28 deletions(-)
 create mode 100755 src/main/resources/img/tray_icon_mac.png
 create mode 100755 src/main/resources/img/tray_icon_mac@2x.png
 delete mode 100644 src/main/resources/img/tray_icon_mac_black.png
 delete mode 100644 src/main/resources/img/tray_icon_mac_black@2x.png
 delete mode 100644 src/main/resources/img/tray_icon_mac_white.png
 delete mode 100644 src/main/resources/img/tray_icon_mac_white@2x.png

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b1f417c66..03d913c91 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -145,6 +145,7 @@ jobs:
           jpackageoptions: >
             --app-version "${{ needs.metadata.outputs.semVerNum }}"
             --java-options "-Dfile.encoding=\"utf-8\""
+            --java-options "-Dapple.awt.enableTemplateImages=true"
             --java-options "-Dcryptomator.logDir=\"~/Library/Logs/Cryptomator\""
             --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/Cryptomator/Plugins\""
             --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/Cryptomator/settings.json\""
diff --git a/.idea/runConfigurations/Cryptomator_macOS.xml b/.idea/runConfigurations/Cryptomator_macOS.xml
index 203d94d2d..25fba1930 100644
--- a/.idea/runConfigurations/Cryptomator_macOS.xml
+++ b/.idea/runConfigurations/Cryptomator_macOS.xml
@@ -5,7 +5,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Cryptomator_macOS_Dev.xml b/.idea/runConfigurations/Cryptomator_macOS_Dev.xml
index b889ebd69..ca385e6cc 100644
--- a/.idea/runConfigurations/Cryptomator_macOS_Dev.xml
+++ b/.idea/runConfigurations/Cryptomator_macOS_Dev.xml
@@ -5,7 +5,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java b/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
index 6b87ab59a..2c176df76 100644
--- a/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
+++ b/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
@@ -2,9 +2,6 @@ package org.cryptomator.ui.traymenu;
 
 import com.google.common.base.Preconditions;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.integrations.uiappearance.Theme;
-import org.cryptomator.integrations.uiappearance.UiAppearanceException;
-import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,38 +9,25 @@ import javax.inject.Inject;
 import java.awt.AWTException;
 import java.awt.SystemTray;
 import java.awt.TrayIcon;
-import java.util.Optional;
 
 @TrayMenuScoped
 public class TrayIconController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(TrayIconController.class);
 
-	private final TrayImageFactory imageFactory;
-	private final Optional<UiAppearanceProvider> appearanceProvider;
 	private final TrayMenuController trayMenuController;
 	private final TrayIcon trayIcon;
 	private volatile boolean initialized;
 
 	@Inject
-	TrayIconController(TrayImageFactory imageFactory, TrayMenuController trayMenuController, Optional<UiAppearanceProvider> appearanceProvider) {
+	TrayIconController(TrayImageFactory imageFactory, TrayMenuController trayMenuController) {
 		this.trayMenuController = trayMenuController;
-		this.imageFactory = imageFactory;
-		this.appearanceProvider = appearanceProvider;
 		this.trayIcon = new TrayIcon(imageFactory.loadImage(), "Cryptomator", trayMenuController.getMenu());
 	}
 
 	public synchronized void initializeTrayIcon() throws IllegalStateException {
 		Preconditions.checkState(!initialized);
 
-		appearanceProvider.ifPresent(appearanceProvider -> {
-			try {
-				appearanceProvider.addListener(this::systemInterfaceThemeChanged);
-			} catch (UiAppearanceException e) {
-				LOG.error("Failed to enable automatic tray icon theme switching.");
-			}
-		});
-
 		trayIcon.setImageAutoSize(true);
 		if (SystemUtils.IS_OS_WINDOWS) {
 			trayIcon.addActionListener(trayMenuController::showMainWindow);
@@ -61,10 +45,6 @@ public class TrayIconController {
 		this.initialized = true;
 	}
 
-	private void systemInterfaceThemeChanged(Theme theme) {
-		trayIcon.setImage(imageFactory.loadImage()); // TODO refactor "theme" is re-queried in loadImage()
-	}
-
 	public boolean isInitialized() {
 		return initialized;
 	}
diff --git a/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java b/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
index d9fcdfc29..aa55ca766 100644
--- a/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
+++ b/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
@@ -25,11 +25,7 @@ class TrayImageFactory {
 	}
 
 	private String getMacResourceName() {
-		var theme = appearanceProvider.map(UiAppearanceProvider::getSystemTheme).orElse(Theme.LIGHT);
-		return switch (theme) {
-			case DARK -> "/img/tray_icon_mac_white.png";
-			case LIGHT -> "/img/tray_icon_mac_black.png";
-		};
+		return "/img/tray_icon_mac.png";
 	}
 
 	private String getWinOrLinuxResourceName() {
diff --git a/src/main/resources/img/tray_icon_mac.png b/src/main/resources/img/tray_icon_mac.png
new file mode 100755
index 0000000000000000000000000000000000000000..b0f2c78944a746d5fa81c5dfb27078b35293a82a
GIT binary patch
literal 376
zcmV-;0f+vHP)<h;3K|Lk000e1NJLTq000#L000#T1ONa410HQ10003$Nkl<Zcmd79
zKT8w<00+>AD5*FIH`KvRQWil@K_@NZQ0XQl{Tqsiipr(Iz!Lld*5ML3^a0|U9UPJ*
z9BOK~rb6ln1PMx$O3q(H5gut<(0l$j2Ru^u-8&DJ{KcR(5fSmxF}vupBFg$jS-*I%
z!;a30h=_=Yvv#ykQKxP<ymnK!PDMq37&fYEQ^T@~Ln@YS+4RJyVNI6Y@j^sIL`1wa
zZb_4QlNLq9s{2+&#G-rVZ8IzSd=?Qim=+PA^od!&6g1Se+Yk{S3|bKp8`{-19EJgN
zp1Obq5fP_FL@eNns>e=o-H<U?9aj|*Q4$eRb<`zy4Y^E<k_kP&iC4agh=?z0VqL*S
zd;NAs#BE2su_YR64w@2iQj-%RrWB0mb<2L|b$KA7tVx^aqUM@bKkYH*t$3!zKlB3;
WCYtQ+UgY-x0000<MNUMnLSTZP5t>v0

literal 0
HcmV?d00001

diff --git a/src/main/resources/img/tray_icon_mac@2x.png b/src/main/resources/img/tray_icon_mac@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..a6cdd32b93d6625b48219b4f56164846278c3338
GIT binary patch
literal 766
zcmV<a0s;MrP)<h;3K|Lk000e1NJLTq001fg001fo1ONa4Z^{AC0008TNkl<Zc-rlj
zOGs2v7{`C=RF2~y5|tX+h-qLCib%IcL4rh}482hZqE(_US|z1YEoyR8LXuJ{1z`pG
zpofd>wNNZZX$)NCb5>H6qK@groO`@oymzj5tfl8$oOAx?|NUkT=XGJVtd{U)J?DAG
zC;<X|;}K_w{Wo9~rTikeB*rORIdUzJbwDK+xJJ~<p!dQcm8e(=GEb!TlZ}mR`gOhE
z?28=QB`|5SmuArGh!mO1g6ZT#G0*16pvRX*hT>#o(ES`^Hyeq?P6`L9z>Am593llf
zv20)$ZgL_)x+ua!E8Ps@;~n=YC5s)D)5r&*z2`YK6ydUlD+gvQO+FN}z(vx{km*b?
z42)WajskwZn_+Je#0R{z41ERo2vQRsdRI)y#udxZN^Hy$q%J%(Ul<*f=#tw=B8fJg
zUV=l^`Qeb!G!bMBXwW4m3rDg}Z;&g{M6?kykv?H71_pG=o5Dc90>z@$N1`6;kv2Cl
ztxImkiIZlXJ_ERA+p`oIFF|u;7(#=TQD&e{0~yT8wnK|_P{6zxs1^MY!*hPZKphtT
zTG^{+=OS`1ekryPCzKY0^jvZc)E427qg^~RBLpZ=pgnwID=xfzls{8wke*4Vfx7rw
zd3k{i8|@4#!ZekluI7id#L%rvcM`ADy48&|!3|MYF{KEdVwdGIB<}J(e71a^Lh)9-
z2X*|UoJ4MNTY=iKbCw{zq>{k6=FPN*?I(tK>Y3#9(&u=)n94bg`H0~zP{PM4P4BSz
zefmH(PKd9QdV~KvhX;o|^GZ~iLt9njkW_kkBKL480yNSkNB%<Zm_r|`M!(z#uf^qE
z$pBxt#1`O<7+Ir%UN?tc&@7V^IKWk%r<rX)mIhj24ozlKwYtfp!{F|5(MgWxCh*I1
wXi|=<hjxm3)){&dc&a{*W6Q1mYWW}K57!ZQ-h5+w761SM07*qoM6N<$f~px{O#lD@

literal 0
HcmV?d00001

diff --git a/src/main/resources/img/tray_icon_mac_black.png b/src/main/resources/img/tray_icon_mac_black.png
deleted file mode 100644
index 42d6aad409288b27bbf21c24e3d2432ad74b6a69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq000#L000#T1ONa410HQ10003lNkl<Zcmd79
zy-Sn<00-blvQv<QI&LU6xFybpggO^VEfB*#1fj5SO&daJjCT`+Oc5J`Ye?||G0IGN
zfB#^E5gl1u(DV4;40@^K*q#^a{$kXjh=};4=@0tti>49LG$Qs?oM}o#L_|bPInzZo
zeFoh3-U9>r)YSZD%!I;;(ynF0mhCE?C`=gBWy@pRA|fIp;;l!vbXoJ%hKM+@<UmAh
zcw)^jRz$-W5%C<)M8szevEqlSQb)y+i1=vKzKA$d(NVer*R6W(4%S6P+!7J7j=Ku4
zw792b&a7(+5fOC}5rwO!EohmcN8N%;j>S9QL`1|_ZE>h-+66yNikR2%K`BaYLl#Bc
z)a8bVMOEX5JapM@{gy;Db?LP!+Gd?|>byBS;*B2v(0A>tY`{{Cg8Bde002ovPDHLk
FV1gcVp5y=k

diff --git a/src/main/resources/img/tray_icon_mac_black@2x.png b/src/main/resources/img/tray_icon_mac_black@2x.png
deleted file mode 100644
index c93a965798dd122bd47302fbe70c0304d490d2dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq001fg001fo1ONa4Z^{AC0007{Nkl<Zc-rmO
z-%rzL6vy!w*3}X*&Q42^xEZtQ6>gbvCWPq>S+ZSBCD{cTI+KYPnmHVxk!i5e8QqVt
zFk}#u3FU&ADHeVH!CmyBR=(fXmhF;rZocQ!bKdRudCqg5vT2)E-*))YEsM&^{&w9-
z+5ZM?bJ|m3otN}(9J$qv1hC>So!7Q8=nr*}6(8IP@`xaqbx_7Zvx(@1_gjZP5Coku
z>P(4>ts?h$+3@8nEBj7s(Bp4J2EmEepda|uemiAl<$Y+-j2YkfNM2UfPW$ya)C#ho
z->^wj9+~s2ADy<(y9SK<Eozf4>Q`tEH-P6&y?hXq@wKi-$S%tku-G(o5lfyl!VU}O
zaJOmbUCaqC)`xyCD9adX8agDSEVxo1dQ=ePoJthmw#zQJ6Z$DRL2$JGOd1oEa5Yh!
z2l<44HSWMz`he;1P!RNEK2iL39q2sz1;Ild>6;V;eOO5pk89U%JfS~FUwj^3kIY5T
zs=cYu;EXdV>I(K+jnBE)k-c$%Tm}oN=R9p5EP%@~I_JGL<N-@joUjc{q?GsQNl_=j
zHbp_ng7Vr`^M`2#1v7q+U(=gX-mN=DUAwJj+>wz{^r#}N7y{=!i78u5CCb}lN7njO
zwUL&62hMs{5$+k&rpIGN9Pnq;=P3w&(TOYmF`&Z*mnzV#tj`70_SmjeGufNN&e|ep
z#8W5NU&r0r@I_7XC#hXf@j0K>L?1Vvr=!)xW$ZAL@_Sbe%e}V3XB$H&tBH@JGVP}t
zaM`E_@sn53OO2t|s)<Xn4}M0MA@lw+XgBW11$zZO-x&H;%{H~;ux}GN<GQdfrCaM*
zzUB{EpCgJXv!~#mLp76NDW1aycC316pBeF1YR+~ytCwTxO?$s-|A+kx&Q-g9lZY-v
P00000NkvXXu0mjfzFcK;

diff --git a/src/main/resources/img/tray_icon_mac_white.png b/src/main/resources/img/tray_icon_mac_white.png
deleted file mode 100644
index d178cd01700f3b1c7a1431a6721cd4181389ef22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 367
zcmV-#0g(QQP)<h;3K|Lk000e1NJLTq000#L000#T1ONa410HQ10003tNkl<Zcmd79
zy-Sn<901@Sl4Rl_+)xKMiCG9b1)aEvL#bPk^x;s5R9G$z1)1PKU>z=kgMUC=bAv;Y
zghNdY*OW*efgpi>NG9hK*UQTtd5%KQ6aN`!Eh+o$vjw?0nnB;ye04Dz(`E~KeaP#>
zrc=>~8xFf3jW{E#Rl7+a-Pf*FRyO`+#HgZu6&ni9E7)*g-%F!LqMkL6y>r-mkE}&K
z%Vw-fY<p%~V%1a2QDYIkzDdkSn3LGii^WLDs3>c(EAhpkEs0$%$||}e!hly^8;h_a
zbyaF5!i1t1hQd9=rrgo5D3y~cy5P2H!^T6CoF_W$;e%glek$RIj9X4e$~9FF_4wof
z6(#4)s=6HYTv9bF<BBd1bh@d{b5;4Mr`cPS+;t-Ua?+G_ywMcL=nqS2ffOUg1wQ})
N002ovPDHLkV1o8ho>Tw;

diff --git a/src/main/resources/img/tray_icon_mac_white@2x.png b/src/main/resources/img/tray_icon_mac_white@2x.png
deleted file mode 100644
index 8c721bbcef0a4b31bfc6e7895677361aefcff2aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq001fg001fo1ONa4Z^{AC0008CNkl<ZcmeIf
zPiWNz00;1|bD47v8B#eT+gKXdABt#RjRFOUKpB-43PE&A)I+DFRH{QQFC`=?rBV=9
zkbmfphwR_Mu$ZG6ct|(hNs3aYTiYid<MHzM_Vi8Y=I4{^uB%1N^}Npv8ZqK`A9=>i
zTstw%dVecAYgMj|nBilS8~2)NnL6>FE7_E(63dnJ>C&i6pOQXZ8g=QzKOV@`h$Bim
zl0<YU=|~dMq2y4eLM$-uYR24}`iUphV|D5$9`v|--E5{N^F3^nUcFxSi20h#bd!5@
zTatQ-c5C$5@2Hddedm4aEq0fUcKg9e{l53PZPsYd)rfW*#YOeHBwo~+T12OFPK!bH
z8WcnR(3#1Jx6m)XRIjf@KelCZ;$2+Q=oR(atkEUx$mGNdCC%0;I$)l84k%iuS;>k_
zMl{%iGh&ybwnVfk+9d|DM?;E4tK&-6iW7=%Nkp5X-^5xa$F=5iqQ``8F|25>7A^KF
zx+uC$=*fSH*@l&jS}2B9+hBug!(yRPCBvFiCYr4@reu2}22@+^N!3m#V!H`j-JKF~
zzabO$nU#orsx7rtwS9@0<si-)Fk)pA@spq3u3fJmlSHgiZIMN)tx6Kn>kEw<9dt5@
z7`8bPTm6|NV!ES>TFh2-R6~-8bKXeA78jC;!}e&f)G3F=eSR?&-|7%M{AHt7Z+bh4
zXwu|a9J9b2XO)esPoL>#+v&WgQz2%!Q-gR;#iIt)((fr1%Tk;8K-oDl*G}V#M)hdc
ztYS-Q6Z@5&N)mC*C&rYG*zHJ?h>CYooA^-KP$H)LT6Eg%gkQbnHt|g&Zcy=hY7;Lg
z8`mNp@@g(4_PRqXR<Sa*i8kkzbzAO`)?7xkJ8X#!%7)C!m59d-nQ*~QH>Qf1<5L$+
fIAd9^```Twg?!$jqgi=q00000NkvXXu0mjfC-H1E