Skip to content

Commit 1f6502a

Browse files
committed
Adding more logs
1 parent d22a1b3 commit 1f6502a

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/ApplicationPasswordLoginHelper.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
5757
uriLoginWrapper.appendParamsToRestAuthorizationUrl(authorizationUrl)
5858
appLogWrapper.d(
5959
AppLog.T.API,
60-
"WP_RS: Found authorization for $siteUrl URL: $authorizationUrlComplete " +
60+
"AP: Found authorization for $siteUrl URL: $authorizationUrlComplete " +
6161
"API_ROOT_URL $apiRootUrl")
6262
AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_SUCCESSFUL)
6363
authorizationUrlComplete
@@ -75,7 +75,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
7575
}
7676

7777
private fun handleAuthenticationDiscoveryError(siteUrl: String, throwable: Throwable): String {
78-
appLogWrapper.e(AppLog.T.API, "WP_RS: Error during API discovery for $siteUrl - ${throwable.message}")
78+
appLogWrapper.e(AppLog.T.API, "AP: Error during API discovery for $siteUrl - ${throwable.message}")
7979
AnalyticsTracker.track(Stat.BACKGROUND_REST_AUTODISCOVERY_FAILED)
8080
return ""
8181
}
@@ -88,6 +88,10 @@ class ApplicationPasswordLoginHelper @Inject constructor(
8888
urlLogin.siteUrl == null ||
8989
urlLogin.siteUrl == processedAppPasswordData
9090
) {
91+
appLogWrapper.e(
92+
AppLog.T.DB,
93+
"AP: Cannot save application password credentials for: ${urlLogin.siteUrl} - bad data"
94+
)
9195
return false
9296
}
9397

@@ -111,7 +115,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
111115
} else {
112116
appLogWrapper.e(
113117
AppLog.T.DB,
114-
"WP_RS: Cannot save application password credentials for: ${urlLogin.siteUrl}"
118+
"AP: Cannot save application password credentials for: ${urlLogin.siteUrl} - null site"
115119
)
116120
false
117121
}
@@ -130,7 +134,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
130134
},
131135
properties
132136
)
133-
appLogWrapper.d(AppLog.T.DB, "WP_RS: Saved application password credentials for: $siteUrl")
137+
appLogWrapper.d(AppLog.T.DB, "AP: Saved application password credentials for: $siteUrl")
134138
}
135139

136140
fun getSiteUrlLoginFromRawData(url: String): UriLogin {
@@ -156,6 +160,7 @@ class ApplicationPasswordLoginHelper @Inject constructor(
156160
}
157161
dispatcherWrapper.removeApplicationPassword(site)
158162
}
163+
appLogWrapper.d(AppLog.T.DB, "AP: Removed application password credentials for: $affectedSites sites")
159164
affectedSites
160165
}
161166
}

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/applicationpassword/ApplicationPasswordViewModelSlice.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ class ApplicationPasswordViewModelSlice @Inject constructor(
6060
val storedSite = siteStore.sites.firstOrNull { it.id == site.id }
6161
if (storedSite != null && !applicationPasswordLoginHelper.siteHasBadCredentials(site)) {
6262
uiModelMutable.postValue(null)
63-
appLogWrapper.d(AppLog.T.MAIN, "WP_RS: Hiding card for ${site.url} - authenticated")
63+
appLogWrapper.d(AppLog.T.MAIN, "AP: Hiding card for ${site.url} - authenticated")
6464
return@launch
6565
}
6666

6767
val authorizationUrlComplete = applicationPasswordLoginHelper.getAuthorizationUrlComplete(site.url)
6868
if (authorizationUrlComplete.isEmpty()) {
6969
uiModelMutable.postValue(null)
70-
appLogWrapper.d(AppLog.T.MAIN, "WP_RS: Hiding card for ${site.url} - bad discovery")
70+
appLogWrapper.d(AppLog.T.MAIN, "AP: Hiding card for ${site.url} - bad discovery")
7171
} else {
7272
showApplicationPasswordCreateCard(site)
7373
}
@@ -86,7 +86,7 @@ class ApplicationPasswordViewModelSlice @Inject constructor(
8686
)
8787
)
8888
)
89-
appLogWrapper.d(AppLog.T.MAIN, "WP_RS: Showing card for ${site.url}")
89+
appLogWrapper.d(AppLog.T.MAIN, "AP: Showing card for ${site.url}")
9090
}
9191

9292

0 commit comments

Comments
 (0)