Improvements to the media editor

ts/textsecure/AccountManager.ts

@@ -43,11 +43,11 @@ import {
 import type { ServiceIdString, AciString, PniString } from '../types/ServiceId';
 import {
   ServiceIdKind,
-  normalizeAci,
   normalizePni,
   toTaggedPni,
   isUntaggedPniString,
 } from '../types/ServiceId';
+import { normalizeAci } from '../util/normalizeAci';
 import { isMoreRecentThan, isOlderThan } from '../util/timestamp';
 import { ourProfileKeyService } from '../services/ourProfileKey';
 import { assertDev, strictAssert } from '../util/assert';

ts/textsecure/ContactsParser.ts

@@ -6,7 +6,7 @@
 import protobuf from '../protobuf/wrap';
 
 import { SignalService as Proto } from '../protobuf';
-import { normalizeAci } from '../types/ServiceId';
+import { normalizeAci } from '../util/normalizeAci';
 import { DurationInSeconds } from '../util/durations';
 import * as Errors from '../types/errors';
 import * as log from '../logging/log';

ts/textsecure/MessageReceiver.ts

@@ -56,14 +56,14 @@ import { normalizeStoryDistributionId } from '../types/StoryDistributionId';
 import type { ServiceIdString } from '../types/ServiceId';
 import {
   ServiceIdKind,
-  normalizeAci,
   normalizeServiceId,
   normalizePni,
-  isAciString,
   isPniString,
   isServiceIdString,
   fromPniObject,
 } from '../types/ServiceId';
+import { normalizeAci } from '../util/normalizeAci';
+import { isAciString } from '../util/isAciString';
 import * as Errors from '../types/errors';
 
 import { SignalService as Proto } from '../protobuf';

ts/textsecure/ProvisioningCipher.ts

@@ -13,7 +13,8 @@ import {
 import { calculateAgreement, createKeyPair, generateKeyPair } from '../Curve';
 import { SignalService as Proto } from '../protobuf';
 import type { PniString, AciString } from '../types/ServiceId';
-import { normalizeAci, normalizePni } from '../types/ServiceId';
+import { normalizePni } from '../types/ServiceId';
+import { normalizeAci } from '../util/normalizeAci';
 import { strictAssert } from '../util/assert';
 
 type ProvisionDecryptResult = {

ts/textsecure/cds/CDSSocketBase.ts

@@ -9,11 +9,8 @@ import Long from 'long';
 
 import type { LoggerType } from '../../types/Logging';
 import { strictAssert } from '../../util/assert';
-import {
-  isAciString,
-  isUntaggedPniString,
-  toTaggedPni,
-} from '../../types/ServiceId';
+import { isUntaggedPniString, toTaggedPni } from '../../types/ServiceId';
+import { isAciString } from '../../util/isAciString';
 import * as Bytes from '../../Bytes';
 import { UUID_BYTE_SIZE } from '../../Crypto';
 import { uuidToBytes, bytesToUuid } from '../../util/uuidToBytes';

ts/textsecure/processDataMessage.ts

@@ -29,7 +29,8 @@ import { SECOND, DurationInSeconds } from '../util/durations';
 import type { AnyPaymentEvent } from '../types/Payment';
 import { PaymentEventKind } from '../types/Payment';
 import { filterAndClean } from '../types/BodyRange';
-import { isAciString, normalizeAci } from '../types/ServiceId';
+import { isAciString } from '../util/isAciString';
+import { normalizeAci } from '../util/normalizeAci';
 
 const FLAGS = Proto.DataMessage.Flags;
 export const ATTACHMENT_MAX = 32;

ts/textsecure/storage/User.ts

@@ -10,7 +10,8 @@ import type {
   PniString,
   ServiceIdString,
 } from '../../types/ServiceId';
-import { ServiceIdKind, isAciString, isPniString } from '../../types/ServiceId';
+import { ServiceIdKind, isPniString } from '../../types/ServiceId';
+import { isAciString } from '../../util/isAciString';
 import * as log from '../../logging/log';
 
 import Helpers from '../Helpers';