fix: icon permissions and GTK single instance

- Use GTK default flags for single instance
- Fix icon path to absolute /usr/share/icons
- Add postinstall chmod 644 for icon
- Remove Dart-level single instance code
This commit is contained in:
Umbrix Developer
2026-01-17 20:10:04 +03:00
parent 9300488d2b
commit 43ab81e8d1
7 changed files with 62 additions and 127 deletions

View File

@@ -19,11 +19,6 @@ class WindowNotifier extends _$WindowNotifier with AppLogger {
Future<void> build() async { Future<void> build() async {
if (!PlatformUtils.isDesktop) return; if (!PlatformUtils.isDesktop) return;
// if (Platform.isWindows) {
// loggy.debug("ensuring single instance");
// await WindowsSingleInstance.ensureSingleInstance([], "Hiddify");
// }
await windowManager.ensureInitialized(); await windowManager.ensureInitialized();
await windowManager.setMinimumSize(minimumWindowSize); await windowManager.setMinimumSize(minimumWindowSize);
await windowManager.setSize(defaultWindowSize); await windowManager.setSize(defaultWindowSize);

View File

@@ -1,70 +1,9 @@
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:umbrix/bootstrap.dart'; import 'package:umbrix/bootstrap.dart';
import 'package:umbrix/core/model/environment.dart'; import 'package:umbrix/core/model/environment.dart';
final lockFile = File('/tmp/umbrix.lock');
Future<void> _activateExistingWindow() async {
// Try to activate existing window via wmctrl
try {
final result = await Process.run('wmctrl', ['-a', 'Umbrix']);
if (result.exitCode == 0) return;
} catch (e) {
// wmctrl not available, try xdotool
try {
await Process.run('xdotool', ['search', '--name', 'Umbrix', 'windowactivate']);
} catch (e) {
// No window activation possible
}
}
}
void _cleanupLockFile() {
try {
if (lockFile.existsSync()) {
lockFile.deleteSync();
}
} catch (e) {
// Ignore cleanup errors
}
}
void main() async { void main() async {
// Single instance check - BEFORE Flutter initialization
if (Platform.isLinux || Platform.isWindows) {
if (await lockFile.exists()) {
// Check if process is still alive
try {
final pidString = await lockFile.readAsString();
final pid = int.tryParse(pidString.trim());
if (pid != null) {
final result = await Process.run('ps', ['-p', pid.toString()]);
if (result.exitCode != 0) {
// Process dead, remove stale lock
await lockFile.delete();
} else {
// Process alive - activate window and exit
await _activateExistingWindow();
exit(0);
}
}
} catch (e) {
// Error reading lock, remove it
try { await lockFile.delete(); } catch (e) {}
}
}
// Create lock file
try {
await lockFile.create();
await lockFile.writeAsString(pid.toString());
} catch (e) {
// If can't create, continue anyway
}
}
final widgetsBinding = WidgetsFlutterBinding.ensureInitialized(); final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);

View File

@@ -14,7 +14,7 @@ struct _MyApplication
}; };
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
#define ICON_PATH "./umbrix.png" #define ICON_PATH "/usr/share/icons/hicolor/256x256/apps/umbrix.png"
// Implements GApplication::activate. // Implements GApplication::activate.
static void my_application_activate(GApplication *application) static void my_application_activate(GApplication *application)

View File

@@ -11,6 +11,7 @@ essential: false
icon: ./logo/ic_launcher_playstore.png icon: ./logo/ic_launcher_playstore.png
postinstall_scripts: postinstall_scripts:
- chmod 644 /usr/share/icons/hicolor/256x256/apps/umbrix.png
- echo "Installed Umbrix VPN" - echo "Installed Umbrix VPN"
postuninstall_scripts: postuninstall_scripts:
- echo "Uninstalled Umbrix" - echo "Uninstalled Umbrix"