Skip to content

Commit ae9f909

Browse files
fix(android): proguardUuid loading (#3591)
1 parent 7835531 commit ae9f909

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ This release contains upgrade of `sentry-android` dependency to major version 7.
1111
### Fixes
1212

1313
- Upload Debug Symbols Build Phase continues when `node` not found in `WITH_ENVIRONMENT` ([#3573](https://github.com/getsentry/sentry-react-native/pull/3573))
14+
- Fix `proguardUuid` loading on Android ([#3591](https://github.com/getsentry/sentry-react-native/pull/3591))
1415

1516
### Dependencies
1617

android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

+13-3
Original file line numberDiff line numberDiff line change
@@ -731,11 +731,21 @@ public WritableMap stopProfiling() {
731731
return proguardUuid;
732732
}
733733
isProguardDebugMetaLoaded = true;
734-
final @Nullable Properties debugMeta = (new AssetsDebugMetaLoader(this.getReactApplicationContext(), logger)).loadDebugMeta();
735-
if (debugMeta != null) {
734+
final @Nullable List<Properties> debugMetaList = (new AssetsDebugMetaLoader(this.getReactApplicationContext(),
735+
logger)).loadDebugMeta();
736+
if (debugMetaList == null) {
737+
return null;
738+
}
739+
740+
for (Properties debugMeta : debugMetaList) {
736741
proguardUuid = DebugMetaPropertiesApplier.getProguardUuid(debugMeta);
737-
return proguardUuid;
742+
if (proguardUuid != null) {
743+
logger.log(SentryLevel.INFO, "Proguard uuid found: " + proguardUuid);
744+
return proguardUuid;
745+
}
738746
}
747+
748+
logger.log(SentryLevel.WARNING, "No proguard uuid found in debug meta properties file!");
739749
return null;
740750
}
741751

0 commit comments

Comments
 (0)