Skip to content

Commit dd223c9

Browse files
HubertBerHubertBer
committed
rebase artifacts
1 parent 8aca24d commit dd223c9

File tree

5 files changed

+50
-44
lines changed

5 files changed

+50
-44
lines changed

‎apps/expo-go/android/expoview/src/main/java/host/exp/exponent/ExpoUpdatesAppLoader.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,13 @@ class ExpoUpdatesAppLoader @JvmOverloads constructor(
164164
return
165165
}
166166
val logger = UpdatesLogger(context.filesDir)
167-
val fileDownloader = FileDownloader(context.filesDir, EASClientID(context).uuid.toString(), configuration, logger)
167+
val fileDownloader = FileDownloader(
168+
context.filesDir,
169+
EASClientID(context).uuid.toString(),
170+
configuration,
171+
logger,
172+
databaseHolder.database
173+
)
168174
loaderScope.launch {
169175
startLoaderTask(configuration, fileDownloader, directory, selectionPolicy, context, logger)
170176
}

‎apps/expo-go/ios/Client/HomeAppLoader.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class HomeAppLoader: AppLoader {
2828
completionQueue: DispatchQueue
2929
) {
3030
self.manifestAndAssetRequestHeaders = manifestAndAssetRequestHeaders
31-
self.downloader = FileDownloader(config: config, logger: logger)
31+
self.downloader = FileDownloader(config: config, logger: logger, updatesDirectory: directory, database: database)
3232
self.completionQueue = completionQueue
3333
super.init(config: config, logger: logger, database: database, directory: directory, launchedUpdate: launchedUpdate, completionQueue: completionQueue)
3434
}

‎apps/expo-go/ios/Exponent/Versioned/Core/VersionManager.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ final class VersionManager: EXVersionManagerObjC {
9393
log.error("Unable to register Expo modules, the app context or kernel services is unavailable")
9494
return
9595
}
96-
appContext.moduleRegistry.register(module: ExpoGoModule(appContext: appContext, manifest: manifest))
96+
appContext.moduleRegistry.register(module: ExpoGoModule(appContext: appContext, manifest: manifest), name: nil)
9797

9898
guard let updatesKernelService = kernelServices["EXUpdatesManager"] as? UpdatesBindingDelegate else {
9999
log.error("Unable to register Expo modules, the app context or kernel services is unavailable")
@@ -105,7 +105,7 @@ final class VersionManager: EXVersionManagerObjC {
105105
appContext: appContext,
106106
updatesKernelService: updatesKernelService,
107107
scopeKey: manifest.scopeKey()
108-
), preventModuleOverriding: true)
108+
), name: nil, preventModuleOverriding: true)
109109

110110
// Override expo-notifications modules
111111
registerExpoNotificationsModules(appContext)
@@ -121,7 +121,7 @@ final class VersionManager: EXVersionManagerObjC {
121121
ExpoGoNotificationsServerRegistrationModule(appContext: appContext, scopeKey: manifest.scopeKey())
122122
]
123123
for module in modules {
124-
appContext.moduleRegistry.register(module: module, preventModuleOverriding: true)
124+
appContext.moduleRegistry.register(module: module, name: nil, preventModuleOverriding: true)
125125
}
126126
}
127127

