Enable SquirrelMacEnableDirectContentsWrite

This commit is contained in:
Fedor Indutny 2023-02-23 14:37:55 -08:00 committed by GitHub
parent 5d110964b9
commit a83a85d557
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 32 deletions

View file

@ -120,7 +120,7 @@ import type { LoggerType } from '../ts/types/Logging';
const animationSettings = systemPreferences.getAnimationSettings(); const animationSettings = systemPreferences.getAnimationSettings();
if (OS.isMacOS() && !isProduction(app.getVersion())) { if (OS.isMacOS()) {
systemPreferences.setUserDefault( systemPreferences.setUserDefault(
'SquirrelMacEnableDirectContentsWrite', 'SquirrelMacEnableDirectContentsWrite',
'boolean', 'boolean',

View file

@ -635,29 +635,31 @@ export function CompositionArea({
return ( return (
<div className="CompositionArea"> <div className="CompositionArea">
{attachmentToEdit && 'url' in attachmentToEdit && attachmentToEdit.url && ( {attachmentToEdit &&
<MediaEditor 'url' in attachmentToEdit &&
i18n={i18n} attachmentToEdit.url && (
imageSrc={attachmentToEdit.url} <MediaEditor
imageToBlurHash={imageToBlurHash} i18n={i18n}
isSending={false} imageSrc={attachmentToEdit.url}
onClose={() => setAttachmentToEdit(undefined)} imageToBlurHash={imageToBlurHash}
onDone={({ data, contentType, blurHash }) => { isSending={false}
const newAttachment = { onClose={() => setAttachmentToEdit(undefined)}
...attachmentToEdit, onDone={({ data, contentType, blurHash }) => {
contentType, const newAttachment = {
blurHash, ...attachmentToEdit,
data, contentType,
size: data.byteLength, blurHash,
}; data,
size: data.byteLength,
};
addAttachment(conversationId, newAttachment); addAttachment(conversationId, newAttachment);
setAttachmentToEdit(undefined); setAttachmentToEdit(undefined);
}} }}
installedPacks={installedPacks} installedPacks={installedPacks}
recentStickers={recentStickers} recentStickers={recentStickers}
/> />
)} )}
<div className="CompositionArea__toggle-large"> <div className="CompositionArea__toggle-large">
<button <button
type="button" type="button"

View file

@ -802,15 +802,16 @@ export function StoryViewer({
))} ))}
</div> </div>
<div className="StoryViewer__actions"> <div className="StoryViewer__actions">
{sendStatus === ResolvedSendStatus.Failed && !wasManuallyRetried && ( {sendStatus === ResolvedSendStatus.Failed &&
<button !wasManuallyRetried && (
className="StoryViewer__actions__failed" <button
onClick={doRetryMessageSend} className="StoryViewer__actions__failed"
type="button" onClick={doRetryMessageSend}
> type="button"
{i18n('StoryViewer__failed')} >
</button> {i18n('StoryViewer__failed')}
)} </button>
)}
{sendStatus === ResolvedSendStatus.PartiallySent && {sendStatus === ResolvedSendStatus.PartiallySent &&
!wasManuallyRetried && ( !wasManuallyRetried && (
<button <button