Skip to content

Commit b2ebe6f

Browse files
infeoinfeo
authored
Merge pull request #69 from purejava/java22-appindicator
Update appindicator based on JDK 22
2 parents 78e11e9 + a425083 commit b2ebe6f

8 files changed

Lines changed: 51 additions & 61 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/setup-java@v4
1212
with:
1313
distribution: 'zulu'
14-
java-version: 21
14+
java-version: 22
1515
cache: 'maven'
1616
- name: Ensure to use tagged version
1717
if: startsWith(github.ref, 'refs/tags/')

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/setup-java@v4
2323
with:
2424
distribution: 'zulu'
25-
java-version: 21
25+
java-version: 22
2626
cache: 'maven'
2727
- name: Initialize CodeQL
2828
uses: github/codeql-action/init@v3

‎.github/workflows/dependency-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
runner-os: 'ubuntu-latest'
1616
java-distribution: 'temurin'
17-
java-version: 21
17+
java-version: 22
1818
secrets:
1919
nvd-api-key: ${{ secrets.NVD_API_KEY }}
2020
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}

‎.github/workflows/publish-central.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/setup-java@v4
1717
with:
1818
distribution: 'zulu'
19-
java-version: 21
19+
java-version: 22
2020
cache: 'maven'
2121
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
2222
server-username: MAVEN_USERNAME # env variable for username in deploy

‎.github/workflows/publish-github.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/setup-java@v4
1212
with:
1313
distribution: 'zulu'
14-
java-version: 21
14+
java-version: 22
1515
cache: 'maven'
1616
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
1717
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

‎pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636

3737
<properties>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39-
<project.jdk.version>21</project.jdk.version>
39+
<project.jdk.version>22</project.jdk.version>
4040

4141
<!-- runtime dependencies -->
4242

4343
<api.version>1.3.1</api.version>
4444
<secret-service.version>2.0.1-alpha</secret-service.version>
4545
<kdewallet.version>1.4.0</kdewallet.version>
46-
<appindicator.version>1.3.6</appindicator.version>
4746
<slf4j.version>2.0.12</slf4j.version>
47+
<appindicator.version>1.4.0</appindicator.version>
4848

4949
<!-- test dependencies -->
5050
<junit.version>5.10.2</junit.version>
@@ -97,9 +97,6 @@
9797
<version>3.13.0</version>
9898
<configuration>
9999
<release>${project.jdk.version}</release>
100-
<compilerArgs>
101-
<arg>--enable-preview</arg>
102-
</compilerArgs>
103100
</configuration>
104101
</plugin>
105102
<plugin>
@@ -194,7 +191,6 @@
194191
<name>see</name>
195192
</tag>
196193
</tags>
197-
<additionalOptions>--enable-preview</additionalOptions>
198194
</configuration>
199195
</plugin>
200196
</plugins>

‎src/main/java/org/cryptomator/linux/tray/ActionItemCallback.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
77

