mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added error message in Failed Uploads Fragment

Browse source
This commit is contained in:
Kanahia 2024-06-25 00:14:11 +05:30
parent 7a1e3810bb
commit ea483354eb
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
View file

@ -28,6 +28,7 @@ data class Contribution constructor(
var dateCreatedSource: String? = null, var dateCreatedSource: String? = null,
var wikidataPlace: WikidataPlace? = null, var wikidataPlace: WikidataPlace? = null,
var chunkInfo: ChunkInfo? = null, var chunkInfo: ChunkInfo? = null,
var errorInfo: String? = null,
/** /**
* @return array list of entityids for the depictions * @return array list of entityids for the depictions
*/ */

2
app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
View file

@ -15,7 +15,7 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao
* The database for accessing the respective DAOs * The database for accessing the respective DAOs
* *
*/ */
@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class, NotForUploadStatus::class, ReviewEntity::class], version = 16, exportSchema = false) @Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class, NotForUploadStatus::class, ReviewEntity::class], version = 17, exportSchema = false)
@TypeConverters(Converters::class) @TypeConverters(Converters::class)
abstract class AppDatabase : RoomDatabase() { abstract class AppDatabase : RoomDatabase() {
abstract fun contributionDao(): ContributionDao abstract fun contributionDao(): ContributionDao

6
app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt
View file

@ -48,7 +48,11 @@ class FailedUploadsAdapter(items: List<Contribution>, callback: Callback) :
} }
if (item.state == Contribution.STATE_FAILED) { if (item.state == Contribution.STATE_FAILED) {
holder.errorTextView.setText("Failed") if (item.errorInfo != null){
holder.errorTextView.setText(item.errorInfo)
}else{
holder.errorTextView.setText("Failed")
}
holder.errorTextView.visibility = View.VISIBLE holder.errorTextView.visibility = View.VISIBLE
holder.itemProgress.visibility = View.GONE holder.itemProgress.visibility = View.GONE
} }

2
app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
View file

@ -344,7 +344,6 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
).onErrorReturn{ ).onErrorReturn{
return@onErrorReturn StashUploadResult(StashUploadState.FAILED,fileKey = null,errorMessage = it.message) return@onErrorReturn StashUploadResult(StashUploadState.FAILED,fileKey = null,errorMessage = it.message)
}.blockingSingle() }.blockingSingle()
Timber.tag("PRINT").e("-- "+stashUploadResult.state)
when (stashUploadResult.state) { when (stashUploadResult.state) {
StashUploadState.SUCCESS -> { StashUploadState.SUCCESS -> {
//If the stash upload succeeds //If the stash upload succeeds
@ -412,6 +411,7 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
showInvalidLoginNotification(contribution) showInvalidLoginNotification(contribution)
contribution.state = Contribution.STATE_FAILED contribution.state = Contribution.STATE_FAILED
contribution.chunkInfo = null contribution.chunkInfo = null
contribution.errorInfo = stashUploadResult.errorMessage
contributionDao.saveSynchronous(contribution) contributionDao.saveSynchronous(contribution)
if (stashUploadResult.errorMessage.equals(CsrfTokenClient.INVALID_TOKEN_ERROR_MESSAGE)) { if (stashUploadResult.errorMessage.equals(CsrfTokenClient.INVALID_TOKEN_ERROR_MESSAGE)) {
Timber.e("Invalid Login, logging out") Timber.e("Invalid Login, logging out")