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

Move data objects to org.tasks package

Browse Source
pull/618/head
Alex Baker 7 years ago
parent 3943d620a5
commit 3d448b0142
61 changed files with 146 additions and 145 deletions
Show Stats Download Patch File Download Diff File

2
app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
Unescape Escape View File

@ -4,7 +4,7 @@ import android.support.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata;
import org.tasks.data.TaskListMetadata;
import org.junit.Test;
import org.junit.runner.RunWith;

2
app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java
Unescape Escape View File

@ -4,7 +4,7 @@ import android.support.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata;
import org.tasks.data.TaskListMetadata;
import org.junit.Ignore;
import org.junit.Test;

2
app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java
Unescape Escape View File

@ -3,7 +3,7 @@ package com.todoroo.astrid.subtasks;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.core.BuiltInFilterExposer;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import org.tasks.data.TaskListMetadataDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.subtasks.SubtasksFilterUpdater.Node;

4
app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.todoroo.astrid.sync;
import com.todoroo.astrid.dao.TagDataDao;
import org.tasks.data.TagDataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import org.tasks.injection.InjectingTestCase;

2
app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java
Unescape Escape View File

@ -3,7 +3,7 @@ package com.todoroo.astrid.sync;
import android.support.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import org.junit.Test;

8
app/src/androidTest/java/org/tasks/injection/TestModule.java
Unescape Escape View File

@ -4,10 +4,10 @@ import android.arch.persistence.room.Room;
import android.content.Context;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.StoreObjectDao;
import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import com.todoroo.astrid.dao.UserActivityDao;
import org.tasks.data.StoreObjectDao;
import org.tasks.data.TagDataDao;
import org.tasks.data.TaskListMetadataDao;
import org.tasks.data.UserActivityDao;
import org.tasks.data.AlarmDao;
import org.tasks.data.GoogleTaskDao;

2
app/src/androidTest/java/org/tasks/makers/GtaskListMaker.java
Unescape Escape View File

@ -3,7 +3,7 @@ package org.tasks.makers;
import com.natpryce.makeiteasy.Instantiator;
import com.natpryce.makeiteasy.Property;
import com.natpryce.makeiteasy.PropertyValue;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObject;
import com.todoroo.astrid.gtasks.GtasksList;
import static com.natpryce.makeiteasy.Property.newProperty;

2
app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java
Unescape Escape View File

@ -4,7 +4,7 @@ import android.support.test.runner.AndroidJUnit4;
import com.google.api.client.util.DateTime;
import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.StoreObjectDao;
import org.tasks.data.StoreObjectDao;
import com.todoroo.astrid.service.TaskDeleter;
import org.junit.Test;

2
app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java
Unescape Escape View File

@ -7,7 +7,7 @@ package com.todoroo.astrid.gtasks;
import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.dao.StoreObjectDao;
import org.tasks.data.StoreObjectDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskDeleter;

4
app/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
Unescape Escape View File

@ -14,8 +14,8 @@ import android.widget.Toast;
import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.dao.StoreObjectDao;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObjectDao;
import org.tasks.data.StoreObject;
import com.todoroo.astrid.gtasks.GtasksList;
import com.todoroo.astrid.gtasks.GtasksListService;

2
app/src/googleplay/java/org/tasks/activities/NativeGoogleTaskListPicker.java
Unescape Escape View File

@ -4,7 +4,7 @@ import android.app.Activity;
import android.app.Dialog;
import android.os.Bundle;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObject;
import com.todoroo.astrid.gtasks.GtasksList;
import com.todoroo.astrid.gtasks.GtasksListService;

3
app/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java
Unescape Escape View File

@ -7,7 +7,7 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObject;
import com.todoroo.astrid.gtasks.GtasksList;
import com.todoroo.astrid.gtasks.GtasksListService;
@ -18,7 +18,6 @@ import org.tasks.injection.DialogFragmentComponent;
import org.tasks.injection.InjectingDialogFragment;
import org.tasks.themes.ThemeAccent;
import org.tasks.themes.ThemeCache;
import org.tasks.themes.ThemeColor;
import org.tasks.ui.SingleCheckedArrayAdapter;
import java.util.List;

2
app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java
Unescape Escape View File

@ -38,7 +38,7 @@ import com.todoroo.andlib.sql.Field;
import com.todoroo.andlib.sql.Join;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.StoreObjectDao;
import org.tasks.data.StoreObjectDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.SyncFlags;
import com.todoroo.astrid.data.Task;

