Page MenuHomePhabricator
Differential D10604

[native] Change backup file separator
ClosedPublic
Actions

Authored by michal on Jan 11 2024, 7:41 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 7, 10:52 AM
Unknown Object (File)
Fri, Feb 28, 10:45 PM
Unknown Object (File)
Fri, Feb 28, 10:45 PM
Unknown Object (File)
Mon, Feb 24, 1:28 PM
Unknown Object (File)
Jan 24 2025, 10:06 PM
Unknown Object (File)
Dec 27 2024, 7:35 PM
Unknown Object (File)
Dec 27 2024, 7:35 PM
Unknown Object (File)
Dec 27 2024, 7:35 PM
View All 51 Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
kamil
Commits
rCOMMb185d9386644: [native] Change backup file separator
Summary

Turns out generateRandomString uses _ as a possible character which conflichs with the current separator so this diff changes the separator to -.

Test Plan

Generaete filenames checked that they have -.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
native/
android/
app/
src/
main/
java/
app/
comm/
android/
fbjni/
4 lines
ios/
Comm/
4 lines

Diff 35679

View Options

native/android/app/src/main/java/app/comm/android/fbjni/PlatformSpecificTools.java

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

native/ios/Comm/PlatformSpecificTools.mm

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };