archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace TextUtils.isEmpty with isNullOrEmpty

Browse Source
pull/996/head
Alex Baker 5 years ago
parent 2f8ac10e47
commit 76febd39bd
25 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File

9
app/src/googleplay/java/org/tasks/billing/Security.java
Unescape Escape View File

@ -16,7 +16,8 @@
package org.tasks.billing; package org.tasks.billing;
import android.text.TextUtils; import static org.tasks.Strings.isNullOrEmpty;
import android.util.Base64; import android.util.Base64;
import com.android.billingclient.util.BillingHelper; import com.android.billingclient.util.BillingHelper;
import java.io.IOException; import java.io.IOException;
@ -49,9 +50,9 @@ class Security {
*/ */
static boolean verifyPurchase(String base64PublicKey, String signedData, String signature) static boolean verifyPurchase(String base64PublicKey, String signedData, String signature)
throws IOException { throws IOException {
if (TextUtils.isEmpty(signedData) if (isNullOrEmpty(signedData)
|| TextUtils.isEmpty(base64PublicKey) || isNullOrEmpty(base64PublicKey)
|| TextUtils.isEmpty(signature)) { || isNullOrEmpty(signature)) {
BillingHelper.logWarn(TAG, "Purchase verification failed: missing data."); BillingHelper.logWarn(TAG, "Purchase verification failed: missing data.");
return false; return false;
} }

7
app/src/main/java/com/todoroo/andlib/data/Property.java
Unescape Escape View File

@ -6,7 +6,8 @@
package com.todoroo.andlib.data; package com.todoroo.andlib.data;
import android.text.TextUtils; import static org.tasks.Strings.isNullOrEmpty;
import com.todoroo.andlib.sql.Field; import com.todoroo.andlib.sql.Field;
/** /**
@ -56,7 +57,7 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
/** Return a clone of this property */ /** Return a clone of this property */
Property<TYPE> cloneAs(String tableAlias, String columnAlias) { Property<TYPE> cloneAs(String tableAlias, String columnAlias) {
Table aliasedTable = this.table; Table aliasedTable = this.table;
if (!TextUtils.isEmpty(tableAlias)) { if (!isNullOrEmpty(tableAlias)) {
aliasedTable = table.as(tableAlias); aliasedTable = table.as(tableAlias);
} }
@ -65,7 +66,7 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
this.getClass() this.getClass()
.getConstructor(Table.class, String.class) .getConstructor(Table.class, String.class)
.newInstance(aliasedTable, this.name); .newInstance(aliasedTable, this.name);
if (!TextUtils.isEmpty(columnAlias)) { if (!isNullOrEmpty(columnAlias)) {
return (Property<TYPE>) newInstance.as(columnAlias); return (Property<TYPE>) newInstance.as(columnAlias);
} }
return newInstance; return newInstance;

5
app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.todoroo.astrid.adapter; package com.todoroo.astrid.adapter;
import android.text.TextUtils; import static org.tasks.Strings.isNullOrEmpty;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
@ -123,7 +124,7 @@ public final class AstridTaskAdapter extends TaskAdapter {
boolean madeChanges = false; boolean madeChanges = false;
for (Task t : tasks) { for (Task t : tasks) {
if (!TextUtils.isEmpty(t.getRecurrence())) { if (!isNullOrEmpty(t.getRecurrence())) {
updater.moveToParentOf(t.getUuid(), itemId); updater.moveToParentOf(t.getUuid(), itemId);
madeChanges = true; madeChanges = true;
} }

7
app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterProvider.java
Unescape Escape View File

@ -1,7 +1,8 @@
package com.todoroo.astrid.adapter; package com.todoroo.astrid.adapter;
import static org.tasks.Strings.isNullOrEmpty;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import com.todoroo.astrid.api.CaldavFilter; import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.api.GtasksFilter;
@ -119,13 +120,13 @@ public class TaskAdapterProvider {
filterId = TaskListMetadata.FILTER_ID_TODAY; filterId = TaskListMetadata.FILTER_ID_TODAY;
prefId = SubtasksFilterUpdater.TODAY_TASKS_ORDER; prefId = SubtasksFilterUpdater.TODAY_TASKS_ORDER;
} }
if (TextUtils.isEmpty(filterId)) { if (isNullOrEmpty(filterId)) {
return null; return null;
} }
TaskListMetadata list = taskListMetadataDao.fetchByTagOrFilter(filterId); TaskListMetadata list = taskListMetadataDao.fetchByTagOrFilter(filterId);
if (list == null) { if (list == null) {
String defaultOrder = preferences.getStringValue(prefId); String defaultOrder = preferences.getStringValue(prefId);
if (TextUtils.isEmpty(defaultOrder)) { if (isNullOrEmpty(defaultOrder)) {
defaultOrder = "[]"; // $NON-NLS-1$ defaultOrder = "[]"; // $NON-NLS-1$
} }
defaultOrder = SubtasksHelper.convertTreeToRemoteIds(taskDao, defaultOrder); defaultOrder = SubtasksHelper.convertTreeToRemoteIds(taskDao, defaultOrder);

5
app/src/main/java/com/todoroo/astrid/data/Task.java
Unescape Escape View File

@ -14,7 +14,6 @@ import static org.tasks.date.DateTimeUtils.newDateTime;
import android.content.ContentValues; import android.content.ContentValues;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.core.os.ParcelCompat; import androidx.core.os.ParcelCompat;
import androidx.room.ColumnInfo; import androidx.room.ColumnInfo;
@ -325,7 +324,7 @@ public class Task implements Parcelable {
} }
public static boolean isUuidEmpty(String uuid) { public static boolean isUuidEmpty(String uuid) {
return NO_UUID.equals(uuid) || TextUtils.isEmpty(uuid); return NO_UUID.equals(uuid) || isNullOrEmpty(uuid);
} }
public long getId() { public long getId() {
@ -569,7 +568,7 @@ public class Task implements Parcelable {
} }
public boolean hasNotes() { public boolean hasNotes() {
return !TextUtils.isEmpty(notes); return !isNullOrEmpty(notes);
} }
public Long getModificationDate() { public Long getModificationDate() {

13
app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java
Unescape Escape View File

@ -6,12 +6,13 @@
package com.todoroo.astrid.gcal; package com.todoroo.astrid.gcal;
import static org.tasks.Strings.isNullOrEmpty;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.text.TextUtils;
import android.text.format.Time; import android.text.format.Time;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
@ -53,7 +54,7 @@ public class GCalHelper {
private String getTaskEventUri(Task task) { private String getTaskEventUri(Task task) {
String uri; String uri;
if (!TextUtils.isEmpty(task.getCalendarURI())) { if (!isNullOrEmpty(task.getCalendarURI())) {
uri = task.getCalendarURI(); uri = task.getCalendarURI();
} else { } else {
task = taskDao.fetch(task.getId()); task = taskDao.fetch(task.getId());
@ -93,7 +94,7 @@ public class GCalHelper {
String eventuri = getTaskEventUri(task); String eventuri = getTaskEventUri(task);
if (!TextUtils.isEmpty(eventuri) && deleteEventIfExists) { if (!isNullOrEmpty(eventuri) && deleteEventIfExists) {
calendarEventProvider.deleteEvent(task); calendarEventProvider.deleteEvent(task);
} }
@ -103,10 +104,10 @@ public class GCalHelper {
values.put(CalendarContract.Events.HAS_ALARM, 0); values.put(CalendarContract.Events.HAS_ALARM, 0);
boolean valuesContainCalendarId = boolean valuesContainCalendarId =
(values.containsKey(CalendarContract.Events.CALENDAR_ID) (values.containsKey(CalendarContract.Events.CALENDAR_ID)
&& !TextUtils.isEmpty(values.getAsString(CalendarContract.Events.CALENDAR_ID))); && !isNullOrEmpty(values.getAsString(CalendarContract.Events.CALENDAR_ID)));
if (!valuesContainCalendarId) { if (!valuesContainCalendarId) {
String calendarId = preferences.getDefaultCalendar(); String calendarId = preferences.getDefaultCalendar();
if (!TextUtils.isEmpty(calendarId)) { if (!isNullOrEmpty(calendarId)) {
values.put(CalendarContract.Events.CALENDAR_ID, calendarId); values.put(CalendarContract.Events.CALENDAR_ID, calendarId);
} }
} }
@ -128,7 +129,7 @@ public class GCalHelper {
public void rescheduleRepeatingTask(Task task) { public void rescheduleRepeatingTask(Task task) {
String taskUri = getTaskEventUri(task); String taskUri = getTaskEventUri(task);
if (TextUtils.isEmpty(taskUri)) { if (isNullOrEmpty(taskUri)) {
return; return;
} }

3
app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
Unescape Escape View File

@ -15,7 +15,6 @@ import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -235,7 +234,7 @@ public class RepeatControlSet extends TaskEditControlFragment {
} }
copy.setUntil(null); copy.setUntil(null);
String result = copy.toIcal(); String result = copy.toIcal();
if (repeatAfterCompletion && !TextUtils.isEmpty(result)) { if (repeatAfterCompletion && !isNullOrEmpty(result)) {
result += ";FROM=COMPLETION"; // $NON-NLS-1$ result += ";FROM=COMPLETION"; // $NON-NLS-1$
} }

6
app/src/main/java/com/todoroo/astrid/service/TaskCreator.java
Unescape Escape View File

@ -2,10 +2,10 @@ package com.todoroo.astrid.service;
import static com.todoroo.andlib.utility.DateUtilities.now; import static com.todoroo.andlib.utility.DateUtilities.now;
import static com.todoroo.astrid.helper.UUIDHelper.newUUID; import static com.todoroo.astrid.helper.UUIDHelper.newUUID;
import static org.tasks.Strings.isNullOrEmpty;
import android.content.ContentValues; import android.content.ContentValues;
import android.net.Uri; import android.net.Uri;
import android.text.TextUtils;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.CaldavFilter; import com.todoroo.astrid.api.CaldavFilter;
@ -84,9 +84,9 @@ public class TaskCreator {
boolean gcalCreateEventEnabled = boolean gcalCreateEventEnabled =
preferences.isDefaultCalendarSet() && task.hasDueDate(); // $NON-NLS-1$ preferences.isDefaultCalendarSet() && task.hasDueDate(); // $NON-NLS-1$
if (!TextUtils.isEmpty(task.getTitle()) if (!isNullOrEmpty(task.getTitle())
&& gcalCreateEventEnabled && gcalCreateEventEnabled
&& TextUtils.isEmpty(task.getCalendarURI())) { && isNullOrEmpty(task.getCalendarURI())) {
Uri calendarUri = gcalHelper.createTaskEvent(task, new ContentValues()); Uri calendarUri = gcalHelper.createTaskEvent(task, new ContentValues());
task.setCalendarUri(calendarUri.toString()); task.setCalendarUri(calendarUri.toString());
} }

4
app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.todoroo.astrid.subtasks; package com.todoroo.astrid.subtasks;
import static org.tasks.Strings.isNullOrEmpty;
import static org.tasks.db.QueryUtils.showHiddenAndCompleted; import static org.tasks.db.QueryUtils.showHiddenAndCompleted;
import android.text.TextUtils;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
@ -110,7 +110,7 @@ public class SubtasksFilterUpdater {
return "[]"; // $NON-NLS-1$ return "[]"; // $NON-NLS-1$
} }
String order = list.getTaskIds(); String order = list.getTaskIds();
if (TextUtils.isEmpty(order) || "null".equals(order)) // $NON-NLS-1$ if (isNullOrEmpty(order) || "null".equals(order)) // $NON-NLS-1$
{ {
order = "[]"; // $NON-NLS-1$ order = "[]"; // $NON-NLS-1$
} }

6
app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.todoroo.astrid.subtasks; package com.todoroo.astrid.subtasks;
import static org.tasks.Strings.isNullOrEmpty;
import static org.tasks.db.QueryUtils.showHidden; import static org.tasks.db.QueryUtils.showHidden;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.core.BuiltInFilterExposer; import com.todoroo.astrid.core.BuiltInFilterExposer;
@ -52,7 +52,7 @@ public class SubtasksHelper {
serializedTree.split("[\\[\\],\\s]"); // Split on [ ] , or whitespace chars serializedTree.split("[\\[\\],\\s]"); // Split on [ ] , or whitespace chars
for (String idString : digitsOnly) { for (String idString : digitsOnly) {
try { try {
if (!TextUtils.isEmpty(idString)) { if (!isNullOrEmpty(idString)) {
ids.add(Long.parseLong(idString)); ids.add(Long.parseLong(idString));
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
@ -66,7 +66,7 @@ public class SubtasksHelper {
ArrayList<String> ids = new ArrayList<>(); ArrayList<String> ids = new ArrayList<>();
String[] values = serializedTree.split("[\\[\\],\"\\s]"); // Split on [ ] , or whitespace chars String[] values = serializedTree.split("[\\[\\],\"\\s]"); // Split on [ ] , or whitespace chars
for (String idString : values) { for (String idString : values) {
if (!TextUtils.isEmpty(idString)) { if (!isNullOrEmpty(idString)) {
ids.add(idString); ids.add(idString);
} }
} }

9
app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
Unescape Escape View File

@ -6,11 +6,12 @@
package com.todoroo.astrid.timers; package com.todoroo.astrid.timers;
import static org.tasks.Strings.isNullOrEmpty;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock; import android.os.SystemClock;
import android.text.TextUtils;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -196,11 +197,11 @@ public class TimerControlSet extends TaskEditControlFragment {
String toDisplay; String toDisplay;
if (!TextUtils.isEmpty(est) && !TextUtils.isEmpty(elap)) { if (!isNullOrEmpty(est) && !isNullOrEmpty(elap)) {
toDisplay = est + ", " + elap; // $NON-NLS-1$ toDisplay = est + ", " + elap; // $NON-NLS-1$
} else if (!TextUtils.isEmpty(est)) { } else if (!isNullOrEmpty(est)) {
toDisplay = est; toDisplay = est;
} else if (!TextUtils.isEmpty(elap)) { } else if (!isNullOrEmpty(elap)) {
toDisplay = elap; toDisplay = elap;
} else { } else {
toDisplay = null; toDisplay = null;

5
app/src/main/java/com/todoroo/astrid/utility/TitleParser.java
Unescape Escape View File

@ -6,7 +6,8 @@
package com.todoroo.astrid.utility; package com.todoroo.astrid.utility;
import android.text.TextUtils; import static org.tasks.Strings.isNullOrEmpty;
import com.google.ical.values.Frequency; import com.google.ical.values.Frequency;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import com.mdimension.jchronic.AstridChronic; import com.mdimension.jchronic.AstridChronic;
@ -369,7 +370,7 @@ public class TitleParser {
if (cal if (cal
!= null) { // if at least one of the above has been called, write to task. else do nothing. != null) { // if at least one of the above has been called, write to task. else do nothing.
if (!TextUtils.isEmpty(inputText)) { if (!isNullOrEmpty(inputText)) {
task.setTitle(inputText); task.setTitle(inputText);
} }
if (containsSpecificTime) { if (containsSpecificTime) {

3
app/src/main/java/org/tasks/activities/FilterSettingsActivity.java
Unescape Escape View File

@ -6,7 +6,6 @@
package org.tasks.activities; package org.tasks.activities;
import static android.text.TextUtils.isEmpty;
import static com.google.common.collect.Iterables.find; import static com.google.common.collect.Iterables.find;
import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Lists.transform; import static com.google.common.collect.Lists.transform;
@ -288,7 +287,7 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
protected void save() { protected void save() {
String newName = getNewName(); String newName = getNewName();
if (isEmpty(newName)) { if (isNullOrEmpty(newName)) {
nameLayout.setError(getString(R.string.name_cannot_be_empty)); nameLayout.setError(getString(R.string.name_cannot_be_empty));
return; return;
} }

6
app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
Unescape Escape View File

@ -1,6 +1,6 @@
package org.tasks.activities; package org.tasks.activities;
import static android.text.TextUtils.isEmpty; import static org.tasks.Strings.isNullOrEmpty;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -129,7 +129,7 @@ public class GoogleTaskListSettingsActivity extends BaseListSettingsActivity {
String newName = getNewName(); String newName = getNewName();
if (isEmpty(newName)) { if (isNullOrEmpty(newName)) {
Toast.makeText(this, R.string.name_cannot_be_empty, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.name_cannot_be_empty, Toast.LENGTH_LONG).show();
return; return;
} }
@ -193,7 +193,7 @@ public class GoogleTaskListSettingsActivity extends BaseListSettingsActivity {
@Override @Override
protected boolean hasChanges() { protected boolean hasChanges() {
if (isNewList) { if (isNewList) {
return selectedColor >= 0 || !isEmpty(getNewName()); return selectedColor >= 0 || !isNullOrEmpty(getNewName());
} }
return colorChanged() || nameChanged() || iconChanged(); return colorChanged() || nameChanged() || iconChanged();
} }

8
app/src/main/java/org/tasks/activities/TagSettingsActivity.java
Unescape Escape View File

@ -6,7 +6,7 @@
package org.tasks.activities; package org.tasks.activities;
import static android.text.TextUtils.isEmpty; import static org.tasks.Strings.isNullOrEmpty;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -63,7 +63,7 @@ public class TagSettingsActivity extends BaseListSettingsActivity {
name.setText(tagData.getName()); name.setText(tagData.getName());
String autopopulateName = getIntent().getStringExtra(TOKEN_AUTOPOPULATE_NAME); String autopopulateName = getIntent().getStringExtra(TOKEN_AUTOPOPULATE_NAME);
if (!isEmpty(autopopulateName)) { if (!isNullOrEmpty(autopopulateName)) {
name.setText(autopopulateName); name.setText(autopopulateName);
getIntent().removeExtra(TOKEN_AUTOPOPULATE_NAME); getIntent().removeExtra(TOKEN_AUTOPOPULATE_NAME);
} else if (isNewTag) { } else if (isNewTag) {
@ -108,7 +108,7 @@ public class TagSettingsActivity extends BaseListSettingsActivity {
protected void save() { protected void save() {
String newName = getNewName(); String newName = getNewName();
if (isEmpty(newName)) { if (isNullOrEmpty(newName)) {
nameLayout.setError(getString(R.string.name_cannot_be_empty)); nameLayout.setError(getString(R.string.name_cannot_be_empty));
return; return;
} }
@ -142,7 +142,7 @@ public class TagSettingsActivity extends BaseListSettingsActivity {
@Override @Override
protected boolean hasChanges() { protected boolean hasChanges() {
if (isNewTag) { if (isNewTag) {
return selectedColor >= 0 || selectedIcon >= 0 || !isEmpty(getNewName()); return selectedColor >= 0 || selectedIcon >= 0 || !isNullOrEmpty(getNewName());
} }
return !(selectedColor == tagData.getColor() return !(selectedColor == tagData.getColor()
&& selectedIcon == tagData.getIcon() && selectedIcon == tagData.getIcon()

22
app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.caldav; package org.tasks.caldav;
import static android.text.TextUtils.isEmpty;
import static com.todoroo.astrid.data.Task.NO_ID; import static com.todoroo.astrid.data.Task.NO_ID;
import static org.tasks.Strings.isNullOrEmpty; import static org.tasks.Strings.isNullOrEmpty;
@ -8,6 +7,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.text.util.Linkify; import android.text.util.Linkify;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -82,7 +82,7 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
binding.name.setText(caldavAccount.getName()); binding.name.setText(caldavAccount.getName());
binding.url.setText(caldavAccount.getUrl()); binding.url.setText(caldavAccount.getUrl());
binding.user.setText(caldavAccount.getUsername()); binding.user.setText(caldavAccount.getUsername());
if (!isEmpty(caldavAccount.getPassword())) { if (!isNullOrEmpty(caldavAccount.getPassword())) {
binding.password.setText(PASSWORD_MASK); binding.password.setText(PASSWORD_MASK);
} }
binding.repeat.setChecked(caldavAccount.isSuppressRepeatingTasks()); binding.repeat.setChecked(caldavAccount.isSuppressRepeatingTasks());
@ -165,7 +165,7 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
binding.password.setText(""); binding.password.setText("");
} }
} else { } else {
if (isEmpty(binding.password.getText()) && caldavAccount != null) { if (TextUtils.isEmpty(binding.password.getText()) && caldavAccount != null) {
binding.password.setText(PASSWORD_MASK); binding.password.setText(PASSWORD_MASK);
} }
} }
@ -201,7 +201,7 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
boolean failed = false; boolean failed = false;
if (isEmpty(url)) { if (isNullOrEmpty(url)) {
binding.urlLayout.setError(getString(R.string.url_required)); binding.urlLayout.setError(getString(R.string.url_required));
failed = true; failed = true;
} else { } else {
@ -209,7 +209,7 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
String scheme = baseURL.getScheme(); String scheme = baseURL.getScheme();
if ("https".equalsIgnoreCase(scheme) || "http".equalsIgnoreCase(scheme)) { if ("https".equalsIgnoreCase(scheme) || "http".equalsIgnoreCase(scheme)) {
String host = baseURL.getHost(); String host = baseURL.getHost();
if (isEmpty(host)) { if (isNullOrEmpty(host)) {
binding.urlLayout.setError(getString(R.string.url_host_name_required)); binding.urlLayout.setError(getString(R.string.url_host_name_required));
failed = true; failed = true;
} else { } else {
@ -233,12 +233,12 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
} }
} }
if (isEmpty(username)) { if (isNullOrEmpty(username)) {
binding.userLayout.setError(getString(R.string.username_required)); binding.userLayout.setError(getString(R.string.username_required));
failed = true; failed = true;
} }
if (isEmpty(password)) { if (isNullOrEmpty(password)) {
binding.passwordLayout.setError(getString(R.string.password_required)); binding.passwordLayout.setError(getString(R.string.password_required));
failed = true; failed = true;
} }
@ -308,10 +308,10 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
private boolean hasChanges() { private boolean hasChanges() {
if (caldavAccount == null) { if (caldavAccount == null) {
return !isEmpty(binding.name.getText().toString().trim()) return !isNullOrEmpty(binding.name.getText().toString().trim())
|| !isEmpty(getNewPassword()) || !isNullOrEmpty(getNewPassword())
|| !isEmpty(binding.url.getText().toString().trim()) || !isNullOrEmpty(binding.url.getText().toString().trim())
|| !isEmpty(getNewUsername()) || !isNullOrEmpty(getNewUsername())
|| binding.repeat.isChecked(); || binding.repeat.isChecked();
} }
return needsValidation() return needsValidation()

6
app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java
Unescape Escape View File

@ -1,6 +1,6 @@
package org.tasks.caldav; package org.tasks.caldav;
import static android.text.TextUtils.isEmpty; import static org.tasks.Strings.isNullOrEmpty;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -114,7 +114,7 @@ public abstract class BaseCaldavCalendarSettingsActivity extends BaseListSetting
String name = getNewName(); String name = getNewName();
if (isEmpty(name)) { if (isNullOrEmpty(name)) {
nameLayout.setError(getString(R.string.name_cannot_be_empty)); nameLayout.setError(getString(R.string.name_cannot_be_empty));
return; return;
} }
@ -211,7 +211,7 @@ public abstract class BaseCaldavCalendarSettingsActivity extends BaseListSetting
@Override @Override
protected boolean hasChanges() { protected boolean hasChanges() {
return caldavCalendar == null return caldavCalendar == null
? !isEmpty(getNewName()) || selectedColor != 0 || selectedIcon != -1 ? !isNullOrEmpty(getNewName()) || selectedColor != 0 || selectedIcon != -1
: nameChanged() || iconChanged() || colorChanged(); : nameChanged() || iconChanged() || colorChanged();
} }

8
app/src/main/java/org/tasks/caldav/CaldavClient.java
Unescape Escape View File

@ -1,9 +1,9 @@
package org.tasks.caldav; package org.tasks.caldav;
import static android.text.TextUtils.isEmpty;
import static at.bitfire.dav4jvm.XmlUtils.NS_CALDAV; import static at.bitfire.dav4jvm.XmlUtils.NS_CALDAV;
import static at.bitfire.dav4jvm.XmlUtils.NS_CARDDAV; import static at.bitfire.dav4jvm.XmlUtils.NS_CARDDAV;
import static at.bitfire.dav4jvm.XmlUtils.NS_WEBDAV; import static at.bitfire.dav4jvm.XmlUtils.NS_WEBDAV;
import static org.tasks.Strings.isNullOrEmpty;
import android.content.Context; import android.content.Context;
import at.bitfire.cert4android.CustomCertManager; import at.bitfire.cert4android.CustomCertManager;
@ -148,7 +148,7 @@ public class CaldavClient {
CurrentUserPrincipal currentUserPrincipal = response.get(CurrentUserPrincipal.class); CurrentUserPrincipal currentUserPrincipal = response.get(CurrentUserPrincipal.class);
if (currentUserPrincipal != null) { if (currentUserPrincipal != null) {
String href = currentUserPrincipal.getHref(); String href = currentUserPrincipal.getHref();
if (!isEmpty(href)) { if (!isNullOrEmpty(href)) {
return href; return href;
} }
} }
@ -170,7 +170,7 @@ public class CaldavClient {
throw new DisplayableException(R.string.caldav_home_set_not_found); throw new DisplayableException(R.string.caldav_home_set_not_found);
} }
String homeSet = hrefs.get(0); String homeSet = hrefs.get(0);
if (isEmpty(homeSet)) { if (isNullOrEmpty(homeSet)) {
throw new DisplayableException(R.string.caldav_home_set_not_found); throw new DisplayableException(R.string.caldav_home_set_not_found);
} }
return davResource.getLocation().resolve(homeSet).toString(); return davResource.getLocation().resolve(homeSet).toString();
@ -192,7 +192,7 @@ public class CaldavClient {
principal = tryFindPrincipal(""); principal = tryFindPrincipal("");
} }
return forUrl( return forUrl(
(isEmpty(principal) ? this.httpUrl : httpUrl.resolve(principal)).toString(), (isNullOrEmpty(principal) ? this.httpUrl : httpUrl.resolve(principal)).toString(),
basicDigestAuthHandler.getUsername(), basicDigestAuthHandler.getUsername(),
basicDigestAuthHandler.getPassword()) basicDigestAuthHandler.getPassword())
.findHomeset(); .findHomeset();

4
app/src/main/java/org/tasks/calendars/CalendarEventProvider.java
Unescape Escape View File

@ -1,13 +1,13 @@
package org.tasks.calendars; package org.tasks.calendars;
import static android.provider.BaseColumns._ID; import static android.provider.BaseColumns._ID;
import static org.tasks.Strings.isNullOrEmpty;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.text.TextUtils;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import java.util.ArrayList; import java.util.ArrayList;
@ -71,7 +71,7 @@ public class CalendarEventProvider {
} }
private void deleteEvent(String eventUri) { private void deleteEvent(String eventUri) {
if (!TextUtils.isEmpty(eventUri)) { if (!isNullOrEmpty(eventUri)) {
deleteEvent(Uri.parse(eventUri)); deleteEvent(Uri.parse(eventUri));
} }
} }

6
app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java
Unescape Escape View File

@ -1,6 +1,6 @@
package org.tasks.etesync; package org.tasks.etesync;
import static android.text.TextUtils.isEmpty; import static org.tasks.Strings.isNullOrEmpty;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
@ -111,7 +111,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity
String encryptionPassword = getNewEncryptionPassword(); String encryptionPassword = getNewEncryptionPassword();
String derivedKey = caldavAccount.getEncryptionPassword(encryption); String derivedKey = caldavAccount.getEncryptionPassword(encryption);
if (isEmpty(encryptionPassword) && isEmpty(derivedKey)) { if (isNullOrEmpty(encryptionPassword) && isNullOrEmpty(derivedKey)) {
binding.encryptionPasswordLayout.setError(getString(R.string.encryption_password_required)); binding.encryptionPasswordLayout.setError(getString(R.string.encryption_password_required));
return; return;
} }
@ -125,7 +125,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity
} }
String key = String key =
isEmpty(encryptionPassword) isNullOrEmpty(encryptionPassword)
? derivedKey ? derivedKey
: Crypto.deriveKey(caldavAccount.getUsername(), encryptionPassword); : Crypto.deriveKey(caldavAccount.getUsername(), encryptionPassword);
CryptoManager cryptoManager; CryptoManager cryptoManager;

3
app/src/main/java/org/tasks/fragments/CommentBarFragment.java
Unescape Escape View File

@ -10,7 +10,6 @@ import android.graphics.Bitmap;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -205,7 +204,7 @@ public class CommentBarFragment extends TaskEditControlFragment {
private void addComment(String message) { private void addComment(String message) {
// Allow for users to just add picture // Allow for users to just add picture
if (TextUtils.isEmpty(message)) { if (isNullOrEmpty(message)) {
message = " "; message = " ";
} }
Uri picture = pendingCommentPicture; Uri picture = pendingCommentPicture;

5
app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
Unescape Escape View File

@ -5,7 +5,6 @@ import static org.tasks.Strings.isNullOrEmpty;
import static org.tasks.date.DateTimeUtils.newDateTime; import static org.tasks.date.DateTimeUtils.newDateTime;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
@ -286,7 +285,7 @@ public class GoogleTaskSynchronizer {
// If task was newly created but without a title, don't sync--we're in the middle of // If task was newly created but without a title, don't sync--we're in the middle of
// creating a task which may end up being cancelled. Also don't sync new but already // creating a task which may end up being cancelled. Also don't sync new but already
// deleted tasks // deleted tasks
if (newlyCreated && (TextUtils.isEmpty(task.getTitle()) || task.getDeletionDate() > 0)) { if (newlyCreated && (isNullOrEmpty(task.getTitle()) || task.getDeletionDate() > 0)) {
return; return;
} }
@ -481,7 +480,7 @@ public class GoogleTaskSynchronizer {
} }
private void write(Task task, GoogleTask googleTask) { private void write(Task task, GoogleTask googleTask) {
if (!(TextUtils.isEmpty(task.getTitle()) && TextUtils.isEmpty(task.getNotes()))) { if (!(isNullOrEmpty(task.getTitle()) && isNullOrEmpty(task.getNotes()))) {
task.suppressSync(); task.suppressSync();
task.suppressRefresh(); task.suppressRefresh();
if (task.isNew()) { if (task.isNew()) {

4
app/src/main/java/org/tasks/jobs/AfterSaveWork.java
Unescape Escape View File

@ -1,13 +1,13 @@
package org.tasks.jobs; package org.tasks.jobs;
import static com.todoroo.astrid.dao.TaskDao.TRANS_SUPPRESS_REFRESH; import static com.todoroo.astrid.dao.TaskDao.TRANS_SUPPRESS_REFRESH;
import static org.tasks.Strings.isNullOrEmpty;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.text.TextUtils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.work.Data; import androidx.work.Data;
import androidx.work.Data.Builder; import androidx.work.Data.Builder;
@ -129,7 +129,7 @@ public class AfterSaveWork extends InjectingWorker {
private void updateCalendarTitle(Task task) { private void updateCalendarTitle(Task task) {
String calendarUri = task.getCalendarURI(); String calendarUri = task.getCalendarURI();
if (!TextUtils.isEmpty(calendarUri)) { if (!isNullOrEmpty(calendarUri)) {
try { try {
// change title of calendar event // change title of calendar event
ContentResolver cr = context.getContentResolver(); ContentResolver cr = context.getContentResolver();

3
app/src/main/java/org/tasks/notifications/NotificationManager.java
Unescape Escape View File

@ -20,7 +20,6 @@ import android.annotation.SuppressLint;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.text.TextUtils;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat; import androidx.core.app.NotificationManagerCompat;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
@ -332,7 +331,7 @@ public class NotificationManager {
} }
// new task edit in progress // new task edit in progress
if (TextUtils.isEmpty(task.getTitle())) { if (isNullOrEmpty(task.getTitle())) {
return null; return null;
} }

3
app/src/main/java/org/tasks/preferences/Preferences.java
Unescape Escape View File

@ -16,7 +16,6 @@ import android.content.pm.PackageManager;
import android.media.RingtoneManager; import android.media.RingtoneManager;
import android.net.Uri; import android.net.Uri;
import android.os.Binder; import android.os.Binder;
import android.text.TextUtils;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.documentfile.provider.DocumentFile; import androidx.documentfile.provider.DocumentFile;
@ -228,7 +227,7 @@ public class Preferences {
} }
public boolean isStringValueSet(int keyResource) { public boolean isStringValueSet(int keyResource) {
return !TextUtils.isEmpty(getStringValue(keyResource)); return !isNullOrEmpty(getStringValue(keyResource));
} }
public int getDefaultReminders() { public int getDefaultReminders() {

Write Preview
Loading…
Cancel
Save