Skip to content

Commit 25f6217

Browse files
author
Arpan Kaphle
committed
Updating Log Messages to be Cleaner
Previously, we were using the class to generate tags, which was causing messages that were long, less understandable, and more error-prone. This makes the log messages cleaner by removing the large class names. Bug: 262924507 Test: Build Test Change-Id: Ib7706434098d576bccd2cacf6dab7a65119433c0
1 parent bfdaf61 commit 25f6217

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/CredentialProviderBeginSignInController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class CredentialProviderBeginSignInController(private val activity: Activity) :
134134
)
135135
return
136136
}
137-
if (maybeReportErrorResultCodeGet(resultCode, TAG,
137+
if (maybeReportErrorResultCodeGet(resultCode,
138138
{ s, f -> cancelOrCallbackExceptionOrResult(s, f) }, { e ->
139139
this.executor.execute {
140140
this.callback.onError(e)

credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePassword/CredentialProviderCreatePasswordController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class CredentialProviderCreatePasswordController(private val activity: Activity)
113113
"$CONTROLLER_REQUEST_CODE which does not match what was given $uniqueRequestCode")
114114
return
115115
}
116-
if (maybeReportErrorResultCodeCreate(resultCode, TAG,
116+
if (maybeReportErrorResultCodeCreate(resultCode,
117117
{ s, f -> cancelOrCallbackExceptionOrResult(s, f) }, { e -> this.executor.execute {
118118
this.callback.onError(e) } }, cancellationSignal)) return
119119
val response: CreateCredentialResponse = convertResponseToCredentialManager(Unit)

credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/CredentialProviderCreatePublicKeyCredentialController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class CredentialProviderCreatePublicKeyCredentialController(private val activity
134134
"$CONTROLLER_REQUEST_CODE does not match what was given $uniqueRequestCode")
135135
return
136136
}
137-
if (maybeReportErrorResultCodeCreate(resultCode, TAG,
137+
if (maybeReportErrorResultCodeCreate(resultCode,
138138
{ s, f -> cancelOrCallbackExceptionOrResult(s, f) }, { e -> this.executor.execute {
139139
this.callback.onError(e) } }, cancellationSignal)) return
140140
val bytes: ByteArray? = data?.getByteArrayExtra(Fido.FIDO2_KEY_CREDENTIAL_EXTRA)

credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CredentialProviderController.kt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ abstract class CredentialProviderController<T1 : Any, T2 : Any, R2 : Any, R1 : A
5757
@JvmStatic
5858
protected fun maybeReportErrorResultCodeCreate(
5959
resultCode: Int,
60-
type: String,
6160
cancelOnError: (
6261
CancellationSignal?,
6362
() -> Unit
@@ -67,11 +66,11 @@ abstract class CredentialProviderController<T1 : Any, T2 : Any, R2 : Any, R1 : A
6766
): Boolean {
6867
if (resultCode != Activity.RESULT_OK) {
6968
var exception: CreateCredentialException = CreateCredentialUnknownException(
70-
generateErrorStringUnknown(type, resultCode)
69+
generateErrorStringUnknown(resultCode)
7170
)
7271
if (resultCode == Activity.RESULT_CANCELED) {
7372
exception = CreateCredentialCancellationException(
74-
generateErrorStringCanceled(type)
73+
generateErrorStringCanceled()
7574
)
7675
}
7776
cancelOnError(cancellationSignal) { onError(exception) }
@@ -80,12 +79,12 @@ abstract class CredentialProviderController<T1 : Any, T2 : Any, R2 : Any, R1 : A
8079
return false
8180
}
8281

83-
internal fun generateErrorStringUnknown(type: String, resultCode: Int): String {
84-
return "$type activity with result code: $resultCode indicating not RESULT_OK"
82+
internal fun generateErrorStringUnknown(resultCode: Int): String {
83+
return "activity with result code: $resultCode indicating not RESULT_OK"
8584
}
8685

87-
internal fun generateErrorStringCanceled(type: String): String {
88-
return "$type activity is cancelled by the user."
86+
internal fun generateErrorStringCanceled(): String {
87+
return "activity is cancelled by the user."
8988
}
9089

9190
/**
@@ -96,7 +95,6 @@ abstract class CredentialProviderController<T1 : Any, T2 : Any, R2 : Any, R1 : A
9695
@JvmStatic
9796
protected fun maybeReportErrorResultCodeGet(
9897
resultCode: Int,
99-
type: String,
10098
cancelOnError: (
10199
CancellationSignal?,
102100
() -> Unit
@@ -106,11 +104,11 @@ abstract class CredentialProviderController<T1 : Any, T2 : Any, R2 : Any, R1 : A
106104
): Boolean {
107105
if (resultCode != Activity.RESULT_OK) {
108106
var exception: GetCredentialException = GetCredentialUnknownException(
109-
generateErrorStringUnknown(type, resultCode)
107+
generateErrorStringUnknown(resultCode)
110108
)
111109
if (resultCode == Activity.RESULT_CANCELED) {
112110
exception = GetCredentialCancellationException(
113-
generateErrorStringCanceled(type)
111+
generateErrorStringCanceled()
114112
)
115113
}
116114
cancelOnError(cancellationSignal) { onError(exception) }

0 commit comments

Comments
 (0)