Remove most uses of desktop.pnp remote config
This commit is contained in:
parent
78fbd8c8ce
commit
d31d6474fe
2 changed files with 2 additions and 6 deletions
|
@ -23,7 +23,6 @@ export type ConfigKeyType =
|
||||||
| 'desktop.mediaQuality.levels'
|
| 'desktop.mediaQuality.levels'
|
||||||
| 'desktop.messageCleanup'
|
| 'desktop.messageCleanup'
|
||||||
| 'desktop.pnp'
|
| 'desktop.pnp'
|
||||||
| 'desktop.pnp.accountE164Deprecation'
|
|
||||||
| 'desktop.retryRespondMaxAge'
|
| 'desktop.retryRespondMaxAge'
|
||||||
| 'desktop.senderKey.retry'
|
| 'desktop.senderKey.retry'
|
||||||
| 'desktop.senderKeyMaxAge'
|
| 'desktop.senderKeyMaxAge'
|
||||||
|
|
|
@ -62,7 +62,6 @@ import type {
|
||||||
} from '../sql/Interface';
|
} from '../sql/Interface';
|
||||||
import dataInterface from '../sql/Client';
|
import dataInterface from '../sql/Client';
|
||||||
import { MY_STORY_ID, StorySendMode } from '../types/Stories';
|
import { MY_STORY_ID, StorySendMode } from '../types/Stories';
|
||||||
import * as RemoteConfig from '../RemoteConfig';
|
|
||||||
import { findAndDeleteOnboardingStoryIfExists } from '../util/findAndDeleteOnboardingStoryIfExists';
|
import { findAndDeleteOnboardingStoryIfExists } from '../util/findAndDeleteOnboardingStoryIfExists';
|
||||||
import { downloadOnboardingStory } from '../util/downloadOnboardingStory';
|
import { downloadOnboardingStory } from '../util/downloadOnboardingStory';
|
||||||
import { drop } from '../util/drop';
|
import { drop } from '../util/drop';
|
||||||
|
@ -174,7 +173,7 @@ export async function toContactRecord(
|
||||||
contactRecord.username = username;
|
contactRecord.username = username;
|
||||||
}
|
}
|
||||||
const pni = conversation.getPni();
|
const pni = conversation.getPni();
|
||||||
if (pni && RemoteConfig.isEnabled('desktop.pnp')) {
|
if (pni) {
|
||||||
contactRecord.pni = toUntaggedPni(pni);
|
contactRecord.pni = toUntaggedPni(pni);
|
||||||
}
|
}
|
||||||
const profileKey = conversation.get('profileKey');
|
const profileKey = conversation.get('profileKey');
|
||||||
|
@ -989,11 +988,9 @@ export async function mergeContactRecord(
|
||||||
: undefined,
|
: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
const isPniSupported = RemoteConfig.isEnabled('desktop.pnp');
|
|
||||||
|
|
||||||
const e164 = dropNull(contactRecord.serviceE164);
|
const e164 = dropNull(contactRecord.serviceE164);
|
||||||
const { aci } = contactRecord;
|
const { aci } = contactRecord;
|
||||||
const pni = isPniSupported ? dropNull(contactRecord.pni) : undefined;
|
const pni = dropNull(contactRecord.pni);
|
||||||
const serviceId = aci || pni;
|
const serviceId = aci || pni;
|
||||||
|
|
||||||
// All contacts must have UUID
|
// All contacts must have UUID
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue