From 9c1c95f5cfe8ca34130dbeaf675f3c1e5ffbfb3c Mon Sep 17 00:00:00 2001
From: whe128 <165463363+whe128@users.noreply.github.com>
Date: Wed, 23 Oct 2024 03:56:02 +1100
Subject: [PATCH] Fix for #5846: After uploading via Nearby, I am sent back to
 Nearby, where I am mislead into thinking that I must upload again #5846
 (#5874)

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
---
 .../java/fr/free/nrw/commons/upload/UploadActivity.java   | 8 ++++++++
 .../java/fr/free/nrw/commons/upload/UploadContract.java   | 7 +++++++
 .../java/fr/free/nrw/commons/upload/UploadPresenter.java  | 7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
index eb180ec44..23b187340 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -320,6 +320,14 @@ public class UploadActivity extends BaseActivity implements UploadContract.View,
         finish();
     }
 
+    /**
+     * go to the uploadProgress activity to check the status of uploading
+     */
+    @Override
+    public void goToUploadProgressActivity() {
+        startActivity(new Intent(this, UploadProgressActivity.class));
+    }
+
     /**
      * Show/Hide the progress dialog
      */
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadContract.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadContract.java
index 4df778746..5f41a17c9 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadContract.java
@@ -18,6 +18,13 @@ public interface UploadContract {
 
         void returnToMainActivity();
 
+        /**
+         * When submission successful, go to the loadProgressActivity to hint the user this
+         * submission is valid. And the user will see the upload progress in this activity;
+         * Fixes: <a href="https://github.com/commons-app/apps-android-commons/issues/5846">Issue</a>
+         */
+        void goToUploadProgressActivity();
+
         void askUserToLogIn();
 
         /**
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
index 144859432..093412c25 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
@@ -123,6 +123,9 @@ public class UploadPresenter implements UploadContract.UserActionListener {
                             view.returnToMainActivity();
                             compositeDisposable.clear();
                             Timber.e("failed to upload: " + e.getMessage());
+
+                            //is submission error, not need to go to the uploadActivity
+                            //not start the uploading progress
                         }
 
                         @Override
@@ -131,6 +134,10 @@ public class UploadPresenter implements UploadContract.UserActionListener {
                             repository.cleanup();
                             view.returnToMainActivity();
                             compositeDisposable.clear();
+
+                            //after finish the uploadActivity, if successful,
+                            //directly go to the upload progress activity
+                            view.goToUploadProgressActivity();
                         }
                     });
         } else {