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 b2fa9b0b2..0fd4e6c6d 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 @@ -34,6 +34,7 @@ import fr.free.nrw.commons.R; import fr.free.nrw.commons.auth.LoginActivity; import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.contributions.ContributionController; +import fr.free.nrw.commons.contributions.MainActivity; import fr.free.nrw.commons.filepicker.UploadableFile; import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.mwapi.UserClient; @@ -236,6 +237,13 @@ public class UploadActivity extends BaseActivity implements UploadContract.View, super.onStop(); } + @Override + public void returnToMainActivity() { + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + finish(); + } + /** * 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 109b34d38..e8f365314 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 @@ -16,6 +16,8 @@ public interface UploadContract { void finish(); + void returnToMainActivity(); + void askUserToLogIn(); void showProgress(boolean shouldShow); 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 f0a631b15..d6f4419b8 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 @@ -78,7 +78,7 @@ public class UploadPresenter implements UploadContract.UserActionListener { public void onError(Throwable e) { view.showMessage(R.string.upload_failed); repository.cleanup(); - view.finish(); + view.returnToMainActivity(); compositeDisposable.clear(); Timber.e("failed to upload: " + e.getMessage()); } @@ -87,7 +87,7 @@ public class UploadPresenter implements UploadContract.UserActionListener { public void onComplete() { view.makeUploadRequest(); repository.cleanup(); - view.finish(); + view.returnToMainActivity(); compositeDisposable.clear(); } });