2
app/src/googleplay/java/org/tasks/tasklist/GtasksListFragment.java
Unescape Escape View File

@ -9,7 +9,7 @@ import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObject;
import com.todoroo.astrid.gtasks.GtasksList;
import com.todoroo.astrid.service.SyncV2Service;
import com.todoroo.astrid.sync.SyncResultCallback;

2
app/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java
Unescape Escape View File

@ -7,7 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObject;
import com.todoroo.astrid.data.SyncFlags;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gtasks.GtasksList;

4
app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
Unescape Escape View File

@ -22,9 +22,9 @@ import android.widget.LinearLayout;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.UserActivityDao;
import org.tasks.data.UserActivityDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.UserActivity;
import org.tasks.data.UserActivity;
import com.todoroo.astrid.files.FilesControlSet;
import com.todoroo.astrid.gtasks.GtasksList;
import com.todoroo.astrid.notes.CommentsController;

4
app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -23,9 +23,9 @@ import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.dao.TagDataDao;
import org.tasks.data.TagDataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gtasks.GtasksList;
import com.todoroo.astrid.gtasks.GtasksListService;

2
app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
Unescape Escape View File

@ -20,7 +20,7 @@ import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskAttachment;
import org.tasks.data.TaskAttachment;
import java.util.ArrayList;
import java.util.List;

2
app/src/main/java/com/todoroo/astrid/api/CustomFilter.java
Unescape Escape View File

@ -4,7 +4,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObject;
import java.util.Map;

2
app/src/main/java/com/todoroo/astrid/api/TagFilter.java
Unescape Escape View File

@ -8,7 +8,7 @@ import com.todoroo.andlib.sql.Field;
import com.todoroo.andlib.sql.Join;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import org.tasks.R;

8
app/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java
Unescape Escape View File

@ -20,12 +20,12 @@ import com.todoroo.andlib.sql.Order;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.dao.TagDataDao;
import org.tasks.data.TagDataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.UserActivityDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.UserActivityDao;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.UserActivity;
import org.tasks.data.UserActivity;
import org.tasks.R;
import org.tasks.backup.XmlWriter;

8
app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java
Unescape Escape View File

@ -17,12 +17,12 @@ import com.todoroo.andlib.data.Property.PropertyVisitor;
import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.dao.TagDataDao;
import org.tasks.data.TagDataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.UserActivityDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.UserActivityDao;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.UserActivity;
import org.tasks.data.UserActivity;
import org.tasks.LocalBroadcastManager;
import org.tasks.R;

4
app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
Unescape Escape View File

@ -30,9 +30,9 @@ import com.todoroo.astrid.api.MultipleSelectCriterion;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.api.TextInputCriterion;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.StoreObjectDao;
import org.tasks.data.StoreObjectDao;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObject;
import com.todoroo.astrid.data.Task;
import org.tasks.R;

4
app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
Unescape Escape View File

@ -10,8 +10,8 @@ import android.text.TextUtils;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.api.CustomFilter;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.StoreObjectDao;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObjectDao;
import org.tasks.data.StoreObject;
import org.tasks.R;

4
app/src/main/java/com/todoroo/astrid/core/SavedFilter.java
Unescape Escape View File

@ -7,8 +7,8 @@ package com.todoroo.astrid.core;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance;
import com.todoroo.astrid.dao.StoreObjectDao;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObjectDao;
import org.tasks.data.StoreObject;
import java.util.Map;

16
app/src/main/java/com/todoroo/astrid/dao/Database.java
Unescape Escape View File

@ -15,12 +15,14 @@ import android.database.sqlite.SQLiteDatabase;
import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.data.Table;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.data.StoreObject;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.StoreObject;
import org.tasks.data.StoreObjectDao;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskAttachment;
import com.todoroo.astrid.data.TaskListMetadata;
import com.todoroo.astrid.data.UserActivity;
import org.tasks.data.TaskAttachment;
import org.tasks.data.TaskListMetadata;
import org.tasks.data.UserActivity;
import org.tasks.data.Alarm;
import org.tasks.data.AlarmDao;
@ -30,6 +32,10 @@ import org.tasks.data.Location;
import org.tasks.data.LocationDao;
import org.tasks.data.Tag;
import org.tasks.data.TagDao;
import org.tasks.data.TagDataDao;
import org.tasks.data.TaskAttachmentDao;
import org.tasks.data.TaskListMetadataDao;
import org.tasks.data.UserActivityDao;
import org.tasks.notifications.Notification;
import org.tasks.notifications.NotificationDao;

