Merge pull request #2240 from Bilb/enable-calls-remove-featureflag

Sesion 1.8.4 with calls enabled
pull/2241/head
Audric Ackermann 3 years ago committed by GitHub
commit 8d83d99b26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,7 +2,7 @@
"name": "session-desktop", "name": "session-desktop",
"productName": "Session", "productName": "Session",
"description": "Private messaging from your desktop", "description": "Private messaging from your desktop",
"version": "1.7.9", "version": "1.8.4",
"license": "GPL-3.0", "license": "GPL-3.0",
"author": { "author": {
"name": "Oxen Labs", "name": "Oxen Labs",

@ -31,7 +31,6 @@ window.getNodeVersion = () => config.node_version;
window.sessionFeatureFlags = { window.sessionFeatureFlags = {
useOnionRequests: true, useOnionRequests: true,
useCallMessage: true,
}; };
window.versionInfo = { window.versionInfo = {

@ -210,13 +210,7 @@ const CallButton = () => {
const hasOngoingCall = useSelector(getHasOngoingCall); const hasOngoingCall = useSelector(getHasOngoingCall);
const canCall = !(hasIncomingCall || hasOngoingCall); const canCall = !(hasIncomingCall || hasOngoingCall);
if ( if (!isPrivate || isMe || !selectedConvoKey || isBlocked) {
!isPrivate ||
isMe ||
!selectedConvoKey ||
isBlocked ||
!window.sessionFeatureFlags.useCallMessage
) {
return null; return null;
} }

@ -69,17 +69,16 @@ export const SettingsCategoryPrivacy = (props: {
description={window.i18n('mediaPermissionsDescription')} description={window.i18n('mediaPermissionsDescription')}
active={Boolean(window.getSettingValue('media-permissions'))} active={Boolean(window.getSettingValue('media-permissions'))}
/> />
{window.sessionFeatureFlags.useCallMessage && ( <SessionToggleWithDescription
<SessionToggleWithDescription onClickToggle={async () => {
onClickToggle={async () => { await toggleCallMediaPermissions(forceUpdate);
await toggleCallMediaPermissions(forceUpdate); forceUpdate();
forceUpdate(); }}
}} title={window.i18n('callMediaPermissionsTitle')}
title={window.i18n('callMediaPermissionsTitle')} description={window.i18n('callMediaPermissionsDescription')}
description={window.i18n('callMediaPermissionsDescription')} active={Boolean(window.getCallMediaPermissions())}
active={Boolean(window.getCallMediaPermissions())} />
/>
)}
<SessionToggleWithDescription <SessionToggleWithDescription
onClickToggle={() => { onClickToggle={() => {
const old = Boolean(window.getSettingValue(SettingsKey.settingsReadReceipt)); const old = Boolean(window.getSettingValue(SettingsKey.settingsReadReceipt));

@ -425,7 +425,7 @@ export async function innerHandleSwarmContentMessage(
if (content.unsendMessage) { if (content.unsendMessage) {
await handleUnsendMessage(envelope, content.unsendMessage as SignalService.Unsend); await handleUnsendMessage(envelope, content.unsendMessage as SignalService.Unsend);
} }
if (content.callMessage && window.sessionFeatureFlags?.useCallMessage) { if (content.callMessage) {
await handleCallMessage(envelope, content.callMessage as SignalService.CallMessage); await handleCallMessage(envelope, content.callMessage as SignalService.CallMessage);
} }
if (content.messageRequestResponse) { if (content.messageRequestResponse) {

1
ts/window.d.ts vendored

@ -38,7 +38,6 @@ declare global {
log: any; log: any;
sessionFeatureFlags: { sessionFeatureFlags: {
useOnionRequests: boolean; useOnionRequests: boolean;
useCallMessage: boolean;
}; };
SessionSnodeAPI: SessionSnodeAPI; SessionSnodeAPI: SessionSnodeAPI;
onLogin: any; onLogin: any;

Loading…
Cancel
Save