Skip to content

Commit

Permalink
replace android.util.Pair with kotlin.Pair (#662)
Browse files Browse the repository at this point in the history
  • Loading branch information
nelsitoPuglisi authored Apr 5, 2024
1 parent ee04914 commit 12db875
Show file tree
Hide file tree
Showing 17 changed files with 10 additions and 18 deletions.
3 changes: 3 additions & 0 deletions config/detekt/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ potential-bugs:
ElseCaseInsteadOfExhaustiveWhen:
active: true
style:
ForbiddenImport:
active: true
imports: [ 'android.util.Pair' ]
ForbiddenComment:
active: false
MagicNumber:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

package io.embrace.android.embracesdk.compose.internal

import android.util.Pair
import android.view.View
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.platform.AndroidComposeView
Expand Down
2 changes: 1 addition & 1 deletion embrace-android-sdk/api/embrace-android-sdk.api
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public abstract interface class io/embrace/android/embracesdk/internal/EmbraceIn
public abstract fun isInternalNetworkCaptureDisabled ()Z
public abstract fun isNdkEnabled ()Z
public abstract fun isNetworkSpanForwardingEnabled ()Z
public abstract fun logComposeTap (Landroid/util/Pair;Ljava/lang/String;)V
public abstract fun logComposeTap (Lkotlin/Pair;Ljava/lang/String;)V
public abstract fun logError (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Z)V
public abstract fun logHandledException (Ljava/lang/Throwable;Lio/embrace/android/embracesdk/LogType;Ljava/util/Map;[Ljava/lang/StackTraceElement;)V
public abstract fun logInfo (Ljava/lang/String;Ljava/util/Map;)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ internal class EmbraceInternalInterfaceTest {
)
)

logComposeTap(android.util.Pair.create(0.0f, 0.0f), "")
logComposeTap(Pair(0.0f, 0.0f), "")
assertFalse(shouldCaptureNetworkBody("", ""))
setProcessStartedByNotification()
assertFalse(isNetworkSpanForwardingEnabled())
Expand Down Expand Up @@ -223,7 +223,7 @@ internal class EmbraceInternalInterfaceTest {
with(testRule) {
embrace.start(harness.fakeCoreModule.context)
val session = harness.recordSession {
embrace.internalInterface.logComposeTap(android.util.Pair.create(expectedX, expectedY), expectedElementName)
embrace.internalInterface.logComposeTap(Pair(expectedX, expectedY), expectedElementName)
}

val tapBreadcrumb = checkNotNull(session?.breadcrumbs?.tapBreadcrumbs?.last())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.annotation.SuppressLint;
import android.app.Application;
import android.content.Context;
import android.util.Pair;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -72,6 +71,7 @@
import io.opentelemetry.sdk.trace.export.SpanExporter;
import kotlin.Lazy;
import kotlin.LazyKt;
import kotlin.Pair;

/**
* Implementation class of the SDK. Embrace.java forms our public API and calls functions in this
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.embrace.android.embracesdk

import android.annotation.SuppressLint
import android.util.Pair
import io.embrace.android.embracesdk.config.ConfigService
import io.embrace.android.embracesdk.injection.InitModule
import io.embrace.android.embracesdk.internal.ApkToolsConfig
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.embrace.android.embracesdk

import android.annotation.SuppressLint
import android.util.Pair
import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
import io.embrace.android.embracesdk.internal.InternalTracingApi
import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.embrace.android.embracesdk;

import android.util.Pair;
import kotlin.Pair;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.embrace.android.embracesdk.capture.crumbs

import android.util.Pair
import io.embrace.android.embracesdk.payload.Breadcrumbs
import io.embrace.android.embracesdk.payload.PushNotificationBreadcrumb.NotificationType
import io.embrace.android.embracesdk.payload.TapBreadcrumb.TapBreadcrumbType
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.embrace.android.embracesdk.capture.crumbs

import android.app.Activity
import android.util.Pair
import io.embrace.android.embracesdk.arch.destination.SessionSpanWriter
import io.embrace.android.embracesdk.config.ConfigService
import io.embrace.android.embracesdk.internal.clock.Clock
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.embrace.android.embracesdk.capture.crumbs

import android.util.Pair
import io.embrace.android.embracesdk.arch.DataCaptureService
import io.embrace.android.embracesdk.config.ConfigService
import io.embrace.android.embracesdk.logging.InternalEmbraceLogger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

package io.embrace.android.embracesdk.internal

import android.util.Pair
import io.embrace.android.embracesdk.Embrace
import io.embrace.android.embracesdk.LogType
import io.embrace.android.embracesdk.annotation.InternalApi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.embrace.android.embracesdk.payload

import android.util.Pair
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import io.embrace.android.embracesdk.capture.crumbs.Breadcrumb
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.embrace.android.embracesdk

import android.util.Pair
import io.embrace.android.embracesdk.config.ConfigService
import io.embrace.android.embracesdk.config.LocalConfigParser
import io.embrace.android.embracesdk.config.behavior.SessionBehavior
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.embrace.android.embracesdk

import android.util.Pair
import io.embrace.android.embracesdk.capture.crumbs.BreadcrumbService
import io.embrace.android.embracesdk.payload.Breadcrumbs
import io.embrace.android.embracesdk.payload.PushNotificationBreadcrumb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ internal class EmbraceBreadcrumbServiceTest {
@Test
fun testCleanCollections() {
val service = initializeBreadcrumbService()
service.logTap(android.util.Pair(0f, 0f), "MyView", 0, TapBreadcrumb.TapBreadcrumbType.TAP)
service.logTap(Pair(0f, 0f), "MyView", 0, TapBreadcrumb.TapBreadcrumbType.TAP)
service.logRnAction("MyAction", 0, 5, mapOf("key" to "value"), 100, "success")
service.logPushNotification(
"title",
Expand Down Expand Up @@ -191,7 +191,7 @@ internal class EmbraceBreadcrumbServiceTest {
@Test
fun testLogTap() {
val service = initializeBreadcrumbService()
service.logTap(android.util.Pair(0f, 0f), "MyView", 0, TapBreadcrumb.TapBreadcrumbType.TAP)
service.logTap(Pair(0f, 0f), "MyView", 0, TapBreadcrumb.TapBreadcrumbType.TAP)

val crumbs = checkNotNull(service.getBreadcrumbs().tapBreadcrumbs)
val breadcrumb = checkNotNull(crumbs.single())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.embrace.android.embracesdk.payload

import android.util.Pair
import com.squareup.moshi.JsonDataException
import io.embrace.android.embracesdk.assertJsonMatchesGoldenFile
import io.embrace.android.embracesdk.deserializeEmptyJsonString
Expand Down

0 comments on commit 12db875

Please sign in to comment.