Skip to content

Commit 4882bef

Browse files
Fiona2016Fiona2016
committed
refactor: replace reference
1 parent 68e1306 commit 4882bef

98 files changed

Lines changed: 358 additions & 359 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dd-sdk-android-core/api/dd-sdk-android-core.api‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ public final class cloud/flashcat/android/BuildConfig {
99
public fun <init> ()V
1010
}
1111

12-
public final class cloud/flashcat/android/Datadog {
13-
public static final field INSTANCE Lcloud/flashcat/android/Datadog;
12+
public final class cloud/flashcat/android/Flashcat {
13+
public static final field INSTANCE Lcloud/flashcat/android/Flashcat;
1414
public final fun _internalProxy (Ljava/lang/String;)Lcloud/flashcat/android/_InternalProxy;
15-
public static synthetic fun _internalProxy$default (Lcloud/flashcat/android/Datadog;Ljava/lang/String;ILjava/lang/Object;)Lcloud/flashcat/android/_InternalProxy;
15+
public static synthetic fun _internalProxy$default (Lcloud/flashcat/android/Flashcat;Ljava/lang/String;ILjava/lang/Object;)Lcloud/flashcat/android/_InternalProxy;
1616
public static final fun addAccountExtraInfo (Ljava/util/Map;)V
1717
public static final fun addAccountExtraInfo (Ljava/util/Map;Lcloud/flashcat/android/api/SdkCore;)V
1818
public static synthetic fun addAccountExtraInfo$default (Ljava/util/Map;Lcloud/flashcat/android/api/SdkCore;ILjava/lang/Object;)V

dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/Datadog.kt renamed to dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/Flashcat.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package cloud.flashcat.android
1010
import android.content.Context
1111
import androidx.annotation.AnyThread
1212
import androidx.annotation.WorkerThread
13-
import cloud.flashcat.android.Datadog.clearAccountInfo
13+
import cloud.flashcat.android.Flashcat.clearAccountInfo
1414
import cloud.flashcat.android.api.InternalLogger
1515
import cloud.flashcat.android.api.SdkCore
1616
import cloud.flashcat.android.api.context.UserInfo
@@ -32,7 +32,7 @@ import java.util.Locale
3232
* This class initializes the Datadog SDK, and sets up communication with the server.
3333
*/
3434
@Suppress("TooManyFunctions")
35-
object Datadog {
35+
object Flashcat {
3636

3737
internal val registry = SdkCoreRegistry(unboundInternalLogger)
3838

dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/DatadogSite.kt renamed to dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/FlashcatSite.kt

File renamed without changes.

‎dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/core/SdkReference.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
package cloud.flashcat.android.core
99

10-
import cloud.flashcat.android.Datadog
10+
import cloud.flashcat.android.Flashcat
1111
import cloud.flashcat.android.api.SdkCore
1212
import cloud.flashcat.android.core.internal.DatadogCore
1313
import java.util.concurrent.atomic.AtomicReference
@@ -58,8 +58,8 @@ constructor(
5858
@Suppress("IfThenToElvis") // Less readable
5959
if (current != null) {
6060
current
61-
} else if (Datadog.isInitialized(sdkInstanceName)) {
62-
val sdkCore = Datadog.getInstance(sdkInstanceName)
61+
} else if (Flashcat.isInitialized(sdkInstanceName)) {
62+
val sdkCore = Flashcat.getInstance(sdkInstanceName)
6363
reference.set(sdkCore)
6464
onSdkInstanceCaptured(sdkCore)
6565
sdkCore

‎dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/core/UploadWorker.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import android.content.Context
1111
import androidx.annotation.WorkerThread
1212
import androidx.work.Worker
1313
import androidx.work.WorkerParameters
14-
import cloud.flashcat.android.Datadog
14+
import cloud.flashcat.android.Flashcat
1515
import cloud.flashcat.android.api.InternalLogger
1616
import cloud.flashcat.android.api.context.DatadogContext
1717
import cloud.flashcat.android.api.storage.RawBatchEvent
@@ -53,7 +53,7 @@ class UploadWorker(
5353
// be uploaded we put retry task to the end of queue, so that batches of other features
5454
// have a chance to go.
5555
val instanceName = inputData.getString(DATADOG_INSTANCE_NAME)
56-
val sdkCore = Datadog.getInstance(instanceName) as? InternalSdkCore
56+
val sdkCore = Flashcat.getInstance(instanceName) as? InternalSdkCore
5757
if (sdkCore == null || sdkCore is NoOpInternalSdkCore) {
5858
unboundInternalLogger.log(
5959
InternalLogger.Level.ERROR,

‎dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/core/configuration/Configuration.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
package cloud.flashcat.android.core.configuration
99

10-
import cloud.flashcat.android.Datadog
10+
import cloud.flashcat.android.Flashcat
1111
import cloud.flashcat.android.FlashcatSite
1212
import cloud.flashcat.android.core.persistence.PersistenceStrategy
1313
import cloud.flashcat.android.security.Encryption
@@ -18,7 +18,7 @@ import java.net.Proxy
1818
/**
1919
* An object describing the configuration of the Datadog SDK.
2020
*
21-
* This is necessary to initialize the SDK with the [Datadog.initialize] method.
21+
* This is necessary to initialize the SDK with the [Flashcat.initialize] method.
2222
*/
2323
data class Configuration
2424
internal constructor(

‎dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/core/internal/CoreFeature.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import android.os.Process
1616
import androidx.annotation.RequiresApi
1717
import androidx.annotation.WorkerThread
1818
import cloud.flashcat.android.BuildConfig
19-
import cloud.flashcat.android.Datadog
19+
import cloud.flashcat.android.Flashcat
2020
import cloud.flashcat.android.FlashcatSite
2121
import cloud.flashcat.android.api.InternalLogger
2222
import cloud.flashcat.android.api.storage.RawBatchEvent
@@ -278,7 +278,7 @@ internal class CoreFeature(
278278
// Because all our persisting components are working asynchronously this will avoid
279279
// having corrupted data (data from previous process over - written in this process into the
280280
// ndk crash folder before the crash was actually handled)
281-
val nativeSourceOverride = configuration.additionalConfig[Datadog.DD_NATIVE_SOURCE_TYPE] as? String
281+
val nativeSourceOverride = configuration.additionalConfig[Flashcat.DD_NATIVE_SOURCE_TYPE] as? String
282282
prepareNdkCrashData(nativeSourceOverride)
283283
setupInfoProviders(appContext, consent)
284284
initialized.set(true)

‎dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/core/internal/DatadogCore.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import android.os.Build
1414
import android.util.Log
1515
import androidx.annotation.AnyThread
1616
import androidx.annotation.WorkerThread
17-
import cloud.flashcat.android.Datadog
17+
import cloud.flashcat.android.Flashcat
1818
import cloud.flashcat.android.api.InternalLogger
1919
import cloud.flashcat.android.api.SdkCore
2020
import cloud.flashcat.android.api.context.DatadogContext
@@ -451,7 +451,7 @@ internal class DatadogCore(
451451
if (isDebug and configuration.coreConfig.enableDeveloperModeWhenDebuggable) {
452452
mutableConfig = modifyConfigurationForDeveloperDebug(configuration)
453453
isDeveloperModeEnabled = true
454-
Datadog.setVerbosity(Log.VERBOSE)
454+
Flashcat.setVerbosity(Log.VERBOSE)
455455
}
456456

457457
// always initialize Core Features first
@@ -509,19 +509,19 @@ internal class DatadogCore(
509509
// NOTE: be careful with the logic in this method - it is a part of initialization sequence,
510510
// so some things may yet not be initialized -> not accessible, some things may already be
511511
// initialized and be not mutable anymore
512-
additionalConfiguration[Datadog.DD_SOURCE_TAG]?.let {
512+
additionalConfiguration[Flashcat.DD_SOURCE_TAG]?.let {
513513
if (it is String && it.isNotBlank()) {
514514
coreFeature.sourceName = it
515515
}
516516
}
517517

518-
additionalConfiguration[Datadog.DD_SDK_VERSION_TAG]?.let {
518+
additionalConfiguration[Flashcat.DD_SDK_VERSION_TAG]?.let {
519519
if (it is String && it.isNotBlank()) {
520520
coreFeature.sdkVersion = it
521521
}
522522
}
523523

524-
additionalConfiguration[Datadog.DD_APP_VERSION_TAG]?.let {
524+
additionalConfiguration[Flashcat.DD_APP_VERSION_TAG]?.let {
525525
if (it is String && it.isNotBlank()) {
526526
coreFeature.packageVersionProvider.version = it
527527
}

‎dd-sdk-android-core/src/main/kotlin/cloud/flashcat/android/core/internal/logger/SdkInternalLogger.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package cloud.flashcat.android.core.internal.logger
99

1010
import android.util.Log
1111
import cloud.flashcat.android.BuildConfig
12-
import cloud.flashcat.android.Datadog
12+
import cloud.flashcat.android.Flashcat
1313
import cloud.flashcat.android.api.InternalLogger
1414
import cloud.flashcat.android.api.feature.Feature
1515
import cloud.flashcat.android.api.feature.FeatureSdkCore
@@ -25,7 +25,7 @@ internal class SdkInternalLogger(
2525
private val sdkCore: FeatureSdkCore?,
2626
userLogHandlerFactory: () -> LogcatLogHandler = {
2727
LogcatLogHandler(DEV_LOG_TAG) { level ->
28-
level >= Datadog.getVerbosity()
28+
level >= Flashcat.getVerbosity()
2929
}
3030
},
3131
maintainerLogHandlerFactory: () -> LogcatLogHandler? = {
@@ -39,7 +39,7 @@ internal class SdkInternalLogger(
3939

4040
/**
4141
* This logger is meant for user's debugging purposes.
42-
* Logcat logs are conditioned by the [Datadog.libraryVerbosity].
42+
* Logcat logs are conditioned by the [Flashcat.libraryVerbosity].
4343
* No Datadog logs should be sent.
4444
*/
4545
internal val userLogger = userLogHandlerFactory.invoke()

0 commit comments

Comments
 (0)