8-
record ActionItemCallback (ActionItem actionItem) implements GCallback {
8+
record ActionItemCallback (ActionItem actionItem) implements GCallback.Function {
99
private static final Logger LOG = LoggerFactory.getLogger(ActionItemCallback.class);
1010

1111
@Override

‎src/main/java/org/cryptomator/linux/tray/AppindicatorTrayMenuController.java‎

Lines changed: 43 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@
1010
import org.cryptomator.integrations.tray.TrayMenuController;
1111
import org.cryptomator.integrations.tray.TrayMenuException;
1212
import org.cryptomator.integrations.tray.TrayMenuItem;
13+
import org.purejava.appindicator.AppIndicator;
1314
import org.purejava.appindicator.GCallback;
14-
import org.purejava.appindicator.NativeLibUtilities;
15+
import org.purejava.appindicator.GObject;
16+
import org.purejava.appindicator.Gtk;
1517

1618
import java.lang.foreign.Arena;
1719
import java.lang.foreign.MemorySegment;
1820
import java.util.List;
19-
import java.util.Optional;
2021
import java.util.function.Consumer;
2122

22-
import static org.purejava.appindicator.app_indicator_h.*;
23+
import static org.purejava.appindicator.app_indicator_h.APP_INDICATOR_CATEGORY_APPLICATION_STATUS;
24+
import static org.purejava.appindicator.app_indicator_h.APP_INDICATOR_STATUS_ACTIVE;
2325

2426
@Priority(1000)
2527
@CheckAvailability
@@ -30,37 +32,35 @@ public class AppindicatorTrayMenuController implements TrayMenuController {
3032

3133
private static final Arena ARENA = Arena.global();
3234
private MemorySegment indicator;
33-
private MemorySegment menu = gtk_menu_new();
35+
private MemorySegment menu = Gtk.newMenu();
3436

3537
@CheckAvailability
3638
public static boolean isAvailable() {
37-
return NativeLibUtilities.isLoadedNativeLib();
39+
return AppIndicator.isLoaded();
3840
}
3941

4042
@Override
4143
public void showTrayIcon(Consumer<TrayIconLoader> iconLoader, Runnable runnable, String s) throws TrayMenuException {
4244
TrayIconLoader.FreedesktopIconName callback = this::showTrayIconWithSVG;
4345
iconLoader.accept(callback);
44-
gtk_widget_show_all(menu);
45-
app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE());
46+
Gtk.widgetShowAll(menu);
47+
AppIndicator.setStatus(indicator, APP_INDICATOR_STATUS_ACTIVE());
4648
}
4749

48-
private void showTrayIconWithSVG(String s) {
49-
try (var arena = Arena.ofConfined()) {
50-
var svgSourcePath = System.getProperty(SVG_SOURCE_PROPERTY);
51-
// flatpak
52-
if (svgSourcePath == null) {
53-
indicator = app_indicator_new(arena.allocateUtf8String(APP_INDICATOR_ID),
54-
arena.allocateUtf8String(s),
55-
APP_INDICATOR_CATEGORY_APPLICATION_STATUS());
56-
// AppImage and ppa
57-
} else {
58-
indicator = app_indicator_new_with_path(arena.allocateUtf8String(APP_INDICATOR_ID),
59-
arena.allocateUtf8String(s),
60-
APP_INDICATOR_CATEGORY_APPLICATION_STATUS(),
61-
// find tray icons theme in mounted AppImage / installed on system by ppa
62-
arena.allocateUtf8String(svgSourcePath));
63-
}
50+
private void showTrayIconWithSVG(String iconName) {
51+
var svgSourcePath = System.getProperty(SVG_SOURCE_PROPERTY);
52+
// flatpak
53+
if (svgSourcePath == null) {
54+
indicator = AppIndicator.newIndicator(APP_INDICATOR_ID,
55+
iconName,
56+
APP_INDICATOR_CATEGORY_APPLICATION_STATUS());
57+
// AppImage and ppa
58+
} else {
59+
indicator = AppIndicator.newIndicatorWithPath(APP_INDICATOR_ID,
60+
iconName,
61+
APP_INDICATOR_CATEGORY_APPLICATION_STATUS(),
62+
// find tray icons theme in mounted AppImage / installed on system by ppa
63+
svgSourcePath);
6464
}
6565
}
6666

@@ -70,18 +70,16 @@ public void updateTrayIcon(Consumer<TrayIconLoader> iconLoader) {
7070
iconLoader.accept(callback);
7171
}
7272

73-
private void updateTrayIconWithSVG(String s) {
74-
try (var arena = Arena.ofConfined()) {
75-
app_indicator_set_icon(indicator, arena.allocateUtf8String(s));
76-
}
73+
private void updateTrayIconWithSVG(String iconName) {
74+
AppIndicator.setIcon(indicator, iconName);
7775
}
7876

7977
@Override
8078
public void updateTrayMenu(List<TrayMenuItem> items) throws TrayMenuException {
81-
menu = gtk_menu_new();
79+
menu = Gtk.newMenu();
8280
addChildren(menu, items);
83-
gtk_widget_show_all(menu);
84-
app_indicator_set_menu(indicator, menu);
81+
Gtk.widgetShowAll(menu);
82+
AppIndicator.setMenu(indicator, menu);
8583
}
8684

8785
@Override
@@ -93,30 +91,26 @@ private void addChildren(MemorySegment menu, List<TrayMenuItem> items) {
9391
for (var item : items) {
9492
switch (item) {
9593
case ActionItem a -> {
96-
var gtkMenuItem = gtk_menu_item_new();
97-
try (var arena = Arena.ofConfined()) {
98-
gtk_menu_item_set_label(gtkMenuItem, arena.allocateUtf8String(a.title()));
99-
g_signal_connect_object(gtkMenuItem,
100-
arena.allocateUtf8String("activate"),
101-
GCallback.allocate(new ActionItemCallback(a), ARENA),
102-
menu,
103-
0);
104-
}
105-
gtk_menu_shell_append(menu, gtkMenuItem);
94+
var gtkMenuItem = Gtk.newMenuItem();
95+
Gtk.menuItemSetLabel(gtkMenuItem, a.title());
96+
GObject.signalConnectObject(gtkMenuItem,
97+
"activate",
98+
GCallback.allocate(new ActionItemCallback(a), ARENA),
99+
menu,
100+
0);
101+
Gtk.menuShellAppend(menu, gtkMenuItem);
106102
}
107103
case SeparatorItem _ -> {
108-
var gtkSeparator = gtk_menu_item_new();
109-
gtk_menu_shell_append(menu, gtkSeparator);
104+
var gtkSeparator = Gtk.newMenuItem();
105+
Gtk.menuShellAppend(menu, gtkSeparator);
110106
}
111107
case SubMenuItem s -> {
112-
var gtkMenuItem = gtk_menu_item_new();
113-
var gtkSubmenu = gtk_menu_new();
114-
try (var arena = Arena.ofConfined()) {
115-
gtk_menu_item_set_label(gtkMenuItem, arena.allocateUtf8String(s.title()));
116-
}
108+
var gtkMenuItem = Gtk.newMenuItem();
109+
var gtkSubmenu = Gtk.newMenu();
110+
Gtk.menuItemSetLabel(gtkMenuItem, s.title());
117111
addChildren(gtkSubmenu, s.items());
118-
gtk_menu_item_set_submenu(gtkMenuItem, gtkSubmenu);
119-
gtk_menu_shell_append(menu, gtkMenuItem);
112+
Gtk.menuItemSetSubmenu(gtkMenuItem, gtkSubmenu);
113+
Gtk.menuShellAppend(menu, gtkMenuItem);
120114
}
121115
}
122116
}

0 commit comments

Comments
 (0)