Remove redundant casts, unused code and imports

pull/574/head
Alex Baker 7 years ago
parent a05a655a66
commit 58df07be2e

@ -8,7 +8,6 @@ package com.todoroo.astrid.gtasks;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;

@ -38,10 +38,6 @@ public class AccountManager {
return getAccount(name) != null; return getAccount(name) != null;
} }
public boolean isEmpty() {
return getAccounts().isEmpty();
}
private List<Account> getAccountList() { private List<Account> getAccountList() {
return permissionChecker.canAccessAccounts() return permissionChecker.canAccessAccounts()
? asList(googleAccountManager.getAccounts()) ? asList(googleAccountManager.getAccounts())

@ -74,10 +74,6 @@ public class Field extends DBObject<Field> {
return UnaryCriterion.like(this, value); return UnaryCriterion.like(this, value);
} }
public Criterion like(String value, String escape) {
return UnaryCriterion.like(this, value, escape);
}
public <T> Criterion in(final Iterable<T> value) { public <T> Criterion in(final Iterable<T> value) {
final Field field = this; final Field field = this;
return new Criterion(Operator.in) { return new Criterion(Operator.in) {

@ -1,58 +0,0 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.andlib.utility;
/**
* Pair utility class
*
* @author Tim Su <tim@todoroo.com>
*
* @param <L>
* @param <R>
*/
public class Pair<L, R> {
private final L left;
private final R right;
public R getRight() {
return right;
}
public L getLeft() {
return left;
}
public Pair(final L left, final R right) {
this.left = left;
this.right = right;
}
@Override
public final boolean equals(Object o) {
if (!(o instanceof Pair<?, ?>)) {
return false;
}
final Pair<?, ?> other = (Pair<?, ?>) o;
return equal(getLeft(), other.getLeft()) && equal(getRight(), other.getRight());
}
private static boolean equal(Object o1, Object o2) {
if (o1 == null) {
return o2 == null;
}
return o1.equals(o2);
}
@Override
public int hashCode() {
int hLeft = getLeft() == null ? 0 : getLeft().hashCode();
int hRight = getRight() == null ? 0 : getRight().hashCode();
return hLeft + (57 * hRight);
}
}

@ -108,16 +108,16 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
switch(viewType) { switch(viewType) {
case ITEM: case ITEM:
convertView = inflater.inflate(R.layout.filter_adapter_row, parent, false); convertView = inflater.inflate(R.layout.filter_adapter_row, parent, false);
viewHolder.name = (TextView)convertView.findViewById(R.id.name); viewHolder.name = convertView.findViewById(R.id.name);
viewHolder.icon = (ImageView) convertView.findViewById(R.id.icon); viewHolder.icon = convertView.findViewById(R.id.icon);
viewHolder.size = (TextView)convertView.findViewById(R.id.size); viewHolder.size = convertView.findViewById(R.id.size);
break; break;
case SEPARATOR: case SEPARATOR:
convertView = inflater.inflate(R.layout.filter_adapter_separator, parent, false); convertView = inflater.inflate(R.layout.filter_adapter_separator, parent, false);
break; break;
case SUBHEADER: case SUBHEADER:
convertView = inflater.inflate(R.layout.filter_adapter_subheader, parent, false); convertView = inflater.inflate(R.layout.filter_adapter_subheader, parent, false);
viewHolder.name = (TextView) convertView.findViewById(R.id.subheader_text); viewHolder.name = convertView.findViewById(R.id.subheader_text);
break; break;
} }
viewHolder.view = convertView; viewHolder.view = convertView;

@ -23,7 +23,6 @@ import com.todoroo.astrid.service.SynchronizeMetadataCallback;
import org.tasks.injection.ApplicationScope; import org.tasks.injection.ApplicationScope;
import org.tasks.jobs.Alarm; import org.tasks.jobs.Alarm;
import org.tasks.jobs.JobQueue; import org.tasks.jobs.JobQueue;
import org.tasks.jobs.JobQueueEntry;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;

@ -7,7 +7,6 @@ package com.todoroo.astrid.backup;
import android.app.Activity; import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Handler; import android.os.Handler;
import android.text.TextUtils; import android.text.TextUtils;
@ -19,7 +18,6 @@ import com.todoroo.andlib.data.Property.PropertyVisitor;
import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;

@ -154,7 +154,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity imple
toolbar.setOnMenuItemClickListener(this); toolbar.setOnMenuItemClickListener(this);
toolbar.setNavigationOnClickListener(view -> discard()); toolbar.setNavigationOnClickListener(view -> discard());
MenuColorizer.colorToolbar(this, toolbar); MenuColorizer.colorToolbar(this, toolbar);
listView = (ListView) findViewById(android.R.id.list); listView = findViewById(android.R.id.list);
database.openForReading(); database.openForReading();

@ -148,9 +148,9 @@ class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
if(convertView == null) { if(convertView == null) {
convertView = inflater.inflate(R.layout.custom_filter_row, parent, false); convertView = inflater.inflate(R.layout.custom_filter_row, parent, false);
ViewHolder viewHolder = new ViewHolder(); ViewHolder viewHolder = new ViewHolder();
viewHolder.type = (ImageView) convertView.findViewById(R.id.type); viewHolder.type = convertView.findViewById(R.id.type);
viewHolder.name= (TextView) convertView.findViewById(R.id.name); viewHolder.name= convertView.findViewById(R.id.name);
viewHolder.filterCount = (TextView) convertView.findViewById(R.id.filter_count); viewHolder.filterCount = convertView.findViewById(R.id.filter_count);
convertView.setTag(viewHolder); convertView.setTag(viewHolder);
} }

@ -10,7 +10,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.net.Uri; import android.net.Uri;
import android.text.Spannable; import android.text.Spannable;
import android.text.style.URLSpan; import android.text.style.URLSpan;
@ -93,7 +92,6 @@ public class LinkActionExposer {
return null; return null;
} }
Resources r = context.getResources();
int icon; int icon;
if (url.startsWith("mailto")) { if (url.startsWith("mailto")) {
icon = R.drawable.ic_email_black_24dp; icon = R.drawable.ic_email_black_24dp;

@ -33,13 +33,6 @@ public class TagDataDao {
dao = new RemoteModelDao<>(database, TagData.class); dao = new RemoteModelDao<>(database, TagData.class);
} }
/**
* Fetch a model object by UUID
*/
public TagData fetch(String uuid, Property<?>... properties) {
return dao.getFirst(Query.select(properties).where(RemoteModel.UUID_PROPERTY.eq(uuid)));
}
public TagData getTagByName(String name, Property<?>... properties) { public TagData getTagByName(String name, Property<?>... properties) {
return dao.getFirst(Query.select(properties).where(TagData.NAME.eqCaseInsensitive(name))); return dao.getFirst(Query.select(properties).where(TagData.NAME.eqCaseInsensitive(name)));
} }

@ -140,7 +140,7 @@ public class FilesControlSet extends TaskEditControlFragment {
} }
private void addAttachment(final TaskAttachment taskAttachment, final View fileRow) { private void addAttachment(final TaskAttachment taskAttachment, final View fileRow) {
TextView nameView = (TextView) fileRow.findViewById(R.id.file_text); TextView nameView = fileRow.findViewById(R.id.file_text);
String name = LEFT_TO_RIGHT_MARK + taskAttachment.getName(); String name = LEFT_TO_RIGHT_MARK + taskAttachment.getName();
nameView.setText(name); nameView.setText(name);
nameView.setOnClickListener(v -> showFile(taskAttachment)); nameView.setOnClickListener(v -> showFile(taskAttachment));

@ -88,9 +88,9 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity {
eventName = intent.getStringExtra(TOKEN_EVENT_NAME); eventName = intent.getStringExtra(TOKEN_EVENT_NAME);
endTime = intent.getLongExtra(TOKEN_EVENT_END_TIME, DateUtilities.now() + DateUtilities.ONE_HOUR); endTime = intent.getLongExtra(TOKEN_EVENT_END_TIME, DateUtilities.now() + DateUtilities.ONE_HOUR);
createListButton = (TextView) findViewById(R.id.create_list); createListButton = findViewById(R.id.create_list);
postponeButton = (TextView) findViewById(R.id.postpone); postponeButton = findViewById(R.id.postpone);
ignoreButton = (TextView) findViewById(R.id.ignore); ignoreButton = findViewById(R.id.ignore);
ignoreSettingsButton = findViewById(R.id.ignore_settings); ignoreSettingsButton = findViewById(R.id.ignore_settings);
dismissButton = findViewById(R.id.dismiss); dismissButton = findViewById(R.id.dismiss);
@ -108,7 +108,7 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity {
((TextView) findViewById(R.id.reminder_title)) ((TextView) findViewById(R.id.reminder_title))
.setText(getString(R.string.CRA_title)); .setText(getString(R.string.CRA_title));
TextView dialogView = (TextView) findViewById(R.id.reminder_message); TextView dialogView = findViewById(R.id.reminder_message);
String speechText; String speechText;
if (fromPostpone) { if (fromPostpone) {
speechText = getString(R.string.CRA_speech_bubble_end, eventName); speechText = getString(R.string.CRA_speech_bubble_end, eventName);

@ -117,13 +117,13 @@ public class CommentsController {
/** Helper method to set the contents and visibility of each field */ /** Helper method to set the contents and visibility of each field */
private void bindView(View view, NoteOrUpdate item) { private void bindView(View view, NoteOrUpdate item) {
// name // name
final TextView nameView = (TextView)view.findViewById(R.id.title); { final TextView nameView = view.findViewById(R.id.title); {
nameView.setText(item.title); nameView.setText(item.title);
Linkify.addLinks(nameView, Linkify.ALL); Linkify.addLinks(nameView, Linkify.ALL);
} }
// date // date
final TextView date = (TextView)view.findViewById(R.id.date); { final TextView date = view.findViewById(R.id.date); {
CharSequence dateString = DateUtils.getRelativeTimeSpanString(item.createdAt, CharSequence dateString = DateUtils.getRelativeTimeSpanString(item.createdAt,
DateUtilities.now(), DateUtils.MINUTE_IN_MILLIS, DateUtilities.now(), DateUtils.MINUTE_IN_MILLIS,
DateUtils.FORMAT_ABBREV_RELATIVE); DateUtils.FORMAT_ABBREV_RELATIVE);
@ -131,7 +131,7 @@ public class CommentsController {
} }
// picture // picture
final ImageView commentPictureView = (ImageView)view.findViewById(R.id.comment_picture); final ImageView commentPictureView = view.findViewById(R.id.comment_picture);
setupImagePopupForCommentView(view, commentPictureView, item.commentBitmap, activity); setupImagePopupForCommentView(view, commentPictureView, item.commentBitmap, activity);
} }

@ -57,8 +57,6 @@ public final class ReminderService {
private final Random random; private final Random random;
private final Preferences preferences; private final Preferences preferences;
private long now = -1; // For tracking when reminders might be scheduled all at once
@Inject @Inject
ReminderService(Preferences preferences, JobQueue jobQueue) { ReminderService(Preferences preferences, JobQueue jobQueue) {
this(preferences, jobQueue, new Random()); this(preferences, jobQueue, new Random());

@ -131,12 +131,12 @@ public class RepeatControlSet extends TaskEditControlFragment {
} }
dialogView = inflater.inflate(R.layout.control_set_repeat, null); dialogView = inflater.inflate(R.layout.control_set_repeat, null);
value = (Button) dialogView.findViewById(R.id.repeatValue); value = dialogView.findViewById(R.id.repeatValue);
Spinner interval = (Spinner) dialogView.findViewById(R.id.repeatInterval); Spinner interval = dialogView.findViewById(R.id.repeatInterval);
ArrayAdapter<String> intervalAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.repeat_interval)); ArrayAdapter<String> intervalAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.repeat_interval));
intervalAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); intervalAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
interval.setAdapter(intervalAdapter); interval.setAdapter(intervalAdapter);
Spinner type = (Spinner) dialogView.findViewById(R.id.repeatType); Spinner type = dialogView.findViewById(R.id.repeatType);
ArrayAdapter<String> typeAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.repeat_type)); ArrayAdapter<String> typeAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.repeat_type));
typeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); typeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
type.setAdapter(typeAdapter); type.setAdapter(typeAdapter);
@ -151,8 +151,8 @@ public class RepeatControlSet extends TaskEditControlFragment {
} }
}); });
daysOfWeekContainer = (LinearLayout) dialogView.findViewById(R.id.repeatDayOfWeekContainer); daysOfWeekContainer = dialogView.findViewById(R.id.repeatDayOfWeekContainer);
repeatUntil = (Spinner) dialogView.findViewById(R.id.repeat_until); repeatUntil = dialogView.findViewById(R.id.repeat_until);
repeatUntilAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, repeatUntilOptions); repeatUntilAdapter = new ArrayAdapter<>(context, android.R.layout.simple_spinner_item, repeatUntilOptions);
repeatUntilAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); repeatUntilAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
repeatUntil.setAdapter(repeatUntilAdapter); repeatUntil.setAdapter(repeatUntilAdapter);

