From ea483354ebf367ad3844fff3025ff95b85a791a1 Mon Sep 17 00:00:00 2001
From: Kanahia <kaushalkanahia@gmail.com>
Date: Tue, 25 Jun 2024 00:14:11 +0530
Subject: [PATCH] Added error message in Failed Uploads Fragment

---
 .../java/fr/free/nrw/commons/contributions/Contribution.kt  | 1 +
 app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt     | 2 +-
 .../java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt | 6 +++++-
 .../java/fr/free/nrw/commons/upload/worker/UploadWorker.kt  | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
index d146d1d18..4e86f1d09 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
@@ -28,6 +28,7 @@ data class Contribution constructor(
     var dateCreatedSource: String? = null,
     var wikidataPlace: WikidataPlace? = null,
     var chunkInfo: ChunkInfo? = null,
+    var errorInfo: String? = null,
     /**
      * @return array list of entityids for the depictions
      */
diff --git a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
index 6d63e58a1..dd39327c5 100644
--- a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
+++ b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
@@ -15,7 +15,7 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao
  * 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)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun contributionDao(): ContributionDao
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt b/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt
index e70b8c57a..0e7bb0807 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt
@@ -48,7 +48,11 @@ class FailedUploadsAdapter(items: List<Contribution>, callback: Callback) :
         }
 
         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.itemProgress.visibility = View.GONE
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
index 83d49727c..f4c52e2a8 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
@@ -344,7 +344,6 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
             ).onErrorReturn{
                 return@onErrorReturn StashUploadResult(StashUploadState.FAILED,fileKey = null,errorMessage = it.message)
             }.blockingSingle()
-            Timber.tag("PRINT").e("--  "+stashUploadResult.state)
             when (stashUploadResult.state) {
                 StashUploadState.SUCCESS -> {
                     //If the stash upload succeeds
@@ -412,6 +411,7 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
                     showInvalidLoginNotification(contribution)
                     contribution.state = Contribution.STATE_FAILED
                     contribution.chunkInfo = null
+                    contribution.errorInfo = stashUploadResult.errorMessage
                     contributionDao.saveSynchronous(contribution)
                     if (stashUploadResult.errorMessage.equals(CsrfTokenClient.INVALID_TOKEN_ERROR_MESSAGE)) {
                         Timber.e("Invalid Login, logging out")