Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

desktop: hide release track selector for flatpak/snap builds

Abdullah Atta433be12b2bca
diff --git a/apps/desktop/src/api/os-integration.ts b/apps/desktop/src/api/os-integration.ts
index 28441312c..6d77da040 100644
--- a/apps/desktop/src/api/os-integration.ts
+++ b/apps/desktop/src/api/os-integration.ts
@@ -29,7 +29,7 @@ import { dirname } from "path";
import { resolvePath } from "../utils/resolve-path";
import { observable } from "@trpc/server/observable";
import { AssetManager } from "../utils/asset-manager";
-import { isFlatpak } from "../utils";
+import { isFlatpak, isSnap } from "../utils";
import { setupDesktopIntegration } from "../utils/desktop-integration";
import { rm } from "fs/promises";
import { disableCustomDns, enableCustomDns } from "../utils/custom-dns";
@@ -49,6 +49,7 @@ const NotificationOptions = z.object({
export const osIntegrationRouter = t.router({
isFlatpak: t.procedure.query(() => isFlatpak()),
+ isSnap: t.procedure.query(() => isSnap()),
zoomFactor: t.procedure.query(() => config.zoomFactor),
setZoomFactor: t.procedure.input(z.number()).mutation(({ input: factor }) => {
diff --git a/apps/desktop/src/utils/index.ts b/apps/desktop/src/utils/index.ts
index 15cdd5d8e..1bea5a1da 100644
--- a/apps/desktop/src/utils/index.ts
+++ b/apps/desktop/src/utils/index.ts
@@ -29,3 +29,7 @@ export function isDevelopment() {
export function isFlatpak() {
return existsSync("/.flatpak-info");
}
+
+export function isSnap() {
+ return process.env.SNAP !== undefined;
+}
diff --git a/apps/web/src/dialogs/settings/behaviour-settings.ts b/apps/web/src/dialogs/settings/behaviour-settings.ts
index 8c0dc5cb9..d7c5c06a2 100644
--- a/apps/web/src/dialogs/settings/behaviour-settings.ts
+++ b/apps/web/src/dialogs/settings/behaviour-settings.ts
@@ -186,7 +186,9 @@ export const BehaviourSettings: SettingsGroup[] = [
description: strings.automaticUpdatesDesc(),
onStateChange: (listener) =>
useSettingStore.subscribe((s) => s.autoUpdates, listener),
- isHidden: () => useSettingStore.getState().isFlatpak,
+ isHidden: () =>
+ useSettingStore.getState().isFlatpak ||
+ useSettingStore.getState().isSnap,
components: [
{
type: "toggle",
diff --git a/apps/web/src/dialogs/settings/other-settings.ts b/apps/web/src/dialogs/settings/other-settings.ts
index 272ce785e..695ce8814 100644
--- a/apps/web/src/dialogs/settings/other-settings.ts
+++ b/apps/web/src/dialogs/settings/other-settings.ts
@@ -29,6 +29,7 @@ import { IssueDialog } from "../issue-dialog";
import { strings } from "@notesnook/intl";
import { desktop } from "../../common/desktop-bridge";
import { TaskManager } from "../../common/task-manager";
+import { useStore as useSettingStore } from "../../stores/setting-store";
export const AboutSettings: SettingsGroup[] = [
{
@@ -79,6 +80,9 @@ export const AboutSettings: SettingsGroup[] = [
key: "release-track",
title: strings.releaseTrack(),
description: strings.releaseTrackDesc(),
+ isHidden: () =>
+ useSettingStore.getState().isFlatpak ||
+ useSettingStore.getState().isSnap,
components: [
{
type: "dropdown",
diff --git a/apps/web/src/stores/setting-store.ts b/apps/web/src/stores/setting-store.ts
index fb52f4a7e..b71d0402c 100644
--- a/apps/web/src/stores/setting-store.ts
+++ b/apps/web/src/stores/setting-store.ts
@@ -74,6 +74,7 @@ class SettingStore extends BaseStore<SettingStore> {
desktopIntegrationSettings?: DesktopIntegration;
autoUpdates = true;
isFlatpak = false;
+ isSnap = false;
proxyRules?: string;
refresh = async () => {
@@ -84,6 +85,7 @@ class SettingStore extends BaseStore<SettingStore> {
trashCleanupInterval: db.settings.getTrashCleanupInterval(),
profile: db.settings.getProfile(),
isFlatpak: await desktop?.integration.isFlatpak.query(),
+ isSnap: await desktop?.integration.isSnap.query(),
desktopIntegrationSettings:
await desktop?.integration.desktopIntegration.query(),
privacyMode: await desktop?.integration.privacyMode.query(),