mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
refactor: remove logs added for testing
This commit is contained in:
parent
93d43a289b
commit
47368c1285
4 changed files with 0 additions and 13 deletions
|
|
@ -53,10 +53,7 @@ class DeleteHelper @Inject constructor(
|
||||||
media: Media?,
|
media: Media?,
|
||||||
reason: String?
|
reason: String?
|
||||||
): Single<Boolean>? {
|
): Single<Boolean>? {
|
||||||
|
|
||||||
Timber.d("Making deletion for title: ${media?.displayTitle} with reason: $reason")
|
|
||||||
if(context == null && media == null) {
|
if(context == null && media == null) {
|
||||||
Timber.e("context or media is null")
|
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -68,13 +65,10 @@ class DeleteHelper @Inject constructor(
|
||||||
return reason?.let {
|
return reason?.let {
|
||||||
delete(media!!, it)
|
delete(media!!, it)
|
||||||
.flatMapSingle { result ->
|
.flatMapSingle { result ->
|
||||||
Timber.d("Show deletiong notification")
|
|
||||||
Single.just(showDeletionNotification(context, media, result))
|
Single.just(showDeletionNotification(context, media, result))
|
||||||
}
|
}
|
||||||
.firstOrError()
|
.firstOrError()
|
||||||
.onErrorResumeNext { throwable ->
|
.onErrorResumeNext { throwable ->
|
||||||
Timber.e("Error while making deletion")
|
|
||||||
throwable.printStackTrace()
|
|
||||||
if (throwable is InvalidLoginTokenException) {
|
if (throwable is InvalidLoginTokenException) {
|
||||||
Single.error(throwable)
|
Single.error(throwable)
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -91,7 +85,6 @@ class DeleteHelper @Inject constructor(
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private fun delete(media: Media, reason: String): Observable<Boolean> {
|
private fun delete(media: Media, reason: String): Observable<Boolean> {
|
||||||
Timber.d("thread is delete %s", Thread.currentThread().name)
|
|
||||||
val summary = "Nominating ${media.filename} for deletion."
|
val summary = "Nominating ${media.filename} for deletion."
|
||||||
val calendar = Calendar.getInstance()
|
val calendar = Calendar.getInstance()
|
||||||
val fileDeleteString = """
|
val fileDeleteString = """
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,6 @@ class ReasonBuilder @Inject constructor(
|
||||||
if (media == null || reason == null) {
|
if (media == null || reason == null) {
|
||||||
return Single.just("Not known")
|
return Single.just("Not known")
|
||||||
}
|
}
|
||||||
Timber.d("Fetching article number")
|
|
||||||
return getAndAppendFileUsage(media, reason)
|
return getAndAppendFileUsage(media, reason)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1695,7 +1695,6 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
|
||||||
val finalReason: String = reason
|
val finalReason: String = reason
|
||||||
val resultSingle: Single<Boolean> = reasonBuilder.getReason(media, reason)
|
val resultSingle: Single<Boolean> = reasonBuilder.getReason(media, reason)
|
||||||
.flatMap {
|
.flatMap {
|
||||||
Timber.d("Reason builder returned: $it")
|
|
||||||
deleteHelper.makeDeletion(
|
deleteHelper.makeDeletion(
|
||||||
context, media, finalReason
|
context, media, finalReason
|
||||||
)
|
)
|
||||||
|
|
@ -1729,7 +1728,6 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleDeletionError(throwable: Throwable) {
|
private fun handleDeletionError(throwable: Throwable) {
|
||||||
Timber.e("Error while nominating for deletion: ${throwable.message}")
|
|
||||||
throwable.printStackTrace()
|
throwable.printStackTrace()
|
||||||
disableProgressBar()
|
disableProgressBar()
|
||||||
checkAndClearDeletionFlag()
|
checkAndClearDeletionFlag()
|
||||||
|
|
|
||||||
|
|
@ -258,21 +258,18 @@ class OkHttpJsonApiClient @Inject constructor(
|
||||||
fun getAchievements(userName: String?): Single<FeedbackResponse?> {
|
fun getAchievements(userName: String?): Single<FeedbackResponse?> {
|
||||||
val suffix = if (isBetaFlavour) "/feedback.py?labs=commonswiki" else "/feedback.py"
|
val suffix = if (isBetaFlavour) "/feedback.py?labs=commonswiki" else "/feedback.py"
|
||||||
val fetchAchievementUrlTemplate = wikiMediaToolforgeUrl.toString() + suffix
|
val fetchAchievementUrlTemplate = wikiMediaToolforgeUrl.toString() + suffix
|
||||||
Timber.d("Url : $fetchAchievementUrlTemplate and User Name : $userName")
|
|
||||||
return Single.fromCallable<FeedbackResponse?>({
|
return Single.fromCallable<FeedbackResponse?>({
|
||||||
val url = String.format(
|
val url = String.format(
|
||||||
Locale.ENGLISH,
|
Locale.ENGLISH,
|
||||||
fetchAchievementUrlTemplate,
|
fetchAchievementUrlTemplate,
|
||||||
userName
|
userName
|
||||||
)
|
)
|
||||||
Timber.d("Formatted URL: $url")
|
|
||||||
val urlBuilder: HttpUrl.Builder = url.toHttpUrlOrNull()!!.newBuilder()
|
val urlBuilder: HttpUrl.Builder = url.toHttpUrlOrNull()!!.newBuilder()
|
||||||
.addQueryParameter("user", userName)
|
.addQueryParameter("user", userName)
|
||||||
val request: Request = Request.Builder()
|
val request: Request = Request.Builder()
|
||||||
.url(urlBuilder.toString())
|
.url(urlBuilder.toString())
|
||||||
.build()
|
.build()
|
||||||
val response: Response = okHttpClient.newCall(request).execute()
|
val response: Response = okHttpClient.newCall(request).execute()
|
||||||
Timber.d("Response received: $response | Body: ${response.body} | IsSuccessful: ${response.isSuccessful}")
|
|
||||||
if (response.body != null && response.isSuccessful) {
|
if (response.body != null && response.isSuccessful) {
|
||||||
var json: String = response.body!!.string()
|
var json: String = response.body!!.string()
|
||||||
// Extract JSON from response
|
// Extract JSON from response
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue