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

Fixed 4718 : After uploading by sharing an image from gallery the app returns to contributions tab (#4727)

Browse source 
* Dialog can't be dismissed

* Dialog can't be dismissed

* UploadActivity returns to MainActivity
This commit is contained in:
Ayan Sarkar 2021-12-12 17:53:30 +05:30 • committed by GitHub
parent b7be49333d
commit bf74da7b5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
View file

@ -34,6 +34,7 @@ import fr.free.nrw.commons.R;
import fr.free.nrw.commons.auth.LoginActivity; import fr.free.nrw.commons.auth.LoginActivity;
import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.contributions.ContributionController; 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.filepicker.UploadableFile;
import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.mwapi.UserClient; import fr.free.nrw.commons.mwapi.UserClient;
@ -236,6 +237,13 @@ public class UploadActivity extends BaseActivity implements UploadContract.View,
super.onStop(); super.onStop();
} }
@Override
public void returnToMainActivity() {
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
finish();
}
/** /**
* Show/Hide the progress dialog * Show/Hide the progress dialog
*/ */

2
app/src/main/java/fr/free/nrw/commons/upload/UploadContract.java
View file

@ -16,6 +16,8 @@ public interface UploadContract {
void finish(); void finish();
void returnToMainActivity();
void askUserToLogIn(); void askUserToLogIn();
void showProgress(boolean shouldShow); void showProgress(boolean shouldShow);

4
app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
View file

@ -78,7 +78,7 @@ public class UploadPresenter implements UploadContract.UserActionListener {
public void onError(Throwable e) { public void onError(Throwable e) {
view.showMessage(R.string.upload_failed); view.showMessage(R.string.upload_failed);
repository.cleanup(); repository.cleanup();
view.finish(); view.returnToMainActivity();
compositeDisposable.clear(); compositeDisposable.clear();
Timber.e("failed to upload: " + e.getMessage()); Timber.e("failed to upload: " + e.getMessage());
} }
@ -87,7 +87,7 @@ public class UploadPresenter implements UploadContract.UserActionListener {
public void onComplete() { public void onComplete() {
view.makeUploadRequest(); view.makeUploadRequest();
repository.cleanup(); repository.cleanup();
view.finish(); view.returnToMainActivity();
compositeDisposable.clear(); compositeDisposable.clear();
} }
}); });