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

Fixes #4455 - Warning when pressing "back" in upload wizard (#4519)

Browse source 
* Overrides the back button during upload with dialog

* Removing unneeded import
This commit is contained in:
benryder1988 2021-07-23 12:40:41 +01:00 • committed by GitHub
parent 686dc93257
commit 2a9ae73750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@ import fr.free.nrw.commons.upload.license.MediaLicenseFragment;
import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment;
import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.UploadMediaDetailFragmentCallback;
import fr.free.nrw.commons.upload.worker.UploadWorker;
import fr.free.nrw.commons.utils.DialogUtil;
import fr.free.nrw.commons.utils.PermissionUtils;
import fr.free.nrw.commons.utils.ViewUtil;
import io.reactivex.android.schedulers.AndroidSchedulers;
@ -502,4 +503,20 @@ public class UploadActivity extends BaseActivity implements UploadContract.View,
uploadCategoriesFragment.setCallback(null);
}
}
/**
* Overrides the back button to make sure the user is prepared to lose their progress
*/
@Override
public void onBackPressed() {
DialogUtil.showAlertDialog(this,
getString(R.string.back_button_warning),
getString(R.string.back_button_warning_desc),
getString(R.string.back_button_continue),
getString(R.string.back_button_warning),
null,
this::finish
);
}
}

8
app/src/main/res/values/strings.xml
View file

@ -391,11 +391,15 @@
Upload your first media by tapping on the add button.</string>
<string name="no_categories_selected">No Categories Selected</string>
<string name="no_categories_selected_warning_desc">Images without categories are rarely usable. Are you sure you want to continue without selecting categories?</string>
<string name="no_depictions_selected">No Depictions Selected</string>
<string name="no_depictions_selected">No Depictions Selected</string>
<string name="no_depictions_selected_warning_desc">Images with depictions are more easily found and more likely to be used. Are you sure you want to continue without selecting depictions?</string>
<string name="back_button_warning">Cancel Upload</string>
<string name="back_button_warning_desc">Using the back button will cancel this upload and you will lose your progress</string>
<string name="back_button_continue">Continue Upload</string>
<string name="upload_flow_all_images_in_set">(For all image(s) in set)</string>
<string name="search_this_area">Search this area</string>
<string name="nearby_card_permission_title">Permission Request</string>