‎apps/native-component-list/src/screens/AppIntegrity/AppIntegrityScreen.android.tsx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function AppIntegrityAndroidScreen() {
2121
useEffect(() => {
2222
const checkHardwareAttestationSupport = async () => {
2323
try {
24-
const supported = await AppIntegrity.isHardwareAttestationSupported();
24+
const supported = await AppIntegrity.isHardwareAttestationSupportedAsync();
2525
setHardwareAttestationSupported(supported);
2626
addResult(`Hardware attestation supported: ${supported}`);
2727
} catch (error) {
@@ -36,10 +36,10 @@ export default function AppIntegrityAndroidScreen() {
3636
const testPrepareIntegrityTokenProvider = async () => {
3737
setIsLoading(true);
3838
try {
39-
await AppIntegrity.prepareIntegrityTokenProvider('1234567890');
40-
addResult('prepareIntegrityTokenProvider: Success');
39+
await AppIntegrity.prepareIntegrityTokenProviderAsync('1234567890');
40+
addResult('prepareIntegrityTokenProviderAsync: Success');
4141
} catch (error) {
42-
addResult(`prepareIntegrityTokenProvider error: ${error}`);
42+
addResult(`prepareIntegrityTokenProviderAsync error: ${error}`);
4343
} finally {
4444
setIsLoading(false);
4545
}
@@ -49,10 +49,10 @@ export default function AppIntegrityAndroidScreen() {
4949
setIsLoading(true);
5050
try {
5151
const challenge = 'test-challenge-' + Date.now();
52-
const token = await AppIntegrity.requestIntegrityCheck(challenge);
53-
addResult(`requestIntegrityCheck: Success (token length: ${token.length})`);
52+
const token = await AppIntegrity.requestIntegrityCheckAsync(challenge);
53+
addResult(`requestIntegrityCheckAsync: Success (token length: ${token.length})`);
5454
} catch (error) {
55-
addResult(`requestIntegrityCheck error: ${error}`);
55+
addResult(`requestIntegrityCheckAsync error: ${error}`);
5656
} finally {
5757
setIsLoading(false);
5858
}
@@ -61,12 +61,12 @@ export default function AppIntegrityAndroidScreen() {
6161
const testFullFlow = async () => {
6262
setIsLoading(true);
6363
try {
64-
await AppIntegrity.prepareIntegrityTokenProvider('1234567890');
65-
addResult('prepareIntegrityTokenProvider: Success');
64+
await AppIntegrity.prepareIntegrityTokenProviderAsync('1234567890');
65+
addResult('prepareIntegrityTokenProviderAsync: Success');
6666

6767
const challenge = 'test-challenge-' + Date.now();
68-
const token = await AppIntegrity.requestIntegrityCheck(challenge);
69-
addResult(`requestIntegrityCheck: Success (token length: ${token.length})`);
68+
const token = await AppIntegrity.requestIntegrityCheckAsync(challenge);
69+
addResult(`requestIntegrityCheckAsync: Success (token length: ${token.length})`);
7070
} catch (error) {
7171
addResult(`Full flow error: ${error}`);
7272
} finally {
@@ -80,11 +80,11 @@ export default function AppIntegrityAndroidScreen() {
8080
const keyAlias = 'test_key';
8181
const challenge = 'hw_challenge';
8282

83-
await AppIntegrity.generateHardwareAttestedKey(keyAlias, challenge);
84-
addResult(`generateHardwareAttestedKey: Success (alias: ${keyAlias})`);
83+
await AppIntegrity.generateHardwareAttestedKeyAsync(keyAlias, challenge);
84+
addResult(`generateHardwareAttestedKeyAsync: Success (alias: ${keyAlias})`);
8585
setLastGeneratedKeyAlias(keyAlias);
8686
} catch (error) {
87-
addResult(`generateHardwareAttestedKey error: ${error}`);
87+
addResult(`generateHardwareAttestedKeyAsync error: ${error}`);
8888
} finally {
8989
setIsLoading(false);
9090
}
@@ -98,7 +98,7 @@ export default function AppIntegrityAndroidScreen() {
9898
addResult(`No key alias found. Please generate a key first.`);
9999
return;
100100
}
101-
const certificates = await AppIntegrity.getAttestationCertificateChain(keyAlias);
101+
const certificates = await AppIntegrity.getAttestationCertificateChainAsync(keyAlias);
102102

103103
addResult(`getAttestationCertificateChain: Success`);
104104
addResult(`Certificate chain length: ${certificates.length}`);
@@ -120,10 +120,10 @@ export default function AppIntegrityAndroidScreen() {
120120
const keyAlias = 'full_flow_key';
121121
const challenge = 'full_challenge';
122122

123-
await AppIntegrity.generateHardwareAttestedKey(keyAlias, challenge);
123+
await AppIntegrity.generateHardwareAttestedKeyAsync(keyAlias, challenge);
124124
addResult(`✓ Generated hardware-attested key: ${keyAlias}`);
125125

126-
const certificates = await AppIntegrity.getAttestationCertificateChain(keyAlias);
126+
const certificates = await AppIntegrity.getAttestationCertificateChainAsync(keyAlias);
127127
addResult(`✓ Retrieved certificate chain (${certificates.length} certificates)`);
128128
// console.log('certificates ', certificates);
129129

@@ -161,11 +161,11 @@ export default function AppIntegrityAndroidScreen() {
161161
style={styles.button}
162162
onPress={testPrepareIntegrityTokenProvider}
163163
disabled={isLoading}>
164-
<Text style={styles.buttonText}>Test prepareIntegrityTokenProvider</Text>
164+
<Text style={styles.buttonText}>Test prepareIntegrityTokenProviderAsync</Text>
165165
</Pressable>
166166

167167
<Pressable style={styles.button} onPress={testRequestIntegrityCheck} disabled={isLoading}>
168-
<Text style={styles.buttonText}>Test requestIntegrityCheck</Text>
168+
<Text style={styles.buttonText}>Test requestIntegrityCheckAsync</Text>
169169
</Pressable>
170170

171171
<Pressable style={styles.button} onPress={testFullFlow} disabled={isLoading}>

‎apps/native-component-list/src/screens/AppIntegrity/AppIntegrityScreen.ios.tsx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,28 @@ export default function AppIntegrityIOSScreen() {
1414
setResults([]);
1515
};
1616

17-
const testGenerateKey = async () => {
17+
const testGenerateKeyAsync = async () => {
1818
setIsLoading(true);
1919
try {
20-
const key = await AppIntegrity.generateKey();
21-
addResult(`generateKey: Success (key: ${key})`);
20+
const key = await AppIntegrity.generateKeyAsync();
21+
addResult(`generateKeyAsync: Success (key: ${key})`);
2222
} catch (error) {
23-
addResult(`generateKey error: ${error}`);
23+
addResult(`generateKeyAsync error: ${error}`);
2424
} finally {
2525
setIsLoading(false);
2626
}
2727
};
2828

29-
const testAttestKey = async () => {
29+
const testAttestKeyAsync = async () => {
3030
setIsLoading(true);
3131
try {
32-
const key = await AppIntegrity.generateKey();
32+
const key = await AppIntegrity.generateKeyAsync();
3333
addResult(`Generated key: ${key}`);
3434
const challenge = 'test-challenge-' + Date.now();
35-
const attestation = await AppIntegrity.attestKey(key, challenge);
36-
addResult(`attestKey: Success (attestation length: ${attestation.length})`);
35+
const attestation = await AppIntegrity.attestKeyAsync(key, challenge);
36+
addResult(`attestKeyAsync: Success (attestation length: ${attestation.length})`);
3737
} catch (error) {
38-
addResult(`attestKey error: ${error}`);
38+
addResult(`attestKeyAsync error: ${error}`);
3939
} finally {
4040
setIsLoading(false);
4141
}
@@ -44,14 +44,14 @@ export default function AppIntegrityIOSScreen() {
4444
const testAssertion = async () => {
4545
setIsLoading(true);
4646
try {
47-
const key = await AppIntegrity.generateKey();
48-
addResult(`generateKey: Success (key: ${key})`);
47+
const key = await AppIntegrity.generateKeyAsync();
48+
addResult(`generateKeyAsync: Success (key: ${key})`);
4949
const challenge = 'test-challenge-' + Date.now();
50-
const attestation = await AppIntegrity.attestKey(key, challenge);
51-
addResult(`attestKey: Success (attestation length: ${attestation.length})`);
50+
const attestation = await AppIntegrity.attestKeyAsync(key, challenge);
51+
addResult(`attestKeyAsync: Success (attestation length: ${attestation.length})`);
5252
const challengeData = JSON.stringify({ timestamp: Date.now(), test: true });
53-
const assertion = await AppIntegrity.generateAssertion(key, challengeData);
54-
addResult(`generateAssertion: Success (assertion length: ${assertion.length})`);
53+
const assertion = await AppIntegrity.generateAssertionAsync(key, challengeData);
54+
addResult(`generateAssertionAsync: Success (assertion length: ${assertion.length})`);
5555
} catch (error) {
5656
addResult(`Full flow error: ${error}`);
5757
} finally {
@@ -67,16 +67,16 @@ export default function AppIntegrityIOSScreen() {
6767
<Text style={styles.subtitle}>isSupported: {AppIntegrity.isSupported.toString()}</Text>
6868
</View>
6969
<View style={styles.buttonContainer}>
70-
<Pressable style={styles.button} onPress={testGenerateKey} disabled={isLoading}>
71-
<Text style={styles.buttonText}>Test generateKey</Text>
70+
<Pressable style={styles.button} onPress={testGenerateKeyAsync} disabled={isLoading}>
71+
<Text style={styles.buttonText}>Test generateKeyAsync</Text>
7272
</Pressable>
7373

74-
<Pressable style={styles.button} onPress={testAttestKey} disabled={isLoading}>
75-
<Text style={styles.buttonText}>Test attestKey</Text>
74+
<Pressable style={styles.button} onPress={testAttestKeyAsync} disabled={isLoading}>
75+
<Text style={styles.buttonText}>Test attestKeyAsync</Text>
7676
</Pressable>
7777

7878
<Pressable style={styles.button} onPress={testAssertion} disabled={isLoading}>
79-
<Text style={styles.buttonText}>Test Assertion</Text>
79+
<Text style={styles.buttonText}>Test generateAssertionAsync</Text>
8080
</Pressable>
8181

8282
<Pressable style={[styles.button, styles.clearButton]} onPress={clearResults}>

0 commit comments

Comments
 (0)