Skip to content

Fixes #3464, App posts deletion request notifications ({{subst:idw}}) on the wrong user's talk page #3495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 17, 2020
Merged

Fixes #3464, App posts deletion request notifications ({{subst:idw}}) on the wrong user's talk page #3495

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c5101d
Fixed #3464: App posts deletion request notifications ({{subst:idw}})…
VitalyVPinchuk Mar 11, 2020
f648851
Merge remote-tracking branch 'remotes/upstream/master' into fix-3464
VitalyVPinchuk Mar 11, 2020
28792d2
Fixed DeleteHelperTest.kt
VitalyVPinchuk Mar 11, 2020
23245a8
Fixed DeleteHelper tests and null-pointer exception
VitalyVPinchuk Mar 11, 2020
3d32631
Modified DeleteHelper makeDeletion() test
VitalyVPinchuk Mar 11, 2020
dfd3bba
Reverted unintentionally modified Project.xml
VitalyVPinchuk Mar 12, 2020
59059b5
Raising exception when nominating for deletion with empty creator name
VitalyVPinchuk Mar 12, 2020
fd5313e
Fixed code style
VitalyVPinchuk Mar 12, 2020
9e26984
Fixed code style
VitalyVPinchuk Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed DeleteHelper tests and null-pointer exception
  • Loading branch information
@VitalyVPinchuk
VitalyVPinchuk committed Mar 11, 2020
commit 23245a8f34b1575c3a8f5a2d2491f7d27c38a1a7
5 changes: 3 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ private Observable<Boolean> delete(Media media, String reason) {
String userPageString = "\n{{subst:idw|" + media.getFilename() +
"}} ~~~~";

String creator = media.getCreator().replace(" (page does not exist)", "");
String creator = media.getCreator();
String creatorName = creator == null ? null : creator.replace(" (page does not exist)", "");

return pageEditClient.prependEdit(media.filename, fileDeleteString + "\n", summary)
.flatMap(result -> {
Expand All @@ -113,7 +114,7 @@ private Observable<Boolean> delete(Media media, String reason) {
throw new RuntimeException("Failed to nominate for deletion");
}).flatMap(result -> {
if (result) {
return pageEditClient.appendEdit("User_Talk:" + creator, userPageString + "\n", summary);
return pageEditClient.appendEdit("User_Talk:" + creatorName, userPageString + "\n", summary);
}
throw new RuntimeException("Failed to nominate for deletion");
});
Expand Down
5 changes: 4 additions & 1 deletion app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class DeleteHelperTest {
.thenReturn(Observable.just(true))

`when`(media?.displayTitle).thenReturn("Test file")
`when`(media?.getCreator()).thenReturn("Creator (page does not exist)")
media?.filename="Test file.jpg"
media?.creator="Creator (page does not exist)"

val makeDeletion = deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
assertNotNull(makeDeletion)
Expand All @@ -84,6 +84,7 @@ class DeleteHelperTest {
.thenReturn(Observable.just(true))
`when`(media?.displayTitle).thenReturn("Test file")
`when`(media?.filename).thenReturn("Test file.jpg")
`when`(media?.creator).thenReturn("Creator (page does not exist)")

deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
}
Expand All @@ -98,6 +99,7 @@ class DeleteHelperTest {
.thenReturn(Observable.just(false))
`when`(media?.displayTitle).thenReturn("Test file")
`when`(media?.filename).thenReturn("Test file.jpg")
`when`(media?.creator).thenReturn("Creator (page does not exist)")

deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
}
Expand All @@ -112,6 +114,7 @@ class DeleteHelperTest {
.thenReturn(Observable.just(true))
`when`(media?.displayTitle).thenReturn("Test file")
`when`(media?.filename).thenReturn("Test file.jpg")
`when`(media?.creator).thenReturn("Creator (page does not exist)")

deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
}
Expand Down