4
app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
Unescape Escape View File

@ -24,9 +24,9 @@ import android.widget.Toast;
import com.google.common.base.Strings;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.dao.TaskAttachmentDao;
import org.tasks.data.TaskAttachmentDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskAttachment;
import org.tasks.data.TaskAttachment;
import org.tasks.R;
import org.tasks.activities.AddAttachmentActivity;

2
app/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java
Unescape Escape View File

@ -6,7 +6,7 @@
package com.todoroo.astrid.gtasks;
import com.google.common.base.Strings;
import com.todoroo.astrid.data.StoreObject;
import org.tasks.data.StoreObject;
/**
* {@link StoreObject} entries for a GTasks List

4
app/src/main/java/com/todoroo/astrid/notes/CommentsController.java
Unescape Escape View File

@ -19,9 +19,9 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.UserActivityDao;
import org.tasks.data.UserActivityDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.UserActivity;
import org.tasks.data.UserActivity;
import com.todoroo.astrid.utility.Constants;
import org.tasks.R;

2
app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java
Unescape Escape View File

@ -19,7 +19,7 @@ import com.todoroo.andlib.sql.Query;
import com.todoroo.astrid.core.SortHelper;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.tags.TagService;

4
app/src/main/java/com/todoroo/astrid/service/StartupService.java
Unescape Escape View File

@ -14,8 +14,8 @@ import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Multimaps;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagDataDao;
import org.tasks.data.TagData;
import com.todoroo.astrid.tags.TagService;
import org.tasks.BuildConfig;

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

@ -6,10 +6,10 @@ import android.text.TextUtils;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.dao.TagDataDao;
import org.tasks.data.TagDataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.SyncFlags;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gcal.GCalHelper;
import com.todoroo.astrid.tags.TagService;

2
app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
Unescape Escape View File

@ -15,7 +15,7 @@ import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata;
import org.tasks.data.TaskListMetadata;
import java.util.ArrayList;
import java.util.Collections;

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

@ -5,10 +5,10 @@ import android.text.TextUtils;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import org.tasks.data.TaskListMetadataDao;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata;
import org.tasks.data.TaskListMetadata;
import org.json.JSONArray;
import org.json.JSONException;

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

@ -10,13 +10,13 @@ import com.todoroo.andlib.sql.Query;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.core.BuiltInFilterExposer;
import com.todoroo.astrid.dao.TagDataDao;
import org.tasks.data.TagDataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import org.tasks.data.TaskListMetadataDao;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata;
import org.tasks.data.TaskListMetadata;
import com.todoroo.astrid.subtasks.SubtasksFilterUpdater.Node;
import org.tasks.R;

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

@ -15,9 +15,9 @@ import com.todoroo.astrid.adapter.TaskAdapter;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.core.BuiltInFilterExposer;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import org.tasks.data.TaskListMetadataDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata;
import org.tasks.data.TaskListMetadata;
import org.tasks.injection.ForApplication;
import org.tasks.injection.FragmentComponent;

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

@ -12,11 +12,11 @@ import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.TaskAdapter;
import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import org.tasks.data.TaskListMetadataDao;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata;
import org.tasks.data.TaskListMetadata;
import org.tasks.injection.ForApplication;
import org.tasks.injection.FragmentComponent;

2
app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
Unescape Escape View File

@ -8,7 +8,7 @@ package com.todoroo.astrid.tags;
import com.google.common.base.Strings;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import java.util.ArrayList;
import java.util.List;

4
app/src/main/java/com/todoroo/astrid/tags/TagService.java
Unescape Escape View File

@ -7,8 +7,8 @@ package com.todoroo.astrid.tags;
import android.text.TextUtils;
import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagDataDao;
import org.tasks.data.TagData;
import org.tasks.data.TagDao;
import org.tasks.injection.ApplicationScope;

4
app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
Unescape Escape View File

@ -39,9 +39,9 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.TagDataDao;
import org.tasks.data.TagDataDao;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.utility.Flags;

2
app/src/main/java/org/tasks/activities/AddAttachmentActivity.java
Unescape Escape View File

@ -11,7 +11,7 @@ import android.webkit.MimeTypeMap;
import android.widget.Toast;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.data.TaskAttachment;
import org.tasks.data.TaskAttachment;
import com.todoroo.astrid.files.AACRecordingActivity;
import org.tasks.R;

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

@ -16,7 +16,7 @@ import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
import com.todoroo.astrid.api.CustomFilter;
import com.todoroo.astrid.dao.StoreObjectDao;
import org.tasks.data.StoreObjectDao;
import org.tasks.R;
import org.tasks.dialogs.DialogBuilder;

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

@ -18,8 +18,8 @@ import android.view.inputmethod.InputMethodManager;
import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagDataDao;
import org.tasks.data.TagData;
import com.todoroo.astrid.helper.UUIDHelper;
import com.todoroo.astrid.tags.TagService;

37
app/src/main/java/org/tasks/data/GoogleTask.java
Unescape Escape View File

@ -182,6 +182,43 @@ public class GoogleTask {
this.suppressSync = suppressSync;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
GoogleTask that = (GoogleTask) o;
if (id != that.id) return false;
if (task != that.task) return false;
if (parent != that.parent) return false;
if (indent != that.indent) return false;
if (order != that.order) return false;
if (remoteOrder != that.remoteOrder) return false;
if (lastSync != that.lastSync) return false;
if (deleted != that.deleted) return false;
if (suppressSync != that.suppressSync) return false;
if (remoteId != null ? !remoteId.equals(that.remoteId) : that.remoteId != null)
return false;
return listId != null ? listId.equals(that.listId) : that.listId == null;
}
@Override
public int hashCode() {
int result = (int) (id ^ (id >>> 32));
result = 31 * result + (int) (task ^ (task >>> 32));
result = 31 * result + (remoteId != null ? remoteId.hashCode() : 0);
result = 31 * result + (listId != null ? listId.hashCode() : 0);
result = 31 * result + (int) (parent ^ (parent >>> 32));
result = 31 * result + indent;
result = 31 * result + (int) (order ^ (order >>> 32));
result = 31 * result + (int) (remoteOrder ^ (remoteOrder >>> 32));
result = 31 * result + (int) (lastSync ^ (lastSync >>> 32));
result = 31 * result + (int) (deleted ^ (deleted >>> 32));
result = 31 * result + (suppressSync ? 1 : 0);
return result;
}
@Override
public String toString() {
return "GoogleTask{" +

7
app/src/main/java/com/todoroo/astrid/data/StoreObject.java → app/src/main/java/org/tasks/data/StoreObject.java
Unescape Escape View File

@ -1,9 +1,4 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.data;
package org.tasks.data;
import android.arch.persistence.room.ColumnInfo;

8
app/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java → app/src/main/java/org/tasks/data/StoreObjectDao.java
Unescape Escape View File

@ -1,9 +1,4 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.dao;
package org.tasks.data;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert;
@ -11,7 +6,6 @@ import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import android.arch.persistence.room.Update;
import com.todoroo.astrid.data.StoreObject;
import com.todoroo.astrid.gtasks.GtasksList;
import java.util.List;

6
app/src/main/java/com/todoroo/astrid/data/TagData.java → app/src/main/java/org/tasks/data/TagData.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.todoroo.astrid.data;
package org.tasks.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
@ -7,11 +7,11 @@ import android.arch.persistence.room.PrimaryKey;
import android.os.Parcel;
import android.os.Parcelable;
import com.todoroo.astrid.data.RemoteModel;
import org.tasks.backup.XmlReader;
import org.tasks.backup.XmlWriter;
import java.io.Serializable;
@Entity(tableName = "tagdata")
public final class TagData implements Parcelable {

8
app/src/main/java/com/todoroo/astrid/dao/TagDataDao.java → app/src/main/java/org/tasks/data/TagDataDao.java
Unescape Escape View File

@ -1,9 +1,4 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.dao;
package org.tasks.data;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert;
@ -11,7 +6,6 @@ import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.helper.UUIDHelper;
import java.util.List;

10
app/src/main/java/com/todoroo/astrid/data/TaskAttachment.java → app/src/main/java/org/tasks/data/TaskAttachment.java
Unescape Escape View File

@ -1,19 +1,13 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.data;
package org.tasks.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey;
import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Table;
import com.todoroo.astrid.data.RemoteModel;
@Entity(tableName = "task_attachments")
public final class TaskAttachment {

8
app/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java → app/src/main/java/org/tasks/data/TaskAttachmentDao.java
Unescape Escape View File

@ -1,9 +1,4 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.dao;
package org.tasks.data;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
@ -13,7 +8,6 @@ import android.arch.persistence.room.Query;
import android.arch.persistence.room.Update;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TaskAttachment;
import com.todoroo.astrid.helper.UUIDHelper;
import java.util.List;

2
app/src/main/java/org/tasks/data/TaskListDataProvider.java
Unescape Escape View File

@ -3,7 +3,6 @@ package org.tasks.data;
import android.database.sqlite.SQLiteException;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Table;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Field;
@ -13,7 +12,6 @@ import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.core.SortHelper;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskAttachment;
import org.tasks.preferences.Preferences;

8
app/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java → app/src/main/java/org/tasks/data/TaskListMetadata.java
Unescape Escape View File

@ -1,9 +1,4 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.data;
package org.tasks.data;
import android.arch.persistence.room.ColumnInfo;
@ -15,6 +10,7 @@ import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Property.LongProperty;
import com.todoroo.andlib.data.Property.StringProperty;
import com.todoroo.andlib.data.Table;
import com.todoroo.astrid.data.RemoteModel;
/**
* Data Model which represents a user.

8
app/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java → app/src/main/java/org/tasks/data/TaskListMetadataDao.java
Unescape Escape View File

@ -1,9 +1,4 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.dao;
package org.tasks.data;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert;
@ -12,7 +7,6 @@ import android.arch.persistence.room.Query;
import android.arch.persistence.room.Update;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TaskListMetadata;
import com.todoroo.astrid.helper.UUIDHelper;
@Dao

4
app/src/main/java/com/todoroo/astrid/data/UserActivity.java → app/src/main/java/org/tasks/data/UserActivity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.todoroo.astrid.data;
package org.tasks.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
@ -8,6 +8,8 @@ import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import com.todoroo.astrid.data.RemoteModel;
import org.json.JSONException;
import org.json.JSONObject;
import org.tasks.backup.XmlReader;

3
app/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java → app/src/main/java/org/tasks/data/UserActivityDao.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.todoroo.astrid.dao;
package org.tasks.data;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert;
@ -6,7 +6,6 @@ import android.arch.persistence.room.Query;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.UserActivity;
import com.todoroo.astrid.helper.UUIDHelper;
import java.util.List;

2
app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
Unescape Escape View File

@ -12,7 +12,7 @@ import com.todoroo.astrid.api.MultipleSelectCriterion;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.api.TextInputCriterion;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gtasks.GtasksList;
import com.todoroo.astrid.gtasks.GtasksListService;

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

@ -23,9 +23,8 @@ import android.widget.LinearLayout;
import com.google.common.base.Strings;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.UserActivity;
import org.tasks.data.UserActivity;
import org.json.JSONException;
import org.json.JSONObject;

10
app/src/main/java/org/tasks/injection/ApplicationModule.java
Unescape Escape View File

@ -4,11 +4,11 @@ import android.arch.persistence.room.Room;
import android.content.Context;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.StoreObjectDao;
import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.dao.TaskAttachmentDao;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import com.todoroo.astrid.dao.UserActivityDao;
import org.tasks.data.StoreObjectDao;
import org.tasks.data.TagDataDao;
import org.tasks.data.TaskAttachmentDao;
import org.tasks.data.TaskListMetadataDao;
import org.tasks.data.UserActivityDao;
import com.todoroo.astrid.provider.Astrid2TaskProvider;
import org.tasks.ErrorReportingSingleThreadExecutor;

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

@ -13,7 +13,7 @@ import com.todoroo.astrid.activity.BeastModePreferences;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.core.SortHelper;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskAttachment;
import org.tasks.data.TaskAttachment;
import org.tasks.R;
import org.tasks.injection.ForApplication;

2
app/src/main/java/org/tasks/tasklist/TagFormatter.java
Unescape Escape View File

@ -11,7 +11,7 @@ import android.util.TypedValue;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.collect.Ordering;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import com.todoroo.astrid.tags.TagService;
import org.tasks.R;

2
app/src/main/java/org/tasks/tasklist/TagListFragment.java
Unescape Escape View File

@ -10,7 +10,7 @@ import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.data.TagData;
import org.tasks.data.TagData;
import org.tasks.R;
import org.tasks.activities.TagSettingsActivity;

Write Preview
Loading…
Cancel
Save