Check for null when stripping carriage returns

pull/795/head
Alex Baker 6 years ago
parent 4464610f58
commit f8d9e9d56e

@ -1,6 +1,7 @@
package org.tasks.ui;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.tasks.ui.DescriptionControlSet.stripCarriageReturns;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@ -23,4 +24,9 @@ public class DescriptionControlSetTest {
public void dontReplaceLF() {
assertEquals("aaa\nbbb", stripCarriageReturns("aaa\nbbb"));
}
@Test
public void checkIfNull() {
assertNull(stripCarriageReturns(null));
}
}

@ -28,8 +28,8 @@ public class DescriptionControlSet extends TaskEditControlFragment {
private String description;
static String stripCarriageReturns(String original) {
return original.replaceAll("\\r\\n?", "\n");
static String stripCarriageReturns(@Nullable String original) {
return original == null ? null : original.replaceAll("\\r\\n?", "\n");
}
@Nullable

Loading…
Cancel
Save