Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cozy/cozy-flagship-app
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 89689824208e2273778c23d625446d0fdf1476e0
Choose a base ref
..
head repository: cozy/cozy-flagship-app
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b1a62fa0e25dbaa2154f46f83e25886759c71cb
Choose a head ref
5 changes: 3 additions & 2 deletions src/app/domain/authentication/services/SynchronizeService.ts
Original file line number Diff line number Diff line change
@@ -52,8 +52,9 @@ export const checkClientName = async (client: CozyClient): Promise<void> => {
}

export const synchronizeOnInit = async (client: CozyClient): Promise<void> => {
return new Promise((resolve, reject) => {
setTimeout(async () => {
return new Promise(resolve => {
// eslint-disable-next-line @typescript-eslint/no-misused-promises
setTimeout(async (): Promise<void> => {
await checkClientName(client)
await synchronizeDevice(client)
resolve()
4 changes: 3 additions & 1 deletion src/app/domain/performances/sendPerformancesByEmail.ts
Original file line number Diff line number Diff line change
@@ -23,7 +23,9 @@ import { normalizeFqdn } from '/libs/functions/stringHelpers'

const log = Minilog('🗒️ Performances Mailer')

export const sendPerformancesByEmail = async (client?: CozyClient): Promise<void> => {
export const sendPerformancesByEmail = async (
client?: CozyClient
): Promise<void> => {
log.info('Send Performances by email')
log.debug(getPerformancesLogs())

4 changes: 3 additions & 1 deletion src/components/webviews/CozyProxyWebView.functions.js
Original file line number Diff line number Diff line change
@@ -144,7 +144,9 @@ const getPlaformSpecificConfig = (uri, html) => {
* @returns true if the WebView rendering should be prevented, false otherwise
*/
const doesOauthClientsLimitPreventsLoading = async (client, slug, href) => {
const markName = rnperformance.mark(`doesOauthClientsLimitPreventsLoading ${slug}`)
const markName = rnperformance.mark(
`doesOauthClientsLimitPreventsLoading ${slug}`
)
const isOauthClientsLimitExeeded = await checkOauthClientsLimit(client)

if (isOauthClientsLimitExeeded) {
3 changes: 2 additions & 1 deletion src/hooks/useAppBootstrap.js
Original file line number Diff line number Diff line change
@@ -178,7 +178,8 @@ export const useAppBootstrap = client => {
return
}

client && setTimeout(() => manageIconCache(client), MANAGE_ICON_CACHE_DELAY_IN_MS)
client &&
setTimeout(() => manageIconCache(client), MANAGE_ICON_CACHE_DELAY_IN_MS)
client && setSentryTag(SentryCustomTags.Instance, client.stackClient?.uri)

const subscription = Linking.addEventListener('url', ({ url }) => {
4 changes: 3 additions & 1 deletion src/libs/client.js
Original file line number Diff line number Diff line change
@@ -7,7 +7,9 @@ import Minilog from 'cozy-minilog'

import { normalizeFqdn } from './functions/stringHelpers'

import rnperformance, { CozyClientPerformanceApi } from '/app/domain/performances/measure'
import rnperformance, {
CozyClientPerformanceApi
} from '/app/domain/performances/measure'
import { getErrorMessage } from '/libs/functions/getErrorMessage'
import {
listenTokenRefresh,
4 changes: 3 additions & 1 deletion src/libs/intents/flagshipLink.ts
Original file line number Diff line number Diff line change
@@ -13,7 +13,9 @@ export const flagshipLinkRequest = async (
operation: QueryDefinition,
client: CozyClient | undefined
): Promise<QueryResult> => {
const markName = rnperformance.mark(`FlagshipLinkRequest ${operation.doctype} ${uniqueId()}`)
const markName = rnperformance.mark(
`FlagshipLinkRequest ${operation.doctype} ${uniqueId()}`
)
try {
if (!client) {
throw new Error(
15 changes: 9 additions & 6 deletions src/libs/localStore/storage.ts
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ const log = logger('storage.ts')

export const storage = new MMKV()

const { setItem, getItem, removeItem, clear } = AsyncStorage
const { getItem, removeItem, clear } = AsyncStorage

export type StorageKey = CozyPersistedStorageKeys | DevicePersistedStorageKeys

@@ -74,14 +74,15 @@ export interface StorageItems {
export const storeData = async (
name: StorageKey,
value: StorageItems[keyof StorageItems]
// eslint-disable-next-line @typescript-eslint/require-await
): Promise<void> => {
try {
const markName = rnperformance.mark(`setData ${name}`)
storage.set(name, JSON.stringify(value))

rnperformance.measure({
markName: markName,
category: 'AsyncStorageSet',
category: 'AsyncStorageSet'
})
} catch (error) {
log.error(`Failed to store key "${name}" to persistent storage`, error)
@@ -95,9 +96,11 @@ export const getData = async <T>(name: StorageKey): Promise<T | null> => {

rnperformance.measure({
markName: markName,
category: 'AsyncStorageGet',
category: 'AsyncStorageGet'
})
return value !== null && value !== undefined ? (JSON.parse(value) as T) : null
return value !== null && value !== undefined
? (JSON.parse(value) as T)
: null
} catch (error) {
/*
If we tried to parse the default redirection url and it failed, we return it as is
@@ -166,7 +169,7 @@ export async function migrateFromAsyncStorage(): Promise<void> {
// if (['true', 'false'].includes(value)) {
// storage.set(key, value === 'true')
// } else {
storage.set(key, value)
storage.set(key, value)
// }
}
} catch (error) {
@@ -182,7 +185,7 @@ export async function migrateFromAsyncStorage(): Promise<void> {

rnperformance.measure({
markName: markName,
category: 'AsyncStorageMigration',
category: 'AsyncStorageMigration'
})
log.info(`Migrated from AsyncStorage -> MMKV!`)
}
5 changes: 4 additions & 1 deletion src/pouchdb/getLinks.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import RNRestart from 'react-native-restart'

import { PouchLinkPerformanceApi, StackLinkPerformanceApi } from '/app/domain/performances/measure'
import {
PouchLinkPerformanceApi,
StackLinkPerformanceApi
} from '/app/domain/performances/measure'
import { platformReactNative } from '/pouchdb/platformReactNative'

import CozyClient, { CozyLink, StackLink } from 'cozy-client'