Skip to content

Commit f8ae811

Browse files
committed
Address review comment.
1 parent 2f58490 commit f8ae811

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

firebase-common/src/main/java/com/google/firebase/FirebaseCommonRegistrar.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public List<Component<?>> getComponents() {
4747
result.add(
4848
LibraryVersionComponent.create(FIREBASE_ANDROID, String.valueOf(Build.VERSION.SDK_INT)));
4949
result.add(LibraryVersionComponent.create(FIREBASE_COMMON, BuildConfig.VERSION_NAME));
50-
result.add(LibraryVersionComponent.create(DEVICE_NAME, removeSpaces(Build.PRODUCT)));
51-
result.add(LibraryVersionComponent.create(DEVICE_MODEL, removeSpaces(Build.DEVICE)));
52-
result.add(LibraryVersionComponent.create(DEVICE_BRAND, removeSpaces(Build.BRAND)));
50+
result.add(LibraryVersionComponent.create(DEVICE_NAME, safeValue(Build.PRODUCT)));
51+
result.add(LibraryVersionComponent.create(DEVICE_MODEL, safeValue(Build.DEVICE)));
52+
result.add(LibraryVersionComponent.create(DEVICE_BRAND, safeValue(Build.BRAND)));
5353
result.add(
5454
LibraryVersionComponent.fromContext(
5555
TARGET_SDK,
@@ -98,7 +98,7 @@ public List<Component<?>> getComponents() {
9898
ctx -> {
9999
String installer =
100100
ctx.getPackageManager().getInstallerPackageName(ctx.getPackageName());
101-
return (installer != null) ? removeSpaces(installer) : "";
101+
return (installer != null) ? safeValue(installer) : "";
102102
}));
103103

104104
String kotlinVersion = KotlinDetector.detectVersion();
@@ -108,7 +108,7 @@ public List<Component<?>> getComponents() {
108108
return result;
109109
}
110110

111-
private static String removeSpaces(String value) {
112-
return value.replace(' ', '_');
111+
private static String safeValue(String value) {
112+
return value.replace(' ', '_').replace('/', '_');
113113
}
114114
}

firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ public void test_installerPackage_withNoInstallerSet() {
160160
@Test
161161
public void test_installerPackage_withInstallerSet() {
162162

163-
String installer = "com.example store";
164-
String safeInstaller = "com.example_store";
163+
String installer = "com/example store";
164+
String safeInstaller = "com_example_store";
165165
ApplicationProvider.getApplicationContext()
166166
.getPackageManager()
167167
.setInstallerPackageName(

0 commit comments

Comments
 (0)