@ -57,15 +57,6 @@ public class TaskDeleter {
return markDeleted(tasks); return markDeleted(tasks);
} }
public void undelete(List<Task> tasks) {
for (Task task : tasks) {
Task template = new Task();
template.setId(task.getId());
template.setDeletionDate(0L);
taskDao.save(template);
}
}
private int markDeleted(List<Task> tasks) { private int markDeleted(List<Task> tasks) {
for (Task task : tasks) { for (Task task : tasks) {
delete(task); delete(task);

@ -7,8 +7,6 @@ package com.todoroo.astrid.subtasks;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle;
import android.view.View;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;

@ -151,8 +151,8 @@ public final class TagsControlSet extends TaskEditControlFragment {
} }
allTags = tagService.getTagList(); allTags = tagService.getTagList();
dialogView = inflater.inflate(R.layout.control_set_tag_list, null); dialogView = inflater.inflate(R.layout.control_set_tag_list, null);
newTagLayout = (LinearLayout) dialogView.findViewById(R.id.newTags); newTagLayout = dialogView.findViewById(R.id.newTags);
tagListView = (ListView) dialogView.findViewById(R.id.existingTags); tagListView = dialogView.findViewById(R.id.existingTags);
tagListView.setAdapter(new ArrayAdapter<TagData>(getActivity(), R.layout.simple_list_item_multiple_choice_themed, allTags) { tagListView.setAdapter(new ArrayAdapter<TagData>(getActivity(), R.layout.simple_list_item_multiple_choice_themed, allTags) {
@NonNull @NonNull
@SuppressLint("NewApi") @SuppressLint("NewApi")
@ -244,7 +244,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
} }
} }
for (int i = newTagLayout.getChildCount() - 1; i >= 0 ; i--) { for (int i = newTagLayout.getChildCount() - 1; i >= 0 ; i--) {
TextView tagName = (TextView) newTagLayout.getChildAt(i).findViewById(R.id.text1); TextView tagName = newTagLayout.getChildAt(i).findViewById(R.id.text1);
final String text = tagName.getText().toString(); final String text = tagName.getText().toString();
if (Strings.isNullOrEmpty(text)) { if (Strings.isNullOrEmpty(text)) {
continue; continue;
@ -268,7 +268,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
private ArrayList<String> getNewTags() { private ArrayList<String> getNewTags() {
ArrayList<String> tags = new ArrayList<>(); ArrayList<String> tags = new ArrayList<>();
for (int i = newTagLayout.getChildCount() - 1 ; i >= 0 ; i--) { for (int i = newTagLayout.getChildCount() - 1 ; i >= 0 ; i--) {
TextView textView = (TextView) newTagLayout.getChildAt(i).findViewById(R.id.text1); TextView textView = newTagLayout.getChildAt(i).findViewById(R.id.text1);
String tagName = textView.getText().toString(); String tagName = textView.getText().toString();
if (Strings.isNullOrEmpty(tagName)) { if (Strings.isNullOrEmpty(tagName)) {
continue; continue;
@ -286,7 +286,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
TextView lastText; TextView lastText;
for(int i = 0; i < newTagLayout.getChildCount(); i++) { for(int i = 0; i < newTagLayout.getChildCount(); i++) {
View view = newTagLayout.getChildAt(i); View view = newTagLayout.getChildAt(i);
lastText = (TextView) view.findViewById(R.id.text1); lastText = view.findViewById(R.id.text1);
if(lastText.getText().equals(tagName)) { if(lastText.getText().equals(tagName)) {
return; return;
} }
@ -299,7 +299,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
tagName = ""; //$NON-NLS-1$ tagName = ""; //$NON-NLS-1$
} }
final AutoCompleteTextView textView = (AutoCompleteTextView)tagItem. final AutoCompleteTextView textView = tagItem.
findViewById(R.id.text1); findViewById(R.id.text1);
textView.setText(tagName); textView.setText(tagName);

@ -97,16 +97,16 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
mHandler = new Handler(); mHandler = new Handler();
InputFilter inputFilter = new NumberPickerInputFilter(); InputFilter inputFilter = new NumberPickerInputFilter();
mNumberInputFilter = new NumberRangeKeyListener(); mNumberInputFilter = new NumberRangeKeyListener();
mIncrementButton = (NumberPickerButton) findViewById(R.id.increment); mIncrementButton = findViewById(R.id.increment);
mIncrementButton.setOnClickListener(this); mIncrementButton.setOnClickListener(this);
mIncrementButton.setOnLongClickListener(this); mIncrementButton.setOnLongClickListener(this);
mIncrementButton.setNumberPicker(this); mIncrementButton.setNumberPicker(this);
mDecrementButton = (NumberPickerButton) findViewById(R.id.decrement); mDecrementButton = findViewById(R.id.decrement);
mDecrementButton.setOnClickListener(this); mDecrementButton.setOnClickListener(this);
mDecrementButton.setOnLongClickListener(this); mDecrementButton.setOnLongClickListener(this);
mDecrementButton.setNumberPicker(this); mDecrementButton.setNumberPicker(this);
mText = (EditText) findViewById(R.id.timepicker_input); mText = findViewById(R.id.timepicker_input);
mText.setOnFocusChangeListener(this); mText.setOnFocusChangeListener(this);
mText.setFilters(new InputFilter[] {inputFilter}); mText.setFilters(new InputFilter[] {inputFilter});

@ -37,7 +37,7 @@ public class NumberPickerDialog extends AlertDialog implements OnClickListener {
setView(view); setView(view);
setTitle(title); setTitle(title);
mPicker = (NumberPicker) view.findViewById(R.id.numberPicker); mPicker = view.findViewById(R.id.numberPicker);
mPicker.setIncrementBy(incrementBy); mPicker.setIncrementBy(incrementBy);
mPicker.setRange(start, end); mPicker.setRange(start, end);
mPicker.setCurrent(initialValue); mPicker.setCurrent(initialValue);

@ -27,7 +27,7 @@ class RandomReminderControlSet {
private final int[] hours; private final int[] hours;
public RandomReminderControlSet(Context context, View parentView, long reminderPeriod) { public RandomReminderControlSet(Context context, View parentView, long reminderPeriod) {
Spinner periodSpinner = (Spinner) parentView.findViewById(R.id.reminder_random_interval); Spinner periodSpinner = parentView.findViewById(R.id.reminder_random_interval);
periodSpinner.setVisibility(View.VISIBLE); periodSpinner.setVisibility(View.VISIBLE);
// create adapter // create adapter
ArrayAdapter<String> adapter = new ArrayAdapter<>( ArrayAdapter<String> adapter = new ArrayAdapter<>(

@ -331,7 +331,7 @@ public class ReminderControlSet extends TaskEditControlFragment {
} }
private void addAlarmRow(final View alertItem, String text, final View.OnClickListener onRemove) { private void addAlarmRow(final View alertItem, String text, final View.OnClickListener onRemove) {
TextView display = (TextView) alertItem.findViewById(R.id.alarm_string); TextView display = alertItem.findViewById(R.id.alarm_string);
display.setText(text); display.setText(text);
alertItem.findViewById(R.id.clear).setOnClickListener(v -> { alertItem.findViewById(R.id.clear).setOnClickListener(v -> {
alertContainer.removeView(alertItem); alertContainer.removeView(alertItem);

@ -30,7 +30,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener, View.OnC
this.context = context; this.context = context;
this.theme = theme; this.theme = theme;
timeButton = (TextView)view.findViewById(timeButtonId); timeButton = view.findViewById(timeButtonId);
((View) timeButton.getParent()).setOnClickListener(this); ((View) timeButton.getParent()).setOnClickListener(this);
} }

@ -78,7 +78,7 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity imp
} }
@OnTextChanged(R.id.name) @OnTextChanged(R.id.name)
void onTextChanged(CharSequence text) { void onTextChanged(CharSequence ignored) {
nameLayout.setError(null); nameLayout.setError(null);
} }

@ -132,7 +132,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem
} }
@OnTextChanged(R.id.name) @OnTextChanged(R.id.name)
void onTextChanged(CharSequence text) { void onTextChanged(CharSequence ignored) {
nameLayout.setError(null); nameLayout.setError(null);
} }

@ -3,11 +3,9 @@ package org.tasks.dashclock;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import com.google.android.apps.dashclock.api.ExtensionData; import com.google.android.apps.dashclock.api.ExtensionData;
import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.api.AstridApiConstants;
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;

@ -121,11 +121,6 @@ public class AlertDialogBuilder {
return this; return this;
} }
public AlertDialogBuilder setCancelable(boolean b) {
builder.setCancelable(b);
return this;
}
public AlertDialog create() { public AlertDialog create() {
AlertDialog dialog = builder.create(); AlertDialog dialog = builder.create();
theme.applyToContext(dialog.getContext()); theme.applyToContext(dialog.getContext());

@ -43,7 +43,7 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
ViewGroup root = (ViewGroup) findViewById(android.R.id.content); ViewGroup root = findViewById(android.R.id.content);
View content = root.getChildAt(0); View content = root.getChildAt(0);
LinearLayout toolbarContainer = (LinearLayout) View.inflate(this, R.layout.activity_prefs, null); LinearLayout toolbarContainer = (LinearLayout) View.inflate(this, R.layout.activity_prefs, null);
@ -51,7 +51,7 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
toolbarContainer.addView(content); toolbarContainer.addView(content);
root.addView(toolbarContainer); root.addView(toolbarContainer);
toolbar = (Toolbar) toolbarContainer.findViewById(R.id.toolbar); toolbar = toolbarContainer.findViewById(R.id.toolbar);
try { try {
ComponentName componentName = new ComponentName(this, getClass()); ComponentName componentName = new ComponentName(this, getClass());
ActivityInfo activityInfo = getPackageManager().getActivityInfo(componentName, 0); ActivityInfo activityInfo = getPackageManager().getActivityInfo(componentName, 0);

@ -28,10 +28,6 @@ public class Alarm implements JobQueueEntry {
return alarmId; return alarmId;
} }
public long getTaskId() {
return taskId;
}
@Override @Override
public long getTime() { public long getTime() {
return time; return time;

@ -34,10 +34,6 @@ public class Reminder implements JobQueueEntry {
return notification; return notification;
} }
public int getType() {
return type;
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;

@ -53,10 +53,6 @@ public class Geofence implements Serializable, Parcelable {
return longitude; return longitude;
} }
public int getRadius() {
return radius;
}
public long getMetadataId() { public long getMetadataId() {
return metadataId; return metadataId;
} }

@ -18,9 +18,6 @@ public interface NotificationDao {
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)
void insertAll(List<Notification> notifications); void insertAll(List<Notification> notifications);
@Query("SELECT COUNT(*) FROM notification")
int count();
@Query("DELETE FROM notification WHERE task = :taskId") @Query("DELETE FROM notification WHERE task = :taskId")
int delete(long taskId); int delete(long taskId);

@ -15,7 +15,6 @@ import javax.inject.Inject;
import timber.log.Timber; import timber.log.Timber;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
import static com.todoroo.andlib.utility.AndroidUtilities.preJellybean; import static com.todoroo.andlib.utility.AndroidUtilities.preJellybean;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;

@ -277,10 +277,6 @@ public class Preferences {
editor.commit(); editor.commit();
} }
public int getInt(int resourceId) {
return getInt(resourceId, 0);
}
public int getInt(int resourceId, int defValue) { public int getInt(int resourceId, int defValue) {
return getInt(context.getString(resourceId), defValue); return getInt(context.getString(resourceId), defValue);
} }

@ -35,12 +35,12 @@ public class ActionUtils {
contextView.setBackgroundColor(themeColor.getPrimaryColor()); contextView.setBackgroundColor(themeColor.getPrimaryColor());
TextView title = (TextView) contextView.findViewById(R.id.action_bar_title); TextView title = contextView.findViewById(R.id.action_bar_title);
if (title != null) { if (title != null) {
title.setTextColor(themeColor.getActionBarTint()); title.setTextColor(themeColor.getActionBarTint());
} }
ImageView closeButton = (ImageView) contextView.findViewById(R.id.action_mode_close_button); ImageView closeButton = contextView.findViewById(R.id.action_mode_close_button);
if (closeButton != null) { if (closeButton != null) {
closeButton.setColorFilter(themeColor.getActionBarTint()); closeButton.setColorFilter(themeColor.getActionBarTint());
} }

@ -203,10 +203,6 @@ public class DateTime {
return subtract(Calendar.DATE, days); return subtract(Calendar.DATE, days);
} }
public DateTime minusHours(int hours) {
return subtract(Calendar.HOUR, hours);
}
public DateTime minusMinutes(int minutes) { public DateTime minusMinutes(int minutes) {
return subtract(Calendar.MINUTE, minutes); return subtract(Calendar.MINUTE, minutes);
} }

@ -113,7 +113,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
if (atLeastLollipop()) { if (atLeastLollipop()) {
((ScrimInsetsFrameLayout) layout.findViewById(R.id.scrim_layout)).setOnInsetsCallback(insets -> mDrawerListView.setPadding(0, insets.top, 0, 0)); ((ScrimInsetsFrameLayout) layout.findViewById(R.id.scrim_layout)).setOnInsetsCallback(insets -> mDrawerListView.setPadding(0, insets.top, 0, 0));
} }
mDrawerListView = (ListView) layout.findViewById(android.R.id.list); mDrawerListView = layout.findViewById(android.R.id.list);
mDrawerListView.setOnItemClickListener((parent, view, position, id) -> { mDrawerListView.setOnItemClickListener((parent, view, position, id) -> {
mDrawerLayout.addDrawerListener(new DrawerLayout.SimpleDrawerListener() { mDrawerLayout.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
@Override @Override

@ -21,9 +21,9 @@ public abstract class TaskEditControlFragment extends InjectingFragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.control_set_template, null); final View view = inflater.inflate(R.layout.control_set_template, null);
LinearLayout content = (LinearLayout) view.findViewById(R.id.content); LinearLayout content = view.findViewById(R.id.content);
inflater.inflate(getLayout(), content); inflater.inflate(getLayout(), content);
ImageView icon = (ImageView) view.findViewById(R.id.icon); ImageView icon = view.findViewById(R.id.icon);
icon.setImageResource(getIcon()); icon.setImageResource(getIcon());
ButterKnife.bind(this, view); ButterKnife.bind(this, view);
return view; return view;

Loading…
Cancel
Save