Skip to content

Commit 1d39244

Browse files
remove unused preferences class (#1200)
1 parent 61abab8 commit 1d39244

File tree

6 files changed

+1
-57
lines changed

6 files changed

+1
-57
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
demo-app/local.properties
55
.DS_Store
66
**/build/
7+
.kotlin/

core/src/test/java/io/opentelemetry/android/OpenTelemetryRumBuilderTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import io.opentelemetry.android.instrumentation.internal.AndroidInstrumentationLoaderImpl;
3737
import io.opentelemetry.android.internal.initialization.InitializationEvents;
3838
import io.opentelemetry.android.internal.services.CacheStorage;
39-
import io.opentelemetry.android.internal.services.Preferences;
4039
import io.opentelemetry.android.internal.services.Services;
4140
import io.opentelemetry.android.internal.services.applifecycle.AppLifecycle;
4241
import io.opentelemetry.android.internal.services.visiblescreen.VisibleScreenTracker;
@@ -513,7 +512,6 @@ private static Services createAndSetServiceManager() {
513512
Services services = mock(Services.class);
514513
when(services.getAppLifecycle()).thenReturn(mock(AppLifecycle.class));
515514
when(services.getCacheStorage()).thenReturn(mock(CacheStorage.class));
516-
when(services.getPreferences()).thenReturn(mock(Preferences.class));
517515
VisibleScreenTracker screenService = mock(VisibleScreenTracker.class);
518516
when(screenService.getCurrentlyVisibleScreen()).thenReturn(CUR_SCREEN_NAME);
519517
when(services.getVisibleScreenTracker()).thenReturn(screenService);

services/api/services.api

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@ public class io/opentelemetry/android/internal/services/CacheStorage {
33
public fun getCacheDir ()Ljava/io/File;
44
}
55

6-
public final class io/opentelemetry/android/internal/services/Preferences {
7-
public final fun retrieveInt (Ljava/lang/String;I)I
8-
public final fun store (Ljava/lang/String;I)V
9-
}
10-
116
public final class io/opentelemetry/android/internal/services/Services {
127
public static final field Companion Lio/opentelemetry/android/internal/services/Services$Companion;
138
public static final fun get (Landroid/app/Application;)Lio/opentelemetry/android/internal/services/Services;
149
public final fun getAppLifecycle ()Lio/opentelemetry/android/internal/services/applifecycle/AppLifecycle;
1510
public final fun getCacheStorage ()Lio/opentelemetry/android/internal/services/CacheStorage;
1611
public final fun getCurrentNetworkProvider ()Lio/opentelemetry/android/internal/services/network/CurrentNetworkProvider;
1712
public final fun getPeriodicWork ()Lio/opentelemetry/android/internal/services/periodicwork/PeriodicWork;
18-
public final fun getPreferences ()Lio/opentelemetry/android/internal/services/Preferences;
1913
public final fun getVisibleScreenTracker ()Lio/opentelemetry/android/internal/services/visiblescreen/VisibleScreenTracker;
2014
public static final fun set (Lio/opentelemetry/android/internal/services/Services;)V
2115
}

services/src/main/java/io/opentelemetry/android/internal/services/Preferences.kt

Lines changed: 0 additions & 34 deletions
This file was deleted.

services/src/main/java/io/opentelemetry/android/internal/services/Services.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ import io.opentelemetry.android.internal.services.visiblescreen.VisibleScreenTra
2222
class Services internal constructor(
2323
private val factory: ServicesFactory,
2424
) {
25-
val preferences: Preferences by lazy {
26-
factory.createPreferences()
27-
}
28-
2925
val cacheStorage: CacheStorage by lazy {
3026
factory.createCacheStorage()
3127
}
@@ -68,14 +64,6 @@ class Services internal constructor(
6864
internal class ServicesFactory(
6965
private val application: Application,
7066
) {
71-
fun createPreferences(): Preferences =
72-
Preferences(
73-
application.getSharedPreferences(
74-
"io.opentelemetry.android" + ".prefs",
75-
Context.MODE_PRIVATE,
76-
),
77-
)
78-
7967
fun createCacheStorage(): CacheStorage = CacheStorage(application)
8068

8169
fun createPeriodicWork(): PeriodicWork = PeriodicWork()

services/src/test/java/io/opentelemetry/android/internal/services/ServicesTest.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class ServicesTest {
2424
@Test
2525
fun `Verify that services are created lazily`() {
2626
val factory = mockk<ServicesFactory>()
27-
val preferences = mockk<Preferences>()
28-
every { factory.createPreferences() }.returns(preferences)
2927
val cacheStorage = mockk<CacheStorage>()
3028
every { factory.createCacheStorage() }.returns(cacheStorage)
3129
val periodicWork = mockk<PeriodicWork>()
@@ -41,7 +39,6 @@ class ServicesTest {
4139
val services = Services(factory)
4240
verify { factory wasNot Called }
4341

44-
verifyLazyCreation(preferences, services::preferences, factory::createPreferences)
4542
verifyLazyCreation(cacheStorage, services::cacheStorage, factory::createCacheStorage)
4643
verifyLazyCreation(periodicWork, services::periodicWork, factory::createPeriodicWork)
4744
verifyLazyCreation(

0 commit comments

Comments
 (0)