diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index 1090140212ed..7521219bd4e8 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -1,4 +1,4 @@ - + # Acknowledgments diff --git a/app/main.ts b/app/main.ts index 85d4c733bb0b..f54ad640b41e 100644 --- a/app/main.ts +++ b/app/main.ts @@ -325,7 +325,6 @@ function prepareUrl( appStartInitialSpellcheckSetting, userDataPath: app.getPath('userData'), downloadsPath: app.getPath('downloads'), - isLegacyOS: OS.isLegacy(), homePath: app.getPath('home'), ...moreKeys, }).href; diff --git a/package.json b/package.json index 5bd7b31205f9..a911404783b6 100644 --- a/package.json +++ b/package.json @@ -257,7 +257,7 @@ "core-js": "2.6.9", "cross-env": "5.2.0", "css-loader": "3.2.0", - "electron": "16.0.4", + "electron": "16.0.6", "electron-builder": "22.14.5", "electron-mocha": "11.0.2", "electron-notarize": "0.1.1", diff --git a/preload.js b/preload.js index 5de11bb13f35..166cdec9a6c5 100644 --- a/preload.js +++ b/preload.js @@ -70,7 +70,6 @@ try { window.getServerPublicParams = () => config.serverPublicParams; window.getSfuUrl = () => config.sfuUrl; window.isBehindProxy = () => Boolean(config.proxyUrl); - window.isLegacyOS = () => config.isLegacyOS === 'true'; window.getAutoLaunch = () => { return ipc.invoke('get-auto-launch'); }; diff --git a/ts/OS.ts b/ts/OS.ts index 7714dc7187a8..73598af018b7 100644 --- a/ts/OS.ts +++ b/ts/OS.ts @@ -16,16 +16,3 @@ export const isWindows = (minVersion?: string): boolean => { return is.undefined(minVersion) ? true : semver.gte(osRelease, minVersion); }; - -export const isLegacy = (): boolean => { - if (process.platform === 'darwin') { - // 17.0.0 - is macOS 10.13 - return semver.lt(os.release(), '17.0.0'); - } - - if (process.platform === 'win32') { - return semver.lt(os.release(), '9.0.0'); - } - - return false; -}; diff --git a/ts/components/Lightbox.tsx b/ts/components/Lightbox.tsx index ca564a8c59fc..4b4ef1406492 100644 --- a/ts/components/Lightbox.tsx +++ b/ts/components/Lightbox.tsx @@ -18,10 +18,8 @@ import { IMAGE_PNG, isImage, isVideo } from '../types/MIME'; import type { LocalizerType } from '../types/Util'; import type { MediaItemType, MessageAttributesType } from '../types/MediaItem'; import { formatDuration } from '../util/formatDuration'; -import { showToast } from '../util/showToast'; import { useRestoreFocus } from '../hooks/useRestoreFocus'; import * as log from '../logging/log'; -import { ToastUnableToLoadAttachment } from './ToastUnableToLoadAttachment'; export type PropsType = { children?: ReactNode; @@ -455,25 +453,6 @@ export function Lightbox({ /> ); } - } else if (isVideoTypeSupported && window.isLegacyOS()) { - const onLegacyClick = (event: React.MouseEvent) => { - event.preventDefault(); - event.stopPropagation(); - - showToast(ToastUnableToLoadAttachment); - }; - - content = ( - - ); } else if (isVideoTypeSupported) { const shouldLoop = loop || isAttachmentGIF || isViewOnce; diff --git a/ts/components/conversation/GIF.tsx b/ts/components/conversation/GIF.tsx index ceac789f7a0c..cab70bffb576 100644 --- a/ts/components/conversation/GIF.tsx +++ b/ts/components/conversation/GIF.tsx @@ -178,7 +178,7 @@ export const GIF: React.FC = props => { } let gif: JSX.Element | undefined; - if (isNotDownloaded || isPending || window.isLegacyOS()) { + if (isNotDownloaded || isPending) { gif = ( = (props: Props) => { }, [id, audio, isActive, isPlaying, currentTime]); const toggleIsPlaying = () => { - if (window.isLegacyOS()) { - showToast(ToastUnableToLoadAttachment); - return; - } - setIsPlaying(!isPlaying); if (!isActive && !isPlaying) { diff --git a/ts/window.d.ts b/ts/window.d.ts index c5521257573f..636214f1aa4b 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -197,7 +197,6 @@ declare global { imageToBlurHash: typeof imageToBlurHash; loadImage: any; isBehindProxy: () => boolean; - isLegacyOS: () => boolean; getAutoLaunch: () => Promise; setAutoLaunch: (value: boolean) => Promise; diff --git a/yarn.lock b/yarn.lock index baf513f1e621..cbd3d0aff250 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5991,10 +5991,10 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@16.0.4: - version "16.0.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.4.tgz#87dfe21d17608537fc6df292c437362297566a73" - integrity sha512-IptwmowvMP1SFOmZLh6rrURwfnOxbDBXBRBcaOdfBM5I+B9mgtdNwzNC3ymFFNzEkZUwdOyg9fu3iyjAAQIQgw== +electron@16.0.6: + version "16.0.6" + resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.6.tgz#d7a420ef2cb39d7d0a4d8760c03d72b137a033d5" + integrity sha512-Xs9dYLYhcJf3wXn8m2gDqFTb1L862KEhMxOx9swfFBHj6NoUPPtUgw/RyPQ0tXN1XPxG9vnBkoI0BdcKwrLKuQ== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2"