From 61360e114b5d814f3138d8b3326d6a791db46a5c Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 17 Aug 2016 10:50:51 -0500 Subject: [PATCH] Tighten access --- .../astrid/gtasks/GtasksTaskListUpdater.java | 2 +- .../OrderedMetadataListFragmentHelper.java | 4 ++-- .../gtasks/OrderedMetadataListUpdater.java | 14 ++++++------ .../astrid/gtasks/sync/GtasksSyncService.java | 4 ++-- .../org/tasks/gtasks/SyncAdapterHelper.java | 2 +- .../InjectingAbstractThreadedSyncAdapter.java | 2 +- .../locale/bundle/PluginBundleValues.java | 2 +- ...stractFragmentPluginAppCompatActivity.java | 16 +++++++------- .../ui/activity/TaskerSettingsActivity.java | 2 +- .../commonsware/cwac/tlv/TouchListView.java | 6 ++--- .../mdimension/jchronic/AstridChronic.java | 10 ++++----- .../todoroo/andlib/data/AbstractModel.java | 15 +++++++------ .../com/todoroo/andlib/data/Property.java | 12 +++++----- .../todoroo/andlib/data/TodorooCursor.java | 2 +- .../com/todoroo/andlib/sql/Criterion.java | 2 +- .../java/com/todoroo/andlib/sql/DBObject.java | 6 ++--- .../todoroo/andlib/sql/UnaryCriterion.java | 15 ++++++++----- .../andlib/utility/AndroidUtilities.java | 2 +- .../java/com/todoroo/andlib/utility/Pair.java | 2 +- .../astrid/activity/BeastModePreferences.java | 4 ++-- .../astrid/activity/TaskEditFragment.java | 2 +- .../astrid/activity/TaskListActivity.java | 6 ++--- .../astrid/activity/TaskListFragment.java | 14 ++++++------ .../todoroo/astrid/adapter/TaskAdapter.java | 22 +++++++++---------- .../com/todoroo/astrid/api/CustomFilter.java | 2 +- .../astrid/api/CustomFilterCriterion.java | 6 ++--- .../java/com/todoroo/astrid/api/Filter.java | 8 +++---- .../todoroo/astrid/api/FilterListItem.java | 2 +- .../com/todoroo/astrid/api/GtasksFilter.java | 6 ++--- .../astrid/api/MultipleSelectCriterion.java | 2 +- .../java/com/todoroo/astrid/api/PermaSql.java | 10 ++++----- .../com/todoroo/astrid/api/TagFilter.java | 4 ++-- .../astrid/api/TextInputCriterion.java | 4 ++-- .../astrid/backup/BackupConstants.java | 2 +- .../astrid/backup/TasksXmlImporter.java | 14 ++++++------ .../astrid/core/CustomFilterActivity.java | 4 ++-- .../astrid/core/CustomFilterAdapter.java | 4 ++-- .../com/todoroo/astrid/core/SavedFilter.java | 2 +- .../com/todoroo/astrid/core/SortHelper.java | 2 +- .../todoroo/astrid/dao/StoreObjectDao.java | 2 +- .../java/com/todoroo/astrid/dao/TaskDao.java | 4 ++-- .../com/todoroo/astrid/data/RemoteModel.java | 10 ++++----- .../todoroo/astrid/data/TaskAttachment.java | 10 ++++----- .../todoroo/astrid/data/TaskListMetadata.java | 4 ++-- .../com/todoroo/astrid/data/UserActivity.java | 8 +++---- .../todoroo/astrid/files/FilesControlSet.java | 2 +- .../com/todoroo/astrid/gcal/GCalHelper.java | 4 ++-- .../com/todoroo/astrid/gtasks/GtasksList.java | 2 +- .../gtasks/GtasksPreferenceService.java | 6 ++--- .../todoroo/astrid/notes/NoteMetadata.java | 2 +- .../astrid/provider/Astrid2TaskProvider.java | 12 +++++----- .../astrid/reminders/ReminderService.java | 4 ++-- .../astrid/repeats/RepeatControlSet.java | 16 +++++++------- .../repeats/RepeatTaskCompleteListener.java | 6 ++--- .../astrid/service/StartupService.java | 2 +- .../AstridOrderedListFragmentHelper.java | 2 +- .../subtasks/AstridOrderedListUpdater.java | 6 ++--- .../astrid/subtasks/SubtasksHelper.java | 2 +- .../astrid/subtasks/SubtasksUpdater.java | 4 ++-- .../todoroo/astrid/tags/TagsControlSet.java | 4 ++-- .../astrid/timers/TimerControlSet.java | 2 +- .../todoroo/astrid/ui/DraggableListView.java | 2 +- .../astrid/ui/HideUntilControlSet.java | 2 +- .../todoroo/astrid/ui/MultilineHelper.java | 4 ++-- .../astrid/ui/NNumberPickerDialog.java | 2 +- .../com/todoroo/astrid/ui/NumberPicker.java | 10 ++++----- .../astrid/ui/RandomReminderControlSet.java | 2 +- .../todoroo/astrid/ui/ReminderControlSet.java | 6 ++--- src/main/java/org/tasks/Broadcaster.java | 2 +- .../activities/FilterSelectionActivity.java | 6 ++--- .../org/tasks/dialogs/ExportTasksDialog.java | 2 +- .../org/tasks/dialogs/ImportTasksDialog.java | 2 +- .../java/org/tasks/filters/FilterCounter.java | 2 +- .../tasks/filters/NavigationDrawerAction.java | 2 +- .../injection/InjectingAppCompatActivity.java | 2 +- .../injection/InjectingIntentService.java | 2 +- .../injection/InjectingListFragment.java | 2 +- .../InjectingPreferenceActivity.java | 6 ++--- .../ThemedInjectingAppCompatActivity.java | 2 +- .../java/org/tasks/intents/TaskIntents.java | 2 +- src/main/java/org/tasks/locale/Locale.java | 2 +- .../org/tasks/location/GeofenceFields.java | 2 +- .../preferences/PermissionRequestor.java | 2 +- .../org/tasks/preferences/Preferences.java | 4 ++-- .../receivers/ListNotificationReceiver.java | 6 ++--- .../org/tasks/reminders/SnoozeCallback.java | 2 +- .../CalendarNotificationIntentService.java | 2 +- .../scheduling/MidnightIntentService.java | 4 ++-- .../RecurringIntervalIntentService.java | 2 +- src/main/java/org/tasks/themes/ThemeBase.java | 2 +- .../java/org/tasks/themes/ThemeColor.java | 2 +- src/main/java/org/tasks/time/DateTime.java | 2 +- .../java/org/tasks/time/MillisProvider.java | 2 +- .../tasks/ui/NavigationDrawerFragment.java | 6 ++--- .../org/tasks/ui/ProgressDialogAsyncTask.java | 2 +- .../tasks/widget/ScrollableViewsFactory.java | 6 ++--- .../org/tasks/widget/WidgetPreferences.java | 22 +++++++++---------- 97 files changed, 244 insertions(+), 240 deletions(-) diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java index 00be4232d..7a70ab7e4 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java @@ -39,7 +39,7 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater prior sibling */ final HashMap siblings = new HashMap<>(); - final HashMap localToRemoteIdMap = + private final HashMap localToRemoteIdMap = new HashMap<>(); private final GtasksSyncService gtasksSyncService; diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java index 0088823ef..42b1aecb4 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java @@ -93,7 +93,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm return fragment.getListView(); } - public DraggableListView getTouchListView() { + private DraggableListView getTouchListView() { return (DraggableListView) fragment.getListView(); } @@ -156,7 +156,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm indent(which, -1); } - protected void indent(int which, int delta) { + void indent(int which, int delta) { long targetTaskId = taskAdapter.getItemId(which); if (targetTaskId <= 0) { return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks) diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java index 39299f215..6c9211536 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java @@ -39,15 +39,15 @@ abstract public class OrderedMetadataListUpdater { abstract protected Metadata createEmptyMetadata(LIST list, long taskId); - public OrderedMetadataListUpdater(MetadataDao metadataDao) { + OrderedMetadataListUpdater(MetadataDao metadataDao) { this.metadataDao = metadataDao; } - protected void beforeIndent(LIST list) { + void beforeIndent(LIST list) { // } - protected void onMovedOrIndented(Metadata metadata) { + void onMovedOrIndented(Metadata metadata) { // } @@ -204,7 +204,7 @@ abstract public class OrderedMetadataListUpdater { } } - protected void traverseTreeAndWriteValues(LIST list, Node node, AtomicLong order, int indent) { + private void traverseTreeAndWriteValues(LIST list, Node node, AtomicLong order, int indent) { if(node.taskId != Task.NO_ID) { Metadata metadata = getTaskMetadata(node.taskId); if(metadata == null) { @@ -229,7 +229,7 @@ abstract public class OrderedMetadataListUpdater { } } - protected Node findNode(Node node, long taskId) { + private Node findNode(Node node, long taskId) { if(node.taskId == taskId) { return node; } @@ -242,7 +242,7 @@ abstract public class OrderedMetadataListUpdater { return null; } - protected Node buildTreeModel(LIST list) { + private Node buildTreeModel(LIST list) { final Node root = new Node(Task.NO_ID, null); final AtomicInteger previoustIndent = new AtomicInteger(-1); final AtomicReference currentNode = new AtomicReference<>(root); @@ -277,7 +277,7 @@ abstract public class OrderedMetadataListUpdater { return root; } - protected void saveAndUpdateModifiedDate(Metadata metadata) { + private void saveAndUpdateModifiedDate(Metadata metadata) { if(metadata.getSetValues().size() == 0) { return; } diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java index 036aad65c..4334429d4 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java @@ -65,7 +65,7 @@ public class GtasksSyncService { } private class MoveOp implements SyncOnSaveOperation { - protected Metadata metadata; + Metadata metadata; public MoveOp(Metadata metadata) { this.metadata = metadata; @@ -143,7 +143,7 @@ public class GtasksSyncService { operationQueue.offer(new MoveOp(metadata)); } - public void pushMetadataOnSave(Metadata model, GtasksInvoker invoker) throws IOException { + private void pushMetadataOnSave(Metadata model, GtasksInvoker invoker) throws IOException { AndroidUtilities.sleepDeep(1000L); String taskId = model.getValue(GtasksMetadata.ID); diff --git a/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java b/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java index 4ee415cb5..c177ccd67 100644 --- a/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java +++ b/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java @@ -76,7 +76,7 @@ public class SyncAdapterHelper { getAccount() != null; } - public boolean masterSyncEnabled() { + private boolean masterSyncEnabled() { return ContentResolver.getMasterSyncAutomatically(); } diff --git a/src/googleplay/java/org/tasks/injection/InjectingAbstractThreadedSyncAdapter.java b/src/googleplay/java/org/tasks/injection/InjectingAbstractThreadedSyncAdapter.java index 82ec8d7c4..61e86dc92 100644 --- a/src/googleplay/java/org/tasks/injection/InjectingAbstractThreadedSyncAdapter.java +++ b/src/googleplay/java/org/tasks/injection/InjectingAbstractThreadedSyncAdapter.java @@ -5,7 +5,7 @@ import android.content.Context; public abstract class InjectingAbstractThreadedSyncAdapter extends AbstractThreadedSyncAdapter { - public InjectingAbstractThreadedSyncAdapter(Context context, boolean autoInitialize) { + protected InjectingAbstractThreadedSyncAdapter(Context context, boolean autoInitialize) { super(context, autoInitialize); inject(context); } diff --git a/src/googleplay/java/org/tasks/locale/bundle/PluginBundleValues.java b/src/googleplay/java/org/tasks/locale/bundle/PluginBundleValues.java index 8393a199a..5bb5be177 100755 --- a/src/googleplay/java/org/tasks/locale/bundle/PluginBundleValues.java +++ b/src/googleplay/java/org/tasks/locale/bundle/PluginBundleValues.java @@ -10,7 +10,7 @@ public final class PluginBundleValues { public static final String BUNDLE_EXTRA_STRING_FILTER = "org.tasks.locale.STRING_FILTER"; public static final String BUNDLE_EXTRA_PREVIOUS_BUNDLE = "org.tasks.locale.PREVIOUS_BUNDLE"; - public static final String BUNDLE_EXTRA_INT_VERSION_CODE = "org.tasks.locale.INT_VERSION_CODE"; + private static final String BUNDLE_EXTRA_INT_VERSION_CODE = "org.tasks.locale.INT_VERSION_CODE"; public static boolean isBundleValid(final Bundle bundle) { if (null == bundle) { diff --git a/src/googleplay/java/org/tasks/locale/ui/activity/AbstractFragmentPluginAppCompatActivity.java b/src/googleplay/java/org/tasks/locale/ui/activity/AbstractFragmentPluginAppCompatActivity.java index 0f58d1c01..474d3353b 100644 --- a/src/googleplay/java/org/tasks/locale/ui/activity/AbstractFragmentPluginAppCompatActivity.java +++ b/src/googleplay/java/org/tasks/locale/ui/activity/AbstractFragmentPluginAppCompatActivity.java @@ -9,9 +9,9 @@ import timber.log.Timber; public abstract class AbstractFragmentPluginAppCompatActivity extends ThemedInjectingAppCompatActivity { - protected boolean mIsCancelled = false; + boolean mIsCancelled = false; - /* package */ static boolean isLocalePluginIntent(final Intent intent) { + /* package */ private static boolean isLocalePluginIntent(final Intent intent) { final String action = intent.getAction(); return com.twofortyfouram.locale.api.Intent.ACTION_EDIT_CONDITION.equals(action) @@ -71,7 +71,7 @@ public abstract class AbstractFragmentPluginAppCompatActivity extends ThemedInje * editing. Internally, this method relies on {@link #isBundleValid(Bundle)}. If * the bundle exists but is not valid, this method will return null. */ - public final Bundle getPreviousBundle() { + private Bundle getPreviousBundle() { final Bundle bundle = getIntent().getBundleExtra( com.twofortyfouram.locale.api.Intent.EXTRA_BUNDLE); @@ -90,7 +90,7 @@ public abstract class AbstractFragmentPluginAppCompatActivity extends ThemedInje * previously saved to the host and subsequently passed back to this Activity for further * editing. */ - public final String getPreviousBlurb() { + private String getPreviousBlurb() { return getIntent().getStringExtra( com.twofortyfouram.locale.api.Intent.EXTRA_STRING_BLURB); } @@ -103,7 +103,7 @@ public abstract class AbstractFragmentPluginAppCompatActivity extends ThemedInje * Activity. {@code bundle} should not be mutated by this method. * @return true if {@code bundle} is valid for the plug-in. */ - public abstract boolean isBundleValid(final Bundle bundle); + protected abstract boolean isBundleValid(final Bundle bundle); /** * Plug-in Activity lifecycle callback to allow the Activity to restore @@ -123,18 +123,18 @@ public abstract class AbstractFragmentPluginAppCompatActivity extends ThemedInje * @param previousBundle Previous bundle that the Activity saved. * @param previousBlurb Previous blurb that the Activity saved */ - public abstract void onPostCreateWithPreviousResult( + protected abstract void onPostCreateWithPreviousResult( final Bundle previousBundle, final String previousBlurb); /** * @return Bundle for the plug-in or {@code null} if a valid Bundle cannot * be generated. */ - public abstract Bundle getResultBundle(); + protected abstract Bundle getResultBundle(); /** * @param bundle Valid bundle for the component. * @return Blurb for {@code bundle}. */ - public abstract String getResultBlurb(final Bundle bundle); + protected abstract String getResultBlurb(final Bundle bundle); } \ No newline at end of file diff --git a/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java b/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java index 8950f941c..67da269f4 100755 --- a/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java +++ b/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java @@ -104,7 +104,7 @@ public final class TaskerSettingsActivity extends AbstractFragmentPluginAppCompa } @Override - public Bundle getResultBundle() { + protected Bundle getResultBundle() { return PluginBundleValues.generateBundle(defaultFilterProvider.getFilterPreferenceValue(filter)); } diff --git a/src/main/java/com/commonsware/cwac/tlv/TouchListView.java b/src/main/java/com/commonsware/cwac/tlv/TouchListView.java index d351c79f4..22f655b8d 100644 --- a/src/main/java/com/commonsware/cwac/tlv/TouchListView.java +++ b/src/main/java/com/commonsware/cwac/tlv/TouchListView.java @@ -48,8 +48,8 @@ public class TouchListView extends ListView { private int mUpperBound; private int mLowerBound; private int mHeight; - public static final int SLIDE_RIGHT = 1; - public static final int SLIDE_LEFT = 2; + private static final int SLIDE_RIGHT = 1; + private static final int SLIDE_LEFT = 2; private int mRemoveMode = -1; private final Rect mTempRect = new Rect(); private Bitmap mDragBitmap; @@ -169,7 +169,7 @@ public class TouchListView extends ListView { return super.onInterceptTouchEvent(ev); } - protected boolean isDraggableRow(View view) { + private boolean isDraggableRow(View view) { return(view.findViewById(grabberId)!=null); } diff --git a/src/main/java/com/mdimension/jchronic/AstridChronic.java b/src/main/java/com/mdimension/jchronic/AstridChronic.java index 840eff0c7..794fc2cad 100644 --- a/src/main/java/com/mdimension/jchronic/AstridChronic.java +++ b/src/main/java/com/mdimension/jchronic/AstridChronic.java @@ -68,7 +68,7 @@ public class AstridChronic { * will be made, and the first matching instance of that time will * be used. */ - public static Span parse(String text, Options options) { + private static Span parse(String text, Options options) { // store now for later =) //_now = options.getNow(); @@ -119,7 +119,7 @@ public class AstridChronic { * to numbers (three => 3), and converting ordinal words to numeric * ordinals (third => 3rd) */ - protected static String preNormalize(String text) { + private static String preNormalize(String text) { String normalizedText = text.toLowerCase(); normalizedText = Chronic.numericizeNumbers(normalizedText); normalizedText = normalizedText.replaceAll("['\"\\.]", ""); @@ -146,7 +146,7 @@ public class AstridChronic { /** * Convert ordinal words to numeric ordinals (third => 3rd) */ - protected static String numericizeOrdinals(String text) { + private static String numericizeOrdinals(String text) { return text; } @@ -154,7 +154,7 @@ public class AstridChronic { * Split the text on spaces and convert each word into * a Token */ - protected static List baseTokenize(String text) { + private static List baseTokenize(String text) { String[] words = text.split(" "); List tokens = new LinkedList<>(); for (String word : words) { @@ -167,7 +167,7 @@ public class AstridChronic { * Guess a specific time within the given span */ // DIFF: We return Span instead of Date - protected static Span guess(Span span) { + private static Span guess(Span span) { if (span == null) { return null; } diff --git a/src/main/java/com/todoroo/andlib/data/AbstractModel.java b/src/main/java/com/todoroo/andlib/data/AbstractModel.java index a1bfb52dc..5019d9546 100644 --- a/src/main/java/com/todoroo/andlib/data/AbstractModel.java +++ b/src/main/java/com/todoroo/andlib/data/AbstractModel.java @@ -73,16 +73,17 @@ public abstract class AbstractModel implements Parcelable, Cloneable { protected ContentValues values = null; /** Transitory Metadata (not saved in database) */ - protected HashMap transitoryData = null; + @SuppressWarnings("WeakerAccess") + HashMap transitoryData = null; - public AbstractModel() { + protected AbstractModel() { } - public AbstractModel(TodorooCursor cursor) { + protected AbstractModel(TodorooCursor cursor) { readPropertiesFromCursor(cursor); } - public AbstractModel(AbstractModel abstractModel) { + protected AbstractModel(AbstractModel abstractModel) { if (abstractModel != null) { if (abstractModel.setValues != null) { setValues = new ContentValues(abstractModel.setValues); @@ -308,7 +309,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable { * Check whether the user has changed this property value and it should be * stored for saving in the database */ - protected synchronized boolean shouldSaveValue( + private synchronized boolean shouldSaveValue( Property property, TYPE newValue) { // we've already decided to save it, so overwrite old value @@ -394,14 +395,14 @@ public abstract class AbstractModel implements Parcelable, Cloneable { transitoryData.put(key, value); } - public Object getTransitory(String key) { + private Object getTransitory(String key) { if(transitoryData == null) { return null; } return transitoryData.get(key); } - public Object clearTransitory(String key) { + private Object clearTransitory(String key) { if (transitoryData == null) { return null; } diff --git a/src/main/java/com/todoroo/andlib/data/Property.java b/src/main/java/com/todoroo/andlib/data/Property.java index d1a2446e6..04ef6312b 100644 --- a/src/main/java/com/todoroo/andlib/data/Property.java +++ b/src/main/java/com/todoroo/andlib/data/Property.java @@ -48,13 +48,13 @@ public abstract class Property extends Field implements Cloneable { /** Is this field for pictures? (usually as a json object containing "path" key or urls) */ public static final int PROP_FLAG_PICTURE = 1 << 5; - public int flags = 0; + private int flags = 0; /** * Create a property by table and column name. Uses the default property * expression which is derived from default table name */ - protected Property(Table table, String columnName) { + Property(Table table, String columnName) { this(table, columnName, (table == null) ? (columnName) : (table.name() + "." + columnName)); } @@ -62,7 +62,7 @@ public abstract class Property extends Field implements Cloneable { * Create a property by table and column name. Uses the default property * expression which is derived from default table name */ - protected Property(Table table, String columnName, int flags) { + Property(Table table, String columnName, int flags) { this(table, columnName, (table == null) ? (columnName) : (table.name() + "." + columnName)); this.flags = flags; } @@ -71,7 +71,7 @@ public abstract class Property extends Field implements Cloneable { * Create a property by table and column name, manually specifying an * expression to use in SQL */ - protected Property(Table table, String columnName, String expression) { + Property(Table table, String columnName, String expression) { super(expression); this.table = table; this.name = columnName; @@ -98,7 +98,7 @@ public abstract class Property extends Field implements Cloneable { /** * Return a clone of this property */ - public Property cloneAs(String tableAlias, String columnAlias) { + Property cloneAs(String tableAlias, String columnAlias) { Table aliasedTable = this.table; if (!TextUtils.isEmpty(tableAlias)) { aliasedTable = table.as(tableAlias); @@ -147,7 +147,7 @@ public abstract class Property extends Field implements Cloneable { super(table, name); } - protected IntegerProperty(String name, String expression) { + IntegerProperty(String name, String expression) { super(null, name, expression); } diff --git a/src/main/java/com/todoroo/andlib/data/TodorooCursor.java b/src/main/java/com/todoroo/andlib/data/TodorooCursor.java index 5b2ba5404..523d0ee9e 100644 --- a/src/main/java/com/todoroo/andlib/data/TodorooCursor.java +++ b/src/main/java/com/todoroo/andlib/data/TodorooCursor.java @@ -66,7 +66,7 @@ public class TodorooCursor extends CursorWrapper { /** * Use cache to get the column index for the given field name */ - public synchronized int getColumnIndexFromCache(String field) { + synchronized int getColumnIndexFromCache(String field) { Integer index = columnIndexCache.get(field); if(index == null) { index = getColumnIndexOrThrow(field); diff --git a/src/main/java/com/todoroo/andlib/sql/Criterion.java b/src/main/java/com/todoroo/andlib/sql/Criterion.java index 29cc4765d..dd5ab76bc 100644 --- a/src/main/java/com/todoroo/andlib/sql/Criterion.java +++ b/src/main/java/com/todoroo/andlib/sql/Criterion.java @@ -13,7 +13,7 @@ import static com.todoroo.andlib.sql.SqlConstants.RIGHT_PARENTHESIS; import static com.todoroo.andlib.sql.SqlConstants.SPACE; public abstract class Criterion { - protected final Operator operator; + final Operator operator; public Criterion(Operator operator) { this.operator = operator; diff --git a/src/main/java/com/todoroo/andlib/sql/DBObject.java b/src/main/java/com/todoroo/andlib/sql/DBObject.java index d63161afb..a24dca43c 100644 --- a/src/main/java/com/todoroo/andlib/sql/DBObject.java +++ b/src/main/java/com/todoroo/andlib/sql/DBObject.java @@ -12,11 +12,11 @@ public abstract class DBObject> implements Cloneable { protected String alias; protected final String expression; - protected DBObject(String expression){ + DBObject(String expression){ this.expression = expression; } - public T as(String newAlias) { + protected T as(String newAlias) { try { T clone = (T) clone(); clone.alias = newAlias; @@ -26,7 +26,7 @@ public abstract class DBObject> implements Cloneable { } } - public boolean hasAlias() { + protected boolean hasAlias() { return alias != null; } diff --git a/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java b/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java index 9ba5b157c..160395384 100644 --- a/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java +++ b/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java @@ -8,10 +8,10 @@ package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.SqlConstants.SPACE; public class UnaryCriterion extends Criterion { - protected final Field expression; - protected final Object value; + private final Field expression; + private final Object value; - UnaryCriterion(Field expression, Operator operator, Object value) { + private UnaryCriterion(Field expression, Operator operator, Object value) { super(operator); this.expression = expression; this.value = value; @@ -28,15 +28,18 @@ public class UnaryCriterion extends Criterion { return new UnaryCriterion(expression, Operator.eq, value); } - protected void beforePopulateOperator(StringBuilder sb) { + @SuppressWarnings("WeakerAccess") + void beforePopulateOperator(StringBuilder sb) { sb.append(expression); } - protected void populateOperator(StringBuilder sb) { + @SuppressWarnings("WeakerAccess") + void populateOperator(StringBuilder sb) { sb.append(operator); } - protected void afterPopulateOperator(StringBuilder sb) { + @SuppressWarnings("WeakerAccess") + void afterPopulateOperator(StringBuilder sb) { if(value == null) { return; } diff --git a/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index 5a28f970f..da3c497f2 100644 --- a/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -182,7 +182,7 @@ public class AndroidUtilities { * Copy stream from source to destination * @throws IOException */ - public static void copyStream(InputStream source, OutputStream dest) throws IOException { + private static void copyStream(InputStream source, OutputStream dest) throws IOException { int bytes; byte[] buffer; int BUFFER_SIZE = 1024; diff --git a/src/main/java/com/todoroo/andlib/utility/Pair.java b/src/main/java/com/todoroo/andlib/utility/Pair.java index b55bd1b76..518c2dde7 100644 --- a/src/main/java/com/todoroo/andlib/utility/Pair.java +++ b/src/main/java/com/todoroo/andlib/utility/Pair.java @@ -41,7 +41,7 @@ public class Pair { return equal(getLeft(), other.getLeft()) && equal(getRight(), other.getRight()); } - public static boolean equal(Object o1, Object o2) { + private static boolean equal(Object o1, Object o2) { if (o1 == null) { return o2 == null; } diff --git a/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java index 544b1764e..2391bb274 100644 --- a/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java +++ b/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java @@ -43,9 +43,9 @@ public class BeastModePreferences extends ThemedInjectingAppCompatActivity imple private ArrayList items; - public static final String BEAST_MODE_ORDER_PREF = "beast_mode_order_v3"; //$NON-NLS-1$ + private static final String BEAST_MODE_ORDER_PREF = "beast_mode_order_v3"; //$NON-NLS-1$ - public static final String BEAST_MODE_PREF_ITEM_SEPARATOR = ";"; //$NON-NLS-1$ + private static final String BEAST_MODE_PREF_ITEM_SEPARATOR = ";"; //$NON-NLS-1$ private HashMap prefsToDescriptions; diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index bb65cef7e..7f3a39a67 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -287,7 +287,7 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar callback.taskEditFinished(); } - protected void deleteButtonClick() { + private void deleteButtonClick() { dialogBuilder.newMessageDialog(R.string.DLG_delete_this_task_question) .setPositiveButton(android.R.string.ok, (dialog, which) -> { TimerPlugin.stopTimer(notificationManager, taskService, getActivity(), model); diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 574a4a7c2..7a2a035ec 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -202,7 +202,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements .commit(); } - public NavigationDrawerFragment getNavigationDrawerFragment() { + private NavigationDrawerFragment getNavigationDrawerFragment() { return (NavigationDrawerFragment) getSupportFragmentManager() .findFragmentById(NavigationDrawerFragment.FRAGMENT_NAVIGATION_DRAWER); } @@ -458,7 +458,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements return getTaskEditFragment().startTimer(); } - public boolean isDoublePaneLayout() { + private boolean isDoublePaneLayout() { return getResources().getBoolean(R.bool.two_pane_layout); } @@ -490,7 +490,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements reloadCurrentFilter(); } - void reloadCurrentFilter() { + private void reloadCurrentFilter() { onFilterItemClicked(getCurrentFilter()); } diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index eda9f1b24..c0bae5bbb 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -120,9 +120,9 @@ public class TaskListFragment extends InjectingListFragment implements // --- menu codes - protected static final int CONTEXT_MENU_COPY_TASK_ID = R.string.TAd_contextCopyTask; - protected static final int CONTEXT_MENU_DELETE_TASK_ID = R.string.TAd_contextDeleteTask; - protected static final int CONTEXT_MENU_UNDELETE_TASK_ID = R.string.TAd_contextUndeleteTask; + private static final int CONTEXT_MENU_COPY_TASK_ID = R.string.TAd_contextCopyTask; + private static final int CONTEXT_MENU_DELETE_TASK_ID = R.string.TAd_contextDeleteTask; + private static final int CONTEXT_MENU_UNDELETE_TASK_ID = R.string.TAd_contextUndeleteTask; // --- instance variables @@ -168,7 +168,7 @@ public class TaskListFragment extends InjectingListFragment implements } } - public void setSyncOngoing(final boolean ongoing) { + protected void setSyncOngoing(final boolean ongoing) { Activity activity = getActivity(); if (activity != null) { activity.runOnUiThread(() -> { @@ -492,7 +492,7 @@ public class TaskListFragment extends InjectingListFragment implements * Called by the RefreshReceiver when the task list receives a refresh * broadcast. Subclasses should override this. */ - protected void refresh() { + private void refresh() { loadTaskListContent(); setSyncOngoing(gtasksPreferenceService.isOngoing()); @@ -534,7 +534,7 @@ public class TaskListFragment extends InjectingListFragment implements /** * Fill in the Task List with current items */ - public void setTaskAdapter() { + protected void setTaskAdapter() { if (filter == null) { return; } @@ -735,7 +735,7 @@ public class TaskListFragment extends InjectingListFragment implements } } - protected void duplicateTask(long itemId) { + private void duplicateTask(long itemId) { long cloneId = taskDuplicator.duplicateTask(itemId); onTaskListItemClicked(cloneId); } diff --git a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index e475d89ee..4f65e7733 100644 --- a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -120,22 +120,22 @@ public class TaskAdapter extends CursorAdapter implements Filterable { private final TaskAttachmentDao taskAttachmentDao; private final TaskService taskService; - protected final Context context; - protected final TaskListFragment fragment; + private final Context context; + private final TaskListFragment fragment; private DialogBuilder dialogBuilder; private final TagService tagService; private ThemeCache themeCache; - protected final Resources resources; - protected OnCompletedTaskListener onCompletedTaskListener = null; - protected final LayoutInflater inflater; + private final Resources resources; + private OnCompletedTaskListener onCompletedTaskListener = null; + private final LayoutInflater inflater; private int fontSize; private final AtomicReference query; // measure utilities - protected final DisplayMetrics displayMetrics; + private final DisplayMetrics displayMetrics; - protected final int minRowHeight; + private final int minRowHeight; private final float tagCharacters; private final Map tagMap = new HashMap<>(); @@ -179,7 +179,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { this.minRowHeight = computeMinRowHeight(); } - protected int computeMinRowHeight() { + private int computeMinRowHeight() { DisplayMetrics metrics = resources.getDisplayMetrics(); return (int) (metrics.density * 40); } @@ -434,7 +434,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } } - protected final View.OnClickListener completeBoxListener = v -> { + private final View.OnClickListener completeBoxListener = v -> { int[] location = new int[2]; v.getLocationOnScreen(location); ViewHolder viewHolder = getTagFromCheckBox(v); @@ -459,7 +459,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { /** Helper method to adjust a tasks' appearance if the task is completed or * uncompleted. */ - protected void setTaskAppearance(ViewHolder viewHolder, Task task) { + private void setTaskAppearance(ViewHolder viewHolder, Task task) { boolean completed = task.isCompleted(); TextView name = viewHolder.nameView; @@ -606,7 +606,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { * @param newState * state that this task should be set to */ - protected void completeTask(final Task task, final boolean newState) { + private void completeTask(final Task task, final boolean newState) { if(task == null) { return; } diff --git a/src/main/java/com/todoroo/astrid/api/CustomFilter.java b/src/main/java/com/todoroo/astrid/api/CustomFilter.java index c3d8fbc05..9f4ce65aa 100644 --- a/src/main/java/com/todoroo/astrid/api/CustomFilter.java +++ b/src/main/java/com/todoroo/astrid/api/CustomFilter.java @@ -45,7 +45,7 @@ public class CustomFilter extends Filter { } @Override - public void readFromParcel(Parcel source) { + protected void readFromParcel(Parcel source) { super.readFromParcel(source); id = source.readLong(); } diff --git a/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java b/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java index a1d78be27..699cb7444 100644 --- a/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java +++ b/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java @@ -58,7 +58,7 @@ abstract public class CustomFilterCriterion implements Parcelable { /** * Icon for this criteria. Can be null for no bitmap */ - public Bitmap icon; + Bitmap icon; /** * Criteria name. This is displayed when users are selecting a criteria @@ -70,7 +70,7 @@ abstract public class CustomFilterCriterion implements Parcelable { /** * Utility method to write to parcel */ - public void writeToParcel(Parcel dest) { + void writeToParcel(Parcel dest) { dest.writeString(identifier); dest.writeString(text); dest.writeString(sql); @@ -82,7 +82,7 @@ abstract public class CustomFilterCriterion implements Parcelable { /** * Utility method to read from parcel */ - public void readFromParcel(Parcel source) { + void readFromParcel(Parcel source) { identifier = source.readString(); text = source.readString(); sql = source.readString(); diff --git a/src/main/java/com/todoroo/astrid/api/Filter.java b/src/main/java/com/todoroo/astrid/api/Filter.java index 56deba3e8..943c27f27 100644 --- a/src/main/java/com/todoroo/astrid/api/Filter.java +++ b/src/main/java/com/todoroo/astrid/api/Filter.java @@ -47,13 +47,13 @@ public class Filter extends FilterListItem { * metadata.value = 'b' GROUP BY tasks.id ORDER BY tasks.title" * */ - protected String sqlQuery; + String sqlQuery; /** * Field for holding a modified sqlQuery based on sqlQuery. Useful for adjusting * query for sort/subtasks without breaking the equality checking based on sqlQuery. */ - protected String filterOverride; + private String filterOverride; /** * Values to apply to a task when quick-adding a task from this filter. @@ -107,7 +107,7 @@ public class Filter extends FilterListItem { /** * Utility constructor */ - protected Filter() { + Filter() { // do nothing } @@ -169,7 +169,7 @@ public class Filter extends FilterListItem { } @Override - public void readFromParcel(Parcel source) { + protected void readFromParcel(Parcel source) { super.readFromParcel(source); source.readString(); // old title sqlQuery = source.readString(); diff --git a/src/main/java/com/todoroo/astrid/api/FilterListItem.java b/src/main/java/com/todoroo/astrid/api/FilterListItem.java index b04e97167..ac53e96d5 100644 --- a/src/main/java/com/todoroo/astrid/api/FilterListItem.java +++ b/src/main/java/com/todoroo/astrid/api/FilterListItem.java @@ -55,7 +55,7 @@ abstract public class FilterListItem implements Parcelable { /** * Utility method to read FilterListItem properties from a parcel. */ - public void readFromParcel(Parcel source) { + protected void readFromParcel(Parcel source) { listingTitle = source.readString(); icon = source.readInt(); tint = source.readInt(); diff --git a/src/main/java/com/todoroo/astrid/api/GtasksFilter.java b/src/main/java/com/todoroo/astrid/api/GtasksFilter.java index 21c726768..26f31eb00 100644 --- a/src/main/java/com/todoroo/astrid/api/GtasksFilter.java +++ b/src/main/java/com/todoroo/astrid/api/GtasksFilter.java @@ -23,9 +23,9 @@ public class GtasksFilter extends Filter { private static final int CLOUD = R.drawable.ic_cloud_queue_24dp; - public long storeId; + private long storeId; - protected GtasksFilter() { + private GtasksFilter() { super(); } @@ -67,7 +67,7 @@ public class GtasksFilter extends Filter { } @Override - public void readFromParcel(Parcel source) { + protected void readFromParcel(Parcel source) { super.readFromParcel(source); storeId = source.readLong(); } diff --git a/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java b/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java index 2c1e6ce8d..8d80a0252 100644 --- a/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java +++ b/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java @@ -46,7 +46,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa this.name = name; } - protected MultipleSelectCriterion() { + private MultipleSelectCriterion() { // constructor for inflating from parceling } diff --git a/src/main/java/com/todoroo/astrid/api/PermaSql.java b/src/main/java/com/todoroo/astrid/api/PermaSql.java index 9fbe75c78..4c3c8b79f 100644 --- a/src/main/java/com/todoroo/astrid/api/PermaSql.java +++ b/src/main/java/com/todoroo/astrid/api/PermaSql.java @@ -34,31 +34,31 @@ public final class PermaSql { public static final String VALUE_EOD_YESTERDAY = "EODY()"; //$NON-NLS-1$ /** value to be replaced by noon yesterday as long */ - public static final String VALUE_NOON_YESTERDAY = "NOONY()"; //$NON-NLS-1$ + private static final String VALUE_NOON_YESTERDAY = "NOONY()"; //$NON-NLS-1$ /** value to be replaced by end of day tomorrow as long */ public static final String VALUE_EOD_TOMORROW = "EODT()"; //$NON-NLS-1$ /** value to be replaced by noon tomorrow as long */ - public static final String VALUE_NOON_TOMORROW = "NOONT()"; //$NON-NLS-1$ + private static final String VALUE_NOON_TOMORROW = "NOONT()"; //$NON-NLS-1$ /** value to be replaced by end of day day after tomorrow as long */ public static final String VALUE_EOD_DAY_AFTER = "EODTT()"; //$NON-NLS-1$ /** value to be replaced by noon day after tomorrow as long */ - public static final String VALUE_NOON_DAY_AFTER = "NOONTT()"; //$NON-NLS-1$ + private static final String VALUE_NOON_DAY_AFTER = "NOONTT()"; //$NON-NLS-1$ /** value to be replaced by end of day next week as long */ public static final String VALUE_EOD_NEXT_WEEK = "EODW()"; //$NON-NLS-1$ /** value to be replaced by noon next week as long */ - public static final String VALUE_NOON_NEXT_WEEK = "NOONW()"; //$NON-NLS-1$ + private static final String VALUE_NOON_NEXT_WEEK = "NOONW()"; //$NON-NLS-1$ /** value to be replaced by approximate end of day next month as long */ public static final String VALUE_EOD_NEXT_MONTH = "EODM()"; //$NON-NLS-1$ /** value to be replaced by approximate noon next month as long */ - public static final String VALUE_NOON_NEXT_MONTH = "NOONM()"; //$NON-NLS-1$ + private static final String VALUE_NOON_NEXT_MONTH = "NOONM()"; //$NON-NLS-1$ /** Replace placeholder strings with actual */ public static String replacePlaceholders(String value) { diff --git a/src/main/java/com/todoroo/astrid/api/TagFilter.java b/src/main/java/com/todoroo/astrid/api/TagFilter.java index b2c210e26..1b083c4a9 100644 --- a/src/main/java/com/todoroo/astrid/api/TagFilter.java +++ b/src/main/java/com/todoroo/astrid/api/TagFilter.java @@ -22,7 +22,7 @@ public class TagFilter extends Filter { private String uuid; - protected TagFilter() { + private TagFilter() { super(); } @@ -65,7 +65,7 @@ public class TagFilter extends Filter { } @Override - public void readFromParcel(Parcel source) { + protected void readFromParcel(Parcel source) { super.readFromParcel(source); uuid = source.readString(); } diff --git a/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java b/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java index da88e81d3..c3ee5a27b 100644 --- a/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java +++ b/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java @@ -21,7 +21,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela /** * Text area prompt */ - public String prompt; + private String prompt; /** * Text area hint @@ -44,7 +44,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela this.name = name; } - protected TextInputCriterion() { + private TextInputCriterion() { // constructor for inflating from parceling } diff --git a/src/main/java/com/todoroo/astrid/backup/BackupConstants.java b/src/main/java/com/todoroo/astrid/backup/BackupConstants.java index aa54aa099..796733c5b 100644 --- a/src/main/java/com/todoroo/astrid/backup/BackupConstants.java +++ b/src/main/java/com/todoroo/astrid/backup/BackupConstants.java @@ -11,7 +11,7 @@ package com.todoroo.astrid.backup; * @author Tim Su * */ -public class BackupConstants { +class BackupConstants { // Do NOT edit the constants in this file! You will break compatibility with old backups diff --git a/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java index 363c0c497..99811d5ab 100644 --- a/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -147,10 +147,10 @@ public class TasksXmlImporter { private static final String FORMAT2 = "2"; //$NON-NLS-1$ private class Format2TaskImporter { - protected XmlPullParser xpp; - protected Task currentTask = new Task(); - protected Metadata metadata = new Metadata(); - protected TagData tagdata = new TagData(); + XmlPullParser xpp; + Task currentTask = new Task(); + Metadata metadata = new Metadata(); + TagData tagdata = new TagData(); public Format2TaskImporter() { } public Format2TaskImporter(XmlPullParser xpp) throws XmlPullParserException, IOException { @@ -177,7 +177,7 @@ public class TasksXmlImporter { } } - protected void parseTask() { + void parseTask() { taskCount++; setProgressMessage(activity.getString(R.string.import_progress_read, taskCount)); currentTask.clear(); @@ -223,7 +223,7 @@ public class TasksXmlImporter { importCount++; } - protected void parseMetadata(int format) { + void parseMetadata(int format) { if(!currentTask.isSaved()) { return; } @@ -257,7 +257,7 @@ public class TasksXmlImporter { /** * Turn a model into xml attributes */ - protected void deserializeModel(AbstractModel model, Property[] properties) { + void deserializeModel(AbstractModel model, Property[] properties) { for(Property property : properties) { try { property.accept(xmlReadingVisitor, model); diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index 67810e4c1..101420b9e 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -65,7 +65,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity imple private static final String IDENTIFIER_UNIVERSE = "active"; //$NON-NLS-1$ - static final int MENU_GROUP_FILTER = 0; + private static final int MENU_GROUP_FILTER = 0; static final int MENU_GROUP_CONTEXT_TYPE = 1; static final int MENU_GROUP_CONTEXT_DELETE = 2; @@ -223,7 +223,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity imple } } - void saveAndView() { + private void saveAndView() { String title = filterName.getText().toString().trim(); if (isEmpty(title)) { diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java index 77bd0ff36..6e03ba6b8 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java @@ -34,7 +34,7 @@ import java.util.List; * @author Tim Su * */ -public class CustomFilterAdapter extends ArrayAdapter { +class CustomFilterAdapter extends ArrayAdapter { private final CustomFilterActivity activity; private DialogBuilder dialogBuilder; @@ -52,7 +52,7 @@ public class CustomFilterAdapter extends ArrayAdapter { // --- view event handling - View.OnClickListener filterClickListener = new View.OnClickListener() { + private View.OnClickListener filterClickListener = new View.OnClickListener() { @Override public void onClick(View v) { ViewHolder viewHolder = (ViewHolder) v.getTag(); diff --git a/src/main/java/com/todoroo/astrid/core/SavedFilter.java b/src/main/java/com/todoroo/astrid/core/SavedFilter.java index cfb96d699..309466a70 100644 --- a/src/main/java/com/todoroo/astrid/core/SavedFilter.java +++ b/src/main/java/com/todoroo/astrid/core/SavedFilter.java @@ -37,7 +37,7 @@ public class SavedFilter { StoreObject.VALUE2.name); /** serialized list of filters applied */ - public static final StringProperty FILTERS = new StringProperty(StoreObject.TABLE, + private static final StringProperty FILTERS = new StringProperty(StoreObject.TABLE, StoreObject.VALUE3.name); // --- data storage and retrieval methods diff --git a/src/main/java/com/todoroo/astrid/core/SortHelper.java b/src/main/java/com/todoroo/astrid/core/SortHelper.java index 3e6d61d3c..ecec74b15 100644 --- a/src/main/java/com/todoroo/astrid/core/SortHelper.java +++ b/src/main/java/com/todoroo/astrid/core/SortHelper.java @@ -63,7 +63,7 @@ public class SortHelper { return originalSql; } - public static Order orderForSortType(int sortType) { + private static Order orderForSortType(int sortType) { Order order; switch(sortType) { case SORT_ALPHA: diff --git a/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java b/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java index d1f3e1515..348515781 100644 --- a/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java +++ b/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java @@ -69,7 +69,7 @@ public class StoreObjectDao { dao.saveExisting(storeObject); } - public List getByType(String type) { + private List getByType(String type) { return dao.toList(select(StoreObject.PROPERTIES) .where(StoreObject.TYPE.eq(type))); } diff --git a/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/src/main/java/com/todoroo/astrid/dao/TaskDao.java index d2fbcd706..de480afa4 100644 --- a/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -206,7 +206,7 @@ public class TaskDao { } } - public boolean handleSQLiteConstraintException(Task task) { + private boolean handleSQLiteConstraintException(Task task) { TodorooCursor cursor = dao.query(Query.select(Task.ID).where( Task.UUID.eq(task.getUUID()))); if (cursor.getCount() > 0) { @@ -245,7 +245,7 @@ public class TaskDao { return false; } - public static void createDefaultHideUntil(Preferences preferences, Task item) { + private static void createDefaultHideUntil(Preferences preferences, Task item) { if(!item.containsValue(Task.HIDE_UNTIL)) { int setting = preferences.getIntegerFromString(R.string.p_default_hideUntil_key, Task.HIDE_UNTIL_NONE); diff --git a/src/main/java/com/todoroo/astrid/data/RemoteModel.java b/src/main/java/com/todoroo/astrid/data/RemoteModel.java index 8be2b19e2..a295ca7e1 100644 --- a/src/main/java/com/todoroo/astrid/data/RemoteModel.java +++ b/src/main/java/com/todoroo/astrid/data/RemoteModel.java @@ -28,20 +28,20 @@ import timber.log.Timber; */ abstract public class RemoteModel extends AbstractModel { - public RemoteModel() { + RemoteModel() { super(); } - public RemoteModel(TodorooCursor cursor) { + RemoteModel(TodorooCursor cursor) { super(cursor); } - public RemoteModel(AbstractModel model) { + RemoteModel(AbstractModel model) { super(model); } /** remote id property common to all remote models */ - public static final String UUID_PROPERTY_NAME = "remoteId"; //$NON-NLS-1$ + static final String UUID_PROPERTY_NAME = "remoteId"; //$NON-NLS-1$ /** remote id property */ public static final StringProperty UUID_PROPERTY = new StringProperty(null, UUID_PROPERTY_NAME); @@ -59,7 +59,7 @@ abstract public class RemoteModel extends AbstractModel { } } - protected String getUuidHelper(StringProperty uuid) { + String getUuidHelper(StringProperty uuid) { if(setValues != null && setValues.containsKey(uuid.name)) { return setValues.getAsString(uuid.name); } else if(values != null && values.containsKey(uuid.name)) { diff --git a/src/main/java/com/todoroo/astrid/data/TaskAttachment.java b/src/main/java/com/todoroo/astrid/data/TaskAttachment.java index 57cc9eb03..65c7249a2 100644 --- a/src/main/java/com/todoroo/astrid/data/TaskAttachment.java +++ b/src/main/java/com/todoroo/astrid/data/TaskAttachment.java @@ -33,7 +33,7 @@ public final class TaskAttachment extends RemoteModel { TABLE, ID_PROPERTY_NAME); /** Remote id */ - public static final StringProperty UUID = new StringProperty( + private static final StringProperty UUID = new StringProperty( TABLE, UUID_PROPERTY_NAME); /** Task uuid */ @@ -41,7 +41,7 @@ public final class TaskAttachment extends RemoteModel { TABLE, "task_id"); /** File name */ - public static final StringProperty NAME = new StringProperty( + private static final StringProperty NAME = new StringProperty( TABLE, "name"); /** File path (on local storage) */ @@ -107,11 +107,11 @@ public final class TaskAttachment extends RemoteModel { public static final Creator CREATOR = new ModelCreator<>(TaskAttachment.class); - public void setDeletedAt(Long deletedAt) { + private void setDeletedAt(Long deletedAt) { setValue(DELETED_AT, deletedAt); } - public void setTaskUUID(String taskUuid) { + private void setTaskUUID(String taskUuid) { setValue(TASK_UUID, taskUuid); } @@ -119,7 +119,7 @@ public final class TaskAttachment extends RemoteModel { return getValue(NAME); } - public void setName(String name) { + private void setName(String name) { setValue(NAME, name); } diff --git a/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java b/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java index b829c600b..9e1b3ab47 100644 --- a/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java +++ b/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java @@ -29,11 +29,11 @@ public final class TaskListMetadata extends RemoteModel { // --- properties /** ID */ - public static final LongProperty ID = new LongProperty( + private static final LongProperty ID = new LongProperty( TABLE, ID_PROPERTY_NAME); /** Remote id */ - public static final StringProperty UUID = new StringProperty( + private static final StringProperty UUID = new StringProperty( TABLE, UUID_PROPERTY_NAME); /** Tag UUID */ diff --git a/src/main/java/com/todoroo/astrid/data/UserActivity.java b/src/main/java/com/todoroo/astrid/data/UserActivity.java index bcde5fae9..9de9482de 100644 --- a/src/main/java/com/todoroo/astrid/data/UserActivity.java +++ b/src/main/java/com/todoroo/astrid/data/UserActivity.java @@ -24,11 +24,11 @@ public class UserActivity extends RemoteModel { // --- properties /** ID */ - public static final LongProperty ID = new LongProperty( + private static final LongProperty ID = new LongProperty( TABLE, ID_PROPERTY_NAME); /** Remote ID */ - public static final StringProperty UUID = new StringProperty( + private static final StringProperty UUID = new StringProperty( TABLE, UUID_PROPERTY_NAME); /** Action */ @@ -36,11 +36,11 @@ public class UserActivity extends RemoteModel { TABLE, "action"); /** Message */ - public static final StringProperty MESSAGE = new StringProperty( + private static final StringProperty MESSAGE = new StringProperty( TABLE, "message"); /** Picture */ - public static final StringProperty PICTURE = new StringProperty( + private static final StringProperty PICTURE = new StringProperty( TABLE, "picture", Property.PROP_FLAG_JSON | Property.PROP_FLAG_PICTURE); /** Target id */ diff --git a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java index fd2edb000..0df8a617d 100644 --- a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java +++ b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java @@ -257,7 +257,7 @@ public class FilesControlSet extends TaskEditControlFragment { } } - public void createNewFileAttachment(String path, String fileName, String fileType) { + private void createNewFileAttachment(String path, String fileName, String fileType) { TaskAttachment attachment = TaskAttachment.createNewAttachment(taskUuid, path, fileName, fileType); taskAttachmentDao.createNew(attachment); addAttachment(attachment); diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java b/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java index 9dc9ae648..9f4f5d7c9 100644 --- a/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java +++ b/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java @@ -51,7 +51,7 @@ public class GCalHelper { cr = context.getContentResolver(); } - public String getTaskEventUri(Task task) { + private String getTaskEventUri(Task task) { String uri; if (!TextUtils.isEmpty(task.getCalendarURI())) { uri = task.getCalendarURI(); @@ -86,7 +86,7 @@ public class GCalHelper { return createTaskEvent(task, values, true); } - public Uri createTaskEvent(Task task, ContentValues values, boolean deleteEventIfExists) { + private Uri createTaskEvent(Task task, ContentValues values, boolean deleteEventIfExists) { if (!permissionChecker.canAccessCalendars()) { return null; } diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java index a30d06938..445735ec3 100644 --- a/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java +++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java @@ -44,7 +44,7 @@ public class GtasksList { return storeObject.getValue(StoreObject.ITEM); } - public void setRemoteId(String remoteId) { + private void setRemoteId(String remoteId) { storeObject.setValue(StoreObject.ITEM, remoteId); } diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java index 0130cd5b8..f7e29259e 100644 --- a/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java +++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java @@ -21,7 +21,7 @@ public class GtasksPreferenceService { private final Preferences preferences; - public static final String IDENTIFIER = "gtasks"; //$NON-NLS-1$ + private static final String IDENTIFIER = "gtasks"; //$NON-NLS-1$ private static final String PREF_DEFAULT_LIST = IDENTIFIER + "_defaultlist"; //$NON-NLS-1$ private static final String PREF_USER_NAME = IDENTIFIER + "_user"; //$NON-NLS-1$ @@ -47,9 +47,9 @@ public class GtasksPreferenceService { preferences.setString(PREF_USER_NAME, userName); } - protected static final String PREF_LAST_SYNC = "_last_sync"; //$NON-NLS-1$ + private static final String PREF_LAST_SYNC = "_last_sync"; //$NON-NLS-1$ - protected static final String PREF_ONGOING = "_ongoing"; //$NON-NLS-1$ + private static final String PREF_ONGOING = "_ongoing"; //$NON-NLS-1$ /** @return Last Successful Sync Date, or 0 */ public long getLastSyncDate() { diff --git a/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java b/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java index bde11891b..7880a72ab 100644 --- a/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java +++ b/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java @@ -14,7 +14,7 @@ import com.todoroo.astrid.data.Metadata; * @author Tim Su * */ -public class NoteMetadata { +class NoteMetadata { /** metadata key */ public static final String METADATA_KEY = "note"; //$NON-NLS-1$ diff --git a/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java index 6a84aa96c..159ef9aa1 100644 --- a/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -50,9 +50,9 @@ import timber.log.Timber; */ public class Astrid2TaskProvider extends InjectingContentProvider { - public static final String AUTHORITY = "org.tasks.tasksprovider"; + private static final String AUTHORITY = "org.tasks.tasksprovider"; - public static final Uri CONTENT_URI = Uri.parse("content://org.tasks.tasksprovider"); + private static final Uri CONTENT_URI = Uri.parse("content://org.tasks.tasksprovider"); private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH); @@ -71,10 +71,10 @@ public class Astrid2TaskProvider extends InjectingContentProvider { private final static String TAGS_ID = "tags_id"; - static String[] TASK_FIELD_LIST = new String[] { NAME, IMPORTANCE_COLOR, PREFERRED_DUE_DATE, DEFINITE_DUE_DATE, + private static String[] TASK_FIELD_LIST = new String[] { NAME, IMPORTANCE_COLOR, PREFERRED_DUE_DATE, DEFINITE_DUE_DATE, IMPORTANCE, IDENTIFIER, TAGS_ID }; - static String[] TAGS_FIELD_LIST = new String[] { ID, NAME }; + private static String[] TAGS_FIELD_LIST = new String[] { ID, NAME }; private static final int URI_TASKS = 0; private static final int URI_TAGS = 1; @@ -122,7 +122,7 @@ public class Astrid2TaskProvider extends InjectingContentProvider { * * @return two-column cursor: tag id (string) and tag name */ - public Cursor getTags() { + private Cursor getTags() { TagData[] tags = tagService.get().getGroupedTags(TagService.GROUPED_TAGS_BY_SIZE, Criterion.all); @@ -167,7 +167,7 @@ public class Astrid2TaskProvider extends InjectingContentProvider { * * @return cursor as described above */ - public Cursor getTasks() { + private Cursor getTasks() { MatrixCursor ret = new MatrixCursor(TASK_FIELD_LIST); diff --git a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java index cd69b4dd4..d1d9581a9 100644 --- a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java +++ b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java @@ -46,7 +46,7 @@ public final class ReminderService { // --- constants - public static final Property[] NOTIFICATION_PROPERTIES = new Property[] { + private static final Property[] NOTIFICATION_PROPERTIES = new Property[] { Task.ID, Task.CREATION_DATE, Task.COMPLETION_DATE, @@ -125,7 +125,7 @@ public final class ReminderService { scheduleAlarm(task, taskDao); } - public void clearAllAlarms(Task task) { + private void clearAllAlarms(Task task) { scheduler.createAlarm(context, task, NO_ALARM, TYPE_SNOOZE); scheduler.createAlarm(context, task, NO_ALARM, TYPE_RANDOM); scheduler.createAlarm(context, task, NO_ALARM, TYPE_DUE); diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 7098774ba..2873767d3 100644 --- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -80,12 +80,12 @@ public class RepeatControlSet extends TaskEditControlFragment { // --- spinner constants - public static final int INTERVAL_DAYS = 0; - public static final int INTERVAL_WEEKS = 1; - public static final int INTERVAL_MONTHS = 2; - public static final int INTERVAL_HOURS = 3; - public static final int INTERVAL_MINUTES = 4; - public static final int INTERVAL_YEARS = 5; + private static final int INTERVAL_DAYS = 0; + private static final int INTERVAL_WEEKS = 1; + private static final int INTERVAL_MONTHS = 2; + private static final int INTERVAL_HOURS = 3; + private static final int INTERVAL_MINUTES = 4; + private static final int INTERVAL_YEARS = 5; private static final int TYPE_DUE_DATE = 0; private static final int TYPE_COMPLETION_DATE = 1; @@ -413,7 +413,7 @@ public class RepeatControlSet extends TaskEditControlFragment { updateRepeatUntilOptions(); } - protected void repeatValueClick() { + private void repeatValueClick() { int dialogValue = repeatValue; if(dialogValue == 0) { dialogValue = 1; @@ -443,7 +443,7 @@ public class RepeatControlSet extends TaskEditControlFragment { super.onActivityResult(requestCode, resultCode, data); } - protected void refreshDisplayView() { + private void refreshDisplayView() { if (doRepeat) { displayView.setText(getRepeatString()); displayView.setTextColor(getColor(context, R.color.text_primary)); diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java index 4ed1c6bdc..6202d0e52 100644 --- a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java +++ b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java @@ -97,11 +97,11 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver { component.inject(this); } - static boolean repeatFinished(long newDueDate, long repeatUntil) { + private static boolean repeatFinished(long newDueDate, long repeatUntil) { return repeatUntil > 0 && newDateTime(newDueDate).startOfDay().isAfter(newDateTime(repeatUntil).startOfDay()); } - public static void rescheduleTask(GCalHelper gcalHelper, TaskService taskService, Task task, long newDueDate) { + private static void rescheduleTask(GCalHelper gcalHelper, TaskService taskService, Task task, long newDueDate) { task.setReminderSnooze(0L); task.setCompletionDate(0L); task.setDueDateAdjustingHideUntil(newDueDate); @@ -273,7 +273,7 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver { } } - static long handleSubdayRepeat(DateTime startDate, RRule rrule) { + private static long handleSubdayRepeat(DateTime startDate, RRule rrule) { long millis; switch(rrule.getFreq()) { case HOURLY: diff --git a/src/main/java/com/todoroo/astrid/service/StartupService.java b/src/main/java/com/todoroo/astrid/service/StartupService.java index 5eee8b017..c52a6a869 100644 --- a/src/main/java/com/todoroo/astrid/service/StartupService.java +++ b/src/main/java/com/todoroo/astrid/service/StartupService.java @@ -29,7 +29,7 @@ import timber.log.Timber; public class StartupService { - public static final int V4_8_0 = 380; + private static final int V4_8_0 = 380; private final Context context; private final Database database; diff --git a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index f64019d41..c4696e1ce 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -142,7 +142,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen indent(which, -1); } - protected void indent(int which, int delta) { + void indent(int which, int delta) { String targetTaskId = taskAdapter.getItemUuid(which); if (!RemoteModel.isValidUuid(targetTaskId)) { return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks) diff --git a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java index a659405b1..6fe2d66e2 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java +++ b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java @@ -21,7 +21,7 @@ public abstract class AstridOrderedListUpdater { private final TaskService taskService; - public AstridOrderedListUpdater(TaskService taskService) { + AstridOrderedListUpdater(TaskService taskService) { this.taskService = taskService; idToNode = new HashMap<>(); } @@ -135,7 +135,7 @@ public abstract class AstridOrderedListUpdater { return ids.toArray(new String[ids.size()]); } - public String getOrderString() { + String getOrderString() { String[] ids = getOrderedIds(); return buildOrderString(ids); } @@ -414,7 +414,7 @@ public abstract class AstridOrderedListUpdater { } } - protected String serializeTree() { + String serializeTree() { return serializeTree(treeRoot); } diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java index cd2c7b8b2..519331585 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java @@ -138,7 +138,7 @@ public class SubtasksHelper { T getKeyFromOldUuid(String uuid); } - public static void remapTree(Node root, HashMap idMap, TreeRemapHelper helper) { + private static void remapTree(Node root, HashMap idMap, TreeRemapHelper helper) { ArrayList children = root.children; for (int i = 0; i < children.size(); i++) { Node child = children.get(i); diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java index 7d9a0ab56..e189ad88c 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java @@ -16,7 +16,7 @@ public abstract class SubtasksUpdater extends AstridOrderedListUpdater { public static final String ACTIVE_TASKS_ORDER = "active_tasks_order"; //$NON-NLS-1$ public static final String TODAY_TASKS_ORDER = "today_tasks_order"; //$NON-NLS-1$ - public SubtasksUpdater(TaskService taskService) { + SubtasksUpdater(TaskService taskService) { super(taskService); } @@ -27,7 +27,7 @@ public abstract class SubtasksUpdater extends AstridOrderedListUpdater { } @Override - public void applyToFilter(Filter filter) { + protected void applyToFilter(Filter filter) { String query = filter.getSqlQuery(); query = query.replaceAll("ORDER BY .*", ""); diff --git a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java index 9f8cf0640..6406d9073 100644 --- a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java +++ b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java @@ -277,7 +277,7 @@ public final class TagsControlSet extends TaskEditControlFragment { } /** Adds a tag to the tag field */ - void addTag(String tagName) { + private void addTag(String tagName) { LayoutInflater inflater = getActivity().getLayoutInflater(); // check if already exists @@ -373,7 +373,7 @@ public final class TagsControlSet extends TaskEditControlFragment { return !existingSet.equals(selectedSet); } - protected void refreshDisplayView() { + private void refreshDisplayView() { selectedTags = getSelectedTags(); CharSequence tagString = buildTagString(); if (TextUtils.isEmpty(tagString)) { diff --git a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java index 45df82983..0224ca754 100644 --- a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java +++ b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java @@ -69,7 +69,7 @@ public class TimerControlSet extends TaskEditControlFragment { private TimeDurationControlSet estimated; private TimeDurationControlSet elapsed; private long timerStarted; - protected AlertDialog dialog; + private AlertDialog dialog; private View dialogView; private int elapsedSeconds; private int estimatedSeconds; diff --git a/src/main/java/com/todoroo/astrid/ui/DraggableListView.java b/src/main/java/com/todoroo/astrid/ui/DraggableListView.java index 15dcb3c08..ca849f565 100644 --- a/src/main/java/com/todoroo/astrid/ui/DraggableListView.java +++ b/src/main/java/com/todoroo/astrid/ui/DraggableListView.java @@ -337,7 +337,7 @@ public class DraggableListView extends ListView { } } - protected void initiateDrag(MotionEvent ev) { + private void initiateDrag(MotionEvent ev) { int x = (int) mTouchCurrentX; int y = (int) mTouchCurrentY; int itemNum = pointToPosition(x, y); diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index 0a72618e1..d907f10f8 100644 --- a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -298,7 +298,7 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt refreshDisplayView(); } - public void setCustomDate(long timestamp) { + private void setCustomDate(long timestamp) { updateSpinnerOptions(timestamp); spinner.setSelection(0); refreshDisplayView(); diff --git a/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java b/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java index 5d052b15b..05247d5da 100644 --- a/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java +++ b/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java @@ -9,8 +9,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -public class MultilineHelper { - protected static void makeMultiline(View view) { +class MultilineHelper { + static void makeMultiline(View view) { if (view instanceof ViewGroup) { ViewGroup grp = (ViewGroup) view; diff --git a/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java b/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java index 679cc1cc5..9e4307d45 100644 --- a/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java +++ b/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java @@ -22,7 +22,7 @@ import java.util.LinkedList; import java.util.List; /** Dialog box with an arbitrary number of number pickers */ -public class NNumberPickerDialog extends AlertDialog implements OnClickListener { +class NNumberPickerDialog extends AlertDialog implements OnClickListener { public interface OnNNumberPickedListener { void onNumbersPicked(int[] number); diff --git a/src/main/java/com/todoroo/astrid/ui/NumberPicker.java b/src/main/java/com/todoroo/astrid/ui/NumberPicker.java index 70112517c..dd7052547 100644 --- a/src/main/java/com/todoroo/astrid/ui/NumberPicker.java +++ b/src/main/java/com/todoroo/astrid/ui/NumberPicker.java @@ -77,7 +77,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, this(context, null); } - protected int getLayout() { + private int getLayout() { return R.layout.number_picker; } @@ -85,7 +85,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, * @return The number of allowable digits that can be typed in (-1 for unlimited) * e.g. return 2 if you don't want to allow 00002 even if 2 is in range. */ - protected int getMaxDigits() { + private int getMaxDigits() { return -1; } @@ -217,7 +217,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, } - public void updateView() { + private void updateView() { /* * If we don't have displayed values then use the current number else @@ -297,7 +297,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, private final NumberPickerButton mIncrementButton; private final NumberPickerButton mDecrementButton; - class NumberPickerInputFilter implements InputFilter { + private class NumberPickerInputFilter implements InputFilter { @Override public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) { @@ -306,7 +306,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, } } - class NumberRangeKeyListener extends NumberKeyListener { + private class NumberRangeKeyListener extends NumberKeyListener { @Override protected char[] getAcceptedChars() { diff --git a/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java index 6178bb67a..570829586 100644 --- a/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java @@ -21,7 +21,7 @@ import org.tasks.R; * @author Tim Su * */ -public class RandomReminderControlSet { +class RandomReminderControlSet { private int selectedIndex; private final int[] hours; diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java index 6519e6b8e..872f33c0e 100644 --- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java @@ -276,19 +276,19 @@ public class ReminderControlSet extends TaskEditControlFragment { } } - public void addAlarmRow(final Long timestamp) { + private void addAlarmRow(final Long timestamp) { addAlarmRow(getLongDateStringWithTime(context, timestamp), v -> alarms.remove(timestamp)); alarms.add(timestamp); } - public void pickLocation() { + private void pickLocation() { Intent intent = PlacePicker.getIntent(getActivity()); if (intent != null) { startActivityForResult(intent, REQUEST_LOCATION_REMINDER); } } - public void addGeolocationReminder(final Geofence geofence) { + private void addGeolocationReminder(final Geofence geofence) { addAlarmRow(geofence.getName(), v -> geofences.remove(geofence)); geofences.add(geofence); } diff --git a/src/main/java/org/tasks/Broadcaster.java b/src/main/java/org/tasks/Broadcaster.java index 2e2c785fe..d1cad8ce6 100644 --- a/src/main/java/org/tasks/Broadcaster.java +++ b/src/main/java/org/tasks/Broadcaster.java @@ -58,7 +58,7 @@ public class Broadcaster { sendOrderedBroadcast(intent, null); } - void sendOrderedBroadcast(Intent intent, String permissions) { + private void sendOrderedBroadcast(Intent intent, String permissions) { context.sendOrderedBroadcast(intent, permissions); } diff --git a/src/main/java/org/tasks/activities/FilterSelectionActivity.java b/src/main/java/org/tasks/activities/FilterSelectionActivity.java index e88cfc456..8867281f9 100644 --- a/src/main/java/org/tasks/activities/FilterSelectionActivity.java +++ b/src/main/java/org/tasks/activities/FilterSelectionActivity.java @@ -22,9 +22,9 @@ public class FilterSelectionActivity extends InjectingAppCompatActivity { public static final String EXTRA_RETURN_FILTER = "extra_include_filter"; public static final String EXTRA_FILTER = "extra_filter"; - public static final String EXTRA_FILTER_NAME = "extra_filter_name"; - public static final String EXTRA_FILTER_SQL = "extra_filter_query"; - public static final String EXTRA_FILTER_VALUES = "extra_filter_values"; + private static final String EXTRA_FILTER_NAME = "extra_filter_name"; + private static final String EXTRA_FILTER_SQL = "extra_filter_query"; + private static final String EXTRA_FILTER_VALUES = "extra_filter_values"; @Inject FilterProvider filterProvider; @Inject FilterCounter filterCounter; diff --git a/src/main/java/org/tasks/dialogs/ExportTasksDialog.java b/src/main/java/org/tasks/dialogs/ExportTasksDialog.java index 800ebe521..1eb777fce 100644 --- a/src/main/java/org/tasks/dialogs/ExportTasksDialog.java +++ b/src/main/java/org/tasks/dialogs/ExportTasksDialog.java @@ -21,7 +21,7 @@ public class ExportTasksDialog extends InjectingNativeDialogFragment { @Inject DialogBuilder dialogBuilder; @Inject TasksXmlExporter tasksXmlExporter; - ProgressDialog progressDialog; + private ProgressDialog progressDialog; @NonNull @Override diff --git a/src/main/java/org/tasks/dialogs/ImportTasksDialog.java b/src/main/java/org/tasks/dialogs/ImportTasksDialog.java index 4e358071f..0966fb323 100644 --- a/src/main/java/org/tasks/dialogs/ImportTasksDialog.java +++ b/src/main/java/org/tasks/dialogs/ImportTasksDialog.java @@ -21,7 +21,7 @@ public class ImportTasksDialog extends InjectingNativeDialogFragment { return importTasksDialog; } - public static final String EXTRA_PATH = "extra_path"; + private static final String EXTRA_PATH = "extra_path"; @Inject TasksXmlImporter xmlImporter; @Inject DialogBuilder dialogBuilder; diff --git a/src/main/java/org/tasks/filters/FilterCounter.java b/src/main/java/org/tasks/filters/FilterCounter.java index 91c1ab3eb..3357489ad 100644 --- a/src/main/java/org/tasks/filters/FilterCounter.java +++ b/src/main/java/org/tasks/filters/FilterCounter.java @@ -36,7 +36,7 @@ public class FilterCounter { this(taskDao, new ThreadPoolExecutor(0, 1, 1, TimeUnit.SECONDS, new LinkedBlockingQueue<>())); } - FilterCounter(TaskDao taskDao, ExecutorService executorService) { + private FilterCounter(TaskDao taskDao, ExecutorService executorService) { this.taskDao = taskDao; this.executorService = executorService; } diff --git a/src/main/java/org/tasks/filters/NavigationDrawerAction.java b/src/main/java/org/tasks/filters/NavigationDrawerAction.java index 9958abbe1..148aeee5d 100644 --- a/src/main/java/org/tasks/filters/NavigationDrawerAction.java +++ b/src/main/java/org/tasks/filters/NavigationDrawerAction.java @@ -38,7 +38,7 @@ public class NavigationDrawerAction extends FilterListItem { } @Override - public void readFromParcel(Parcel source) { + protected void readFromParcel(Parcel source) { super.readFromParcel(source); intent = source.readParcelable(Intent.class.getClassLoader()); requestCode = source.readInt(); diff --git a/src/main/java/org/tasks/injection/InjectingAppCompatActivity.java b/src/main/java/org/tasks/injection/InjectingAppCompatActivity.java index 8441ab56b..ad6509d09 100644 --- a/src/main/java/org/tasks/injection/InjectingAppCompatActivity.java +++ b/src/main/java/org/tasks/injection/InjectingAppCompatActivity.java @@ -8,7 +8,7 @@ import org.tasks.locale.Locale; public abstract class InjectingAppCompatActivity extends AppCompatActivity implements InjectingActivity { private ActivityComponent activityComponent; - public InjectingAppCompatActivity() { + protected InjectingAppCompatActivity() { Locale.getInstance(this).applyOverrideConfiguration(this); } diff --git a/src/main/java/org/tasks/injection/InjectingIntentService.java b/src/main/java/org/tasks/injection/InjectingIntentService.java index 883db9f29..18700c619 100644 --- a/src/main/java/org/tasks/injection/InjectingIntentService.java +++ b/src/main/java/org/tasks/injection/InjectingIntentService.java @@ -5,7 +5,7 @@ import android.content.Intent; public abstract class InjectingIntentService extends IntentService { - public InjectingIntentService(String name) { + protected InjectingIntentService(String name) { super(name); } diff --git a/src/main/java/org/tasks/injection/InjectingListFragment.java b/src/main/java/org/tasks/injection/InjectingListFragment.java index fc1def860..a931e5e0d 100644 --- a/src/main/java/org/tasks/injection/InjectingListFragment.java +++ b/src/main/java/org/tasks/injection/InjectingListFragment.java @@ -19,5 +19,5 @@ public abstract class InjectingListFragment extends ListFragment { } } - public abstract void inject(FragmentComponent component); + protected abstract void inject(FragmentComponent component); } diff --git a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java index 5dab206df..5b4025776 100644 --- a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java +++ b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java @@ -24,9 +24,9 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct private ActivityComponent activityComponent; - protected Toolbar toolbar; + private Toolbar toolbar; - public InjectingPreferenceActivity() { + protected InjectingPreferenceActivity() { Locale.getInstance(this).applyOverrideConfiguration(this); } @@ -87,7 +87,7 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct remove(getPreferenceScreen(), resIds); } - protected void remove(PreferenceGroup preferenceGroup, int[] resIds) { + private void remove(PreferenceGroup preferenceGroup, int[] resIds) { for (int resId : resIds) { preferenceGroup.removePreference(findPreference(resId)); } diff --git a/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.java b/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.java index 9821d2d4d..c0291d9c8 100644 --- a/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.java +++ b/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.java @@ -13,7 +13,7 @@ public abstract class ThemedInjectingAppCompatActivity extends AppCompatActivity @Inject Theme theme; - public ThemedInjectingAppCompatActivity() { + protected ThemedInjectingAppCompatActivity() { Locale.getInstance(this).applyOverrideConfiguration(this); } diff --git a/src/main/java/org/tasks/intents/TaskIntents.java b/src/main/java/org/tasks/intents/TaskIntents.java index ebe2febd4..9a63d0566 100644 --- a/src/main/java/org/tasks/intents/TaskIntents.java +++ b/src/main/java/org/tasks/intents/TaskIntents.java @@ -24,7 +24,7 @@ public class TaskIntents { return taskListIntent; } - public static Intent getEditTaskIntent(Context context, final Filter filter, final long taskId) { + private static Intent getEditTaskIntent(Context context, final Filter filter, final long taskId) { Intent taskListIntent = getTaskListIntent(context, filter); taskListIntent.putExtra(TaskListActivity.OPEN_TASK, taskId); return taskListIntent; diff --git a/src/main/java/org/tasks/locale/Locale.java b/src/main/java/org/tasks/locale/Locale.java index a20d1f02b..34f7de311 100644 --- a/src/main/java/org/tasks/locale/Locale.java +++ b/src/main/java/org/tasks/locale/Locale.java @@ -68,7 +68,7 @@ public class Locale { private final int directionOverride; private final boolean hasUserOverrides; - public Locale(java.util.Locale deviceLocale, String languageOverride, int directionOverride) { + private Locale(java.util.Locale deviceLocale, String languageOverride, int directionOverride) { this.deviceLocale = deviceLocale; this.languageOverride = languageOverride; this.directionOverride = directionOverride; diff --git a/src/main/java/org/tasks/location/GeofenceFields.java b/src/main/java/org/tasks/location/GeofenceFields.java index 19e147f54..97e6ba87a 100644 --- a/src/main/java/org/tasks/location/GeofenceFields.java +++ b/src/main/java/org/tasks/location/GeofenceFields.java @@ -6,7 +6,7 @@ import com.todoroo.astrid.data.Metadata; import static com.todoroo.andlib.data.Property.DoubleProperty; import static com.todoroo.andlib.data.Property.StringProperty; -public class GeofenceFields { +class GeofenceFields { public static final String METADATA_KEY = "geofence"; diff --git a/src/main/java/org/tasks/preferences/PermissionRequestor.java b/src/main/java/org/tasks/preferences/PermissionRequestor.java index 958e11cab..659124106 100644 --- a/src/main/java/org/tasks/preferences/PermissionRequestor.java +++ b/src/main/java/org/tasks/preferences/PermissionRequestor.java @@ -12,7 +12,7 @@ public abstract class PermissionRequestor { private final PermissionChecker permissionChecker; - public PermissionRequestor(PermissionChecker permissionChecker) { + PermissionRequestor(PermissionChecker permissionChecker) { this.permissionChecker = permissionChecker; } diff --git a/src/main/java/org/tasks/preferences/Preferences.java b/src/main/java/org/tasks/preferences/Preferences.java index ac58a0d37..ded0c4f41 100644 --- a/src/main/java/org/tasks/preferences/Preferences.java +++ b/src/main/java/org/tasks/preferences/Preferences.java @@ -36,7 +36,7 @@ public class Preferences { private static final String PREF_SORT_SORT = "sort_sort"; //$NON-NLS-1$ - protected final Context context; + private final Context context; private final PermissionChecker permissionChecker; private final SharedPreferences prefs; private final SharedPreferences publicPrefs; @@ -189,7 +189,7 @@ public class Preferences { } } - public boolean notificationsEnabled() { + private boolean notificationsEnabled() { return getBoolean(R.string.p_rmd_enabled, true); } diff --git a/src/main/java/org/tasks/receivers/ListNotificationReceiver.java b/src/main/java/org/tasks/receivers/ListNotificationReceiver.java index 710f08aa8..9e931c21b 100644 --- a/src/main/java/org/tasks/receivers/ListNotificationReceiver.java +++ b/src/main/java/org/tasks/receivers/ListNotificationReceiver.java @@ -20,9 +20,9 @@ public class ListNotificationReceiver extends InjectingBroadcastReceiver { private static ExecutorService executorService = Executors.newSingleThreadExecutor(); - public static final String EXTRA_FILTER_TITLE = "extra_filter_title"; - public static final String EXTRA_FILTER_QUERY = "extra_filter_query"; - public static final String EXTRA_FILTER_VALUES = "extra_filter_values"; + private static final String EXTRA_FILTER_TITLE = "extra_filter_title"; + private static final String EXTRA_FILTER_QUERY = "extra_filter_query"; + private static final String EXTRA_FILTER_VALUES = "extra_filter_values"; @Inject Notifier notifier; @Inject Tracker tracker; diff --git a/src/main/java/org/tasks/reminders/SnoozeCallback.java b/src/main/java/org/tasks/reminders/SnoozeCallback.java index 24eccecfd..af7d67066 100644 --- a/src/main/java/org/tasks/reminders/SnoozeCallback.java +++ b/src/main/java/org/tasks/reminders/SnoozeCallback.java @@ -2,7 +2,7 @@ package org.tasks.reminders; import org.tasks.time.DateTime; -public interface SnoozeCallback { +interface SnoozeCallback { void snoozeForTime(DateTime time); diff --git a/src/main/java/org/tasks/scheduling/CalendarNotificationIntentService.java b/src/main/java/org/tasks/scheduling/CalendarNotificationIntentService.java index 81907552a..9465a234c 100644 --- a/src/main/java/org/tasks/scheduling/CalendarNotificationIntentService.java +++ b/src/main/java/org/tasks/scheduling/CalendarNotificationIntentService.java @@ -25,7 +25,7 @@ public class CalendarNotificationIntentService extends RecurringIntervalIntentSe private static final long FIFTEEN_MINUTES = TimeUnit.MINUTES.toMillis(15); - public static final String URI_PREFIX = "cal-reminder"; + private static final String URI_PREFIX = "cal-reminder"; public static final String URI_PREFIX_POSTPONE = "cal-postpone"; @Inject Preferences preferences; diff --git a/src/main/java/org/tasks/scheduling/MidnightIntentService.java b/src/main/java/org/tasks/scheduling/MidnightIntentService.java index 999e8a657..145c852d0 100644 --- a/src/main/java/org/tasks/scheduling/MidnightIntentService.java +++ b/src/main/java/org/tasks/scheduling/MidnightIntentService.java @@ -21,7 +21,7 @@ public abstract class MidnightIntentService extends InjectingIntentService { private final String name; - public MidnightIntentService(String name) { + MidnightIntentService(String name) { super(name); this.name = name; } @@ -55,7 +55,7 @@ public abstract class MidnightIntentService extends InjectingIntentService { abstract void run(); - protected String getLastRunPreference() { + String getLastRunPreference() { return null; } } diff --git a/src/main/java/org/tasks/scheduling/RecurringIntervalIntentService.java b/src/main/java/org/tasks/scheduling/RecurringIntervalIntentService.java index 9981c45f0..002d6d8b2 100644 --- a/src/main/java/org/tasks/scheduling/RecurringIntervalIntentService.java +++ b/src/main/java/org/tasks/scheduling/RecurringIntervalIntentService.java @@ -21,7 +21,7 @@ public abstract class RecurringIntervalIntentService extends InjectingIntentServ @Inject Preferences preferences; @Inject AlarmManager alarmManager; - public RecurringIntervalIntentService(String name) { + RecurringIntervalIntentService(String name) { super(name); } diff --git a/src/main/java/org/tasks/themes/ThemeBase.java b/src/main/java/org/tasks/themes/ThemeBase.java index 84eebe16e..811648e4e 100644 --- a/src/main/java/org/tasks/themes/ThemeBase.java +++ b/src/main/java/org/tasks/themes/ThemeBase.java @@ -10,7 +10,7 @@ import org.tasks.R; public class ThemeBase { - public static final int[] THEMES = new int[]{ + private static final int[] THEMES = new int[]{ R.style.TasksOverride, R.style.ThemeBlack, R.style.TasksOverride, diff --git a/src/main/java/org/tasks/themes/ThemeColor.java b/src/main/java/org/tasks/themes/ThemeColor.java index 648d8e69d..50b38d5d6 100644 --- a/src/main/java/org/tasks/themes/ThemeColor.java +++ b/src/main/java/org/tasks/themes/ThemeColor.java @@ -110,7 +110,7 @@ public class ThemeColor { return actionBarTint; } - public int getColorPrimaryDark() { + private int getColorPrimaryDark() { return colorPrimaryDark; } diff --git a/src/main/java/org/tasks/time/DateTime.java b/src/main/java/org/tasks/time/DateTime.java index 9a1323d72..6d62b4ebe 100644 --- a/src/main/java/org/tasks/time/DateTime.java +++ b/src/main/java/org/tasks/time/DateTime.java @@ -51,7 +51,7 @@ public class DateTime { this(timestamp, TimeZone.getDefault()); } - public DateTime(long timestamp, TimeZone timeZone) { + private DateTime(long timestamp, TimeZone timeZone) { this.timestamp = timestamp; this.timeZone = timeZone; } diff --git a/src/main/java/org/tasks/time/MillisProvider.java b/src/main/java/org/tasks/time/MillisProvider.java index 037110a30..ca3d476ce 100644 --- a/src/main/java/org/tasks/time/MillisProvider.java +++ b/src/main/java/org/tasks/time/MillisProvider.java @@ -1,5 +1,5 @@ package org.tasks.time; -public interface MillisProvider { +interface MillisProvider { long getMillis(); } diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index 4a5dfb831..e1e90780b 100644 --- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -42,11 +42,11 @@ public class NavigationDrawerFragment extends InjectingFragment { public static final int FRAGMENT_NAVIGATION_DRAWER = R.id.navigation_drawer; - public static final String TOKEN_LAST_SELECTED = "lastSelected"; //$NON-NLS-1$ + private static final String TOKEN_LAST_SELECTED = "lastSelected"; //$NON-NLS-1$ public static final int REQUEST_NEW_LIST = 4; - public FilterAdapter adapter = null; + private FilterAdapter adapter = null; private final RefreshReceiver refreshReceiver = new RefreshReceiver(); @@ -235,7 +235,7 @@ public class NavigationDrawerFragment extends InjectingFragment { void onFilterItemClicked(FilterListItem item); } - public void clear() { + private void clear() { adapter.clear(); } diff --git a/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java b/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java index a0bccdf2d..3ff76f03e 100644 --- a/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java +++ b/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java @@ -12,7 +12,7 @@ import timber.log.Timber; public abstract class ProgressDialogAsyncTask extends AsyncTask { - ProgressDialog progressDialog; + private ProgressDialog progressDialog; private Activity activity; private DialogBuilder dialogBuilder; diff --git a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java index 073495a58..0bb86a93f 100644 --- a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java +++ b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java @@ -34,7 +34,7 @@ import timber.log.Timber; import static android.support.v4.content.ContextCompat.getColor; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; -public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { +class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { private final WidgetCheckBoxes checkBoxes; private final ThemeCache themeCache; @@ -138,7 +138,7 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac } } - public RemoteViews buildUpdate(int position) { + private RemoteViews buildUpdate(int position) { try { Task task = getTask(position); if (task == null) { @@ -230,7 +230,7 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac return subtasksHelper.applySubtasksToWidgetFilter(filter, query, filter.listingTitle, 0); } - public void formatDueDate(RemoteViews row, Task task, int textColor) { + private void formatDueDate(RemoteViews row, Task task, int textColor) { if (task.hasDueDate()) { Resources resources = context.getResources(); row.setViewVisibility(R.id.widget_due_date, View.VISIBLE); diff --git a/src/main/java/org/tasks/widget/WidgetPreferences.java b/src/main/java/org/tasks/widget/WidgetPreferences.java index cbf82db71..afbc7f7c8 100644 --- a/src/main/java/org/tasks/widget/WidgetPreferences.java +++ b/src/main/java/org/tasks/widget/WidgetPreferences.java @@ -5,46 +5,46 @@ import android.content.Context; import org.tasks.R; import org.tasks.preferences.Preferences; -public class WidgetPreferences { +class WidgetPreferences { private final Context context; private final Preferences preferences; private final int widgetId; - public WidgetPreferences(Context context, Preferences preferences, int widgetId) { + WidgetPreferences(Context context, Preferences preferences, int widgetId) { this.context = context; this.preferences = preferences; this.widgetId = widgetId; } - public boolean showDueDate() { + boolean showDueDate() { return preferences.getBoolean(getKey(R.string.p_widget_show_due_date), true); } - public boolean showHeader() { + boolean showHeader() { return preferences.getBoolean(getKey(R.string.p_widget_show_header), true); } - public boolean showCheckboxes() { + boolean showCheckboxes() { return preferences.getBoolean(getKey(R.string.p_widget_show_checkboxes), true); } - public boolean showSettings() { + boolean showSettings() { return preferences.getBoolean(getKey(R.string.p_widget_show_settings), true); } - public int getFontSize() { + int getFontSize() { return preferences.getInt(getKey(R.string.p_widget_font_size), 16); } - public String getFilterId() { + String getFilterId() { return preferences.getStringValue(getKey(R.string.p_widget_filter)); } - public int getThemeIndex() { + int getThemeIndex() { return preferences.getInt(getKey(R.string.p_widget_theme), 0); } - public int getColorIndex() { + int getColorIndex() { return preferences.getInt(getKey(R.string.p_widget_color), 0); } @@ -56,7 +56,7 @@ public class WidgetPreferences { preferences.setInt(getKey(R.string.p_widget_opacity), value); } - public void setFontSize(int value) { + void setFontSize(int value) { preferences.setInt(getKey(R.string.p_widget_font_size), value); }