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

Use android-job to sync caldav tasks

Browse Source
pull/699/head
Alex Baker 8 years ago
parent 37f5243f46
commit a20479d952
49 changed files with 1499 additions and 641 deletions
Show Stats Download Patch File Download Diff File

827
app/schemas/com.todoroo.astrid.dao.Database/57.json
Unescape Escape View File

@ -0,0 +1,827 @@
{
"formatVersion": 1,
"database": {
"version": 57,
"identityHash": "3893260552baa9a57c4785a5734fcdef",
"entities": [
{
"tableName": "notification",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `type` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "uid",
"columnName": "uid",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "taskId",
"columnName": "task",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"uid"
],
"autoGenerate": true
},
"indices": [
{
"name": "index_notification_task",
"unique": true,
"columnNames": [
"task"
],
"createSql": "CREATE UNIQUE INDEX `index_notification_task` ON `${TABLE_NAME}` (`task`)"
}
],
"foreignKeys": []
},
{
"tableName": "tagdata",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `remoteId` TEXT, `name` TEXT, `color` INTEGER, `tagOrdering` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "remoteId",
"columnName": "remoteId",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "color",
"columnName": "color",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "tagOrdering",
"columnName": "tagOrdering",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "userActivity",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `remoteId` TEXT, `message` TEXT, `picture` TEXT, `target_id` TEXT, `created_at` INTEGER)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "remoteId",
"columnName": "remoteId",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "message",
"columnName": "message",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "picture",
"columnName": "picture",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "targetId",
"columnName": "target_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "created",
"columnName": "created_at",
"affinity": "INTEGER",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "task_attachments",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `remoteId` TEXT, `task_id` TEXT, `name` TEXT, `path` TEXT, `content_type` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "remoteId",
"columnName": "remoteId",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "taskId",
"columnName": "task_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "path",
"columnName": "path",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "contentType",
"columnName": "content_type",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "task_list_metadata",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `remoteId` TEXT, `tag_uuid` TEXT, `filter` TEXT, `task_ids` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "remoteId",
"columnName": "remoteId",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "tagUuid",
"columnName": "tag_uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "filter",
"columnName": "filter",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "taskIds",
"columnName": "task_ids",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "tasks",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `importance` INTEGER, `dueDate` INTEGER, `hideUntil` INTEGER, `created` INTEGER, `modified` INTEGER, `completed` INTEGER, `deleted` INTEGER, `notes` TEXT, `estimatedSeconds` INTEGER, `elapsedSeconds` INTEGER, `timerStart` INTEGER, `notificationFlags` INTEGER, `notifications` INTEGER, `lastNotified` INTEGER, `snoozeTime` INTEGER, `recurrence` TEXT, `repeatUntil` INTEGER, `calendarUri` TEXT, `remoteId` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "importance",
"columnName": "importance",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "dueDate",
"columnName": "dueDate",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "hideUntil",
"columnName": "hideUntil",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "created",
"columnName": "created",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "modified",
"columnName": "modified",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "completed",
"columnName": "completed",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "deleted",
"columnName": "deleted",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "notes",
"columnName": "notes",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "estimatedSeconds",
"columnName": "estimatedSeconds",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "elapsedSeconds",
"columnName": "elapsedSeconds",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "timerStart",
"columnName": "timerStart",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "notificationFlags",
"columnName": "notificationFlags",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "notifications",
"columnName": "notifications",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "lastNotified",
"columnName": "lastNotified",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "snoozeTime",
"columnName": "snoozeTime",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "recurrence",
"columnName": "recurrence",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "repeatUntil",
"columnName": "repeatUntil",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "calendarUri",
"columnName": "calendarUri",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "remoteId",
"columnName": "remoteId",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [
{
"name": "t_rid",
"unique": true,
"columnNames": [
"remoteId"
],
"createSql": "CREATE UNIQUE INDEX `t_rid` ON `${TABLE_NAME}` (`remoteId`)"
}
],
"foreignKeys": []
},
{
"tableName": "alarms",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task` INTEGER NOT NULL, `time` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "task",
"columnName": "task",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "time",
"columnName": "time",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "locations",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task` INTEGER NOT NULL, `name` TEXT, `latitude` REAL NOT NULL, `longitude` REAL NOT NULL, `radius` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "task",
"columnName": "task",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "latitude",
"columnName": "latitude",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "longitude",
"columnName": "longitude",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "radius",
"columnName": "radius",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "tags",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task` INTEGER NOT NULL, `name` TEXT, `tag_uid` TEXT, `task_uid` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "task",
"columnName": "task",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "tagUid",
"columnName": "tag_uid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "taskUid",
"columnName": "task_uid",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "google_tasks",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task` INTEGER NOT NULL, `remote_id` TEXT, `list_id` TEXT, `parent` INTEGER NOT NULL, `indent` INTEGER NOT NULL, `order` INTEGER NOT NULL, `remote_order` INTEGER NOT NULL, `last_sync` INTEGER NOT NULL, `deleted` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "task",
"columnName": "task",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "remoteId",
"columnName": "remote_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "listId",
"columnName": "list_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "parent",
"columnName": "parent",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "indent",
"columnName": "indent",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "order",
"columnName": "order",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "remoteOrder",
"columnName": "remote_order",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "lastSync",
"columnName": "last_sync",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "deleted",
"columnName": "deleted",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "filters",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT, `sql` TEXT, `values` TEXT, `criterion` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "sql",
"columnName": "sql",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "values",
"columnName": "values",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "criterion",
"columnName": "criterion",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "google_task_lists",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remote_id` TEXT, `title` TEXT, `remote_order` INTEGER NOT NULL, `last_sync` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `color` INTEGER)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "remoteId",
"columnName": "remote_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "remoteOrder",
"columnName": "remote_order",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "lastSync",
"columnName": "last_sync",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "deleted",
"columnName": "deleted",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "color",
"columnName": "color",
"affinity": "INTEGER",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "caldav_account",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uuid` TEXT, `name` TEXT, `color` INTEGER NOT NULL, `ctag` TEXT, `url` TEXT, `username` TEXT, `password` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "color",
"columnName": "color",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "ctag",
"columnName": "ctag",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "url",
"columnName": "url",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "username",
"columnName": "username",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "password",
"columnName": "password",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "caldav_tasks",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task` INTEGER NOT NULL, `account` TEXT, `object` TEXT, `remote_id` TEXT, `etag` TEXT, `last_sync` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `vtodo` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "task",
"columnName": "task",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "account",
"columnName": "account",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "object",
"columnName": "object",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "remoteId",
"columnName": "remote_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "etag",
"columnName": "etag",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "lastSync",
"columnName": "last_sync",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "deleted",
"columnName": "deleted",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "vtodo",
"columnName": "vtodo",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
}
],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"3893260552baa9a57c4785a5734fcdef\")"
]
}
}

1
app/src/amazon/java/org/tasks/FlavorSetup.java
Unescape Escape View File

@ -1,7 +1,6 @@
package org.tasks; package org.tasks;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.caldav.CaldavAccountManager;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
public class FlavorSetup { public class FlavorSetup {

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

@ -2,6 +2,7 @@ package org.tasks.injection;
import android.arch.persistence.room.Room; import android.arch.persistence.room.Room;
import android.content.Context; import android.content.Context;
import com.evernote.android.job.JobManager;
import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import dagger.Module; import dagger.Module;
@ -116,4 +117,10 @@ public class TestModule {
public PermissionChecker getPermissionChecker() { public PermissionChecker getPermissionChecker() {
return new PermissivePermissionChecker(context); return new PermissivePermissionChecker(context);
} }
@ApplicationScope
@Provides
public JobManager getJobManager() {
return JobManager.create(context);
}
} }

1
app/src/generic/java/org/tasks/FlavorSetup.java
Unescape Escape View File

@ -1,7 +1,6 @@
package org.tasks; package org.tasks;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.caldav.CaldavAccountManager;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
public class FlavorSetup { public class FlavorSetup {

8
app/src/googleplay/AndroidManifest.xml
Unescape Escape View File

@ -20,6 +20,14 @@
<!-- google task sync --> <!-- google task sync -->
<!-- **************** --> <!-- **************** -->
<uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" /> <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_SYNC_STATS"/>
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<application tools:ignore="GoogleAppIndexingWarning"> <application tools:ignore="GoogleAppIndexingWarning">

10
app/src/googleplay/java/org/tasks/FlavorSetup.java
Unescape Escape View File

@ -3,9 +3,9 @@ package org.tasks;
import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.gtasks.GtasksPreferenceService;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.billing.InventoryHelper; import org.tasks.billing.InventoryHelper;
import org.tasks.caldav.CaldavAccountManager;
import org.tasks.gtasks.GoogleAccountManager; import org.tasks.gtasks.GoogleAccountManager;
import org.tasks.gtasks.PlayServices; import org.tasks.gtasks.PlayServices;
import org.tasks.jobs.JobManager;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
public class FlavorSetup { public class FlavorSetup {
@ -15,19 +15,19 @@ public class FlavorSetup {
private final Preferences preferences; private final Preferences preferences;
private final PlayServices playServices; private final PlayServices playServices;
private final GoogleAccountManager googleAccountManager; private final GoogleAccountManager googleAccountManager;
private final CaldavAccountManager caldavAccountManager; private final JobManager jobManager;
@Inject @Inject
public FlavorSetup(GtasksPreferenceService gtasksPreferenceService, public FlavorSetup(GtasksPreferenceService gtasksPreferenceService,
InventoryHelper inventoryHelper, InventoryHelper inventoryHelper,
Preferences preferences, PlayServices playServices, Preferences preferences, PlayServices playServices,
GoogleAccountManager googleAccountManager, CaldavAccountManager caldavAccountManager) { GoogleAccountManager googleAccountManager, JobManager jobManager) {
this.gtasksPreferenceService = gtasksPreferenceService; this.gtasksPreferenceService = gtasksPreferenceService;
this.inventoryHelper = inventoryHelper; this.inventoryHelper = inventoryHelper;
this.preferences = preferences; this.preferences = preferences;
this.playServices = playServices; this.playServices = playServices;
this.googleAccountManager = googleAccountManager; this.googleAccountManager = googleAccountManager;
this.caldavAccountManager = caldavAccountManager; this.jobManager = jobManager;
} }
public void setup() { public void setup() {
@ -35,7 +35,7 @@ public class FlavorSetup {
gtasksPreferenceService.stopOngoing(); // if sync ongoing flag was set, clear it gtasksPreferenceService.stopOngoing(); // if sync ongoing flag was set, clear it
boolean backgroundSyncEnabled = preferences.getBoolean(R.string.p_background_sync, true); boolean backgroundSyncEnabled = preferences.getBoolean(R.string.p_background_sync, true);
googleAccountManager.setBackgroundSynchronization(backgroundSyncEnabled); googleAccountManager.setBackgroundSynchronization(backgroundSyncEnabled);
caldavAccountManager.setBackgroundSynchronization(backgroundSyncEnabled); jobManager.setBackgroundSynchronization(backgroundSyncEnabled);
playServices.refresh(); playServices.refresh();
} }
} }

33
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -56,15 +56,8 @@
<!-- *************************** --> <!-- *************************** -->
<!-- caldav and google task sync --> <!-- caldav and google task sync -->
<!-- *************************** --> <!-- *************************** -->
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_SYNC_STATS"/>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<!-- ============================================== Exported Permissions = --> <!-- ============================================== Exported Permissions = -->
@ -310,7 +303,7 @@
<activity android:name=".activities.FilterSettingsActivity" /> <activity android:name=".activities.FilterSettingsActivity" />
<activity android:name=".caldav.CalDAVSettingsActivity" /> <activity android:name=".caldav.CaldavSettingsActivity" />
<activity <activity
android:name=".activities.CalendarSelectionActivity" android:name=".activities.CalendarSelectionActivity"
@ -500,30 +493,6 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<service
android:name=".caldav.CalDAVSyncService"
android:exported="true"
android:permission="signature">
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>
<meta-data
android:name="android.content.SyncAdapter"
android:resource="@xml/sync_adapter_caldav" />
</service>
<service
android:name=".caldav.CalDAVAccountAuthenticatorService"
android:exported="false">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator" />
</intent-filter>
<meta-data
android:name="android.accounts.AccountAuthenticator"
android:resource="@xml/account_authenticator" />
</service>
</application> </application>
</manifest> </manifest>

11
app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
Unescape Escape View File

@ -37,7 +37,7 @@ import javax.inject.Inject;
import org.tasks.R; import org.tasks.R;
import org.tasks.activities.GoogleTaskListSettingsActivity; import org.tasks.activities.GoogleTaskListSettingsActivity;
import org.tasks.activities.TagSettingsActivity; import org.tasks.activities.TagSettingsActivity;
import org.tasks.caldav.CalDAVSettingsActivity; import org.tasks.caldav.CaldavSettingsActivity;
import org.tasks.filters.FilterCounter; import org.tasks.filters.FilterCounter;
import org.tasks.filters.FilterProvider; import org.tasks.filters.FilterProvider;
import org.tasks.filters.NavigationDrawerAction; import org.tasks.filters.NavigationDrawerAction;
@ -251,7 +251,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
} }
addSubMenu(title, filterProvider.getGoogleTaskFilters(), true); addSubMenu(title, filterProvider.getGoogleTaskFilters(), true);
addSubMenu(R.string.CalDAV, filterProvider.getCalDAVFilters(), true); addSubMenu(R.string.CalDAV, filterProvider.getCaldavFilters(), true);
notifyDataSetChanged(); notifyDataSetChanged();
} }
@ -298,15 +298,14 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
} }
} }
List<Filter> calDAVFilters = filterProvider.getCalDAVFilters(); if (preferences.getBoolean(R.string.p_sync_caldav, false)) {
if (!calDAVFilters.isEmpty()) { addSubMenu(R.string.CalDAV, filterProvider.getCaldavFilters(), false);
addSubMenu(R.string.CalDAV, calDAVFilters, false);
if (navigationDrawer) { if (navigationDrawer) {
add(new NavigationDrawerAction( add(new NavigationDrawerAction(
activity.getResources().getString(R.string.add_account), activity.getResources().getString(R.string.add_account),
R.drawable.ic_add_24dp, R.drawable.ic_add_24dp,
new Intent(activity, CalDAVSettingsActivity.class), new Intent(activity, CaldavSettingsActivity.class),
NavigationDrawerFragment.REQUEST_NEW_CALDAV_ACCOUNT)); NavigationDrawerFragment.REQUEST_NEW_CALDAV_ACCOUNT));
} }
} }

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

@ -62,7 +62,7 @@ import timber.log.Timber;
CaldavAccount.class, CaldavAccount.class,
CaldavTask.class CaldavTask.class
}, },
version = 56) version = 57)
public abstract class Database extends RoomDatabase { public abstract class Database extends RoomDatabase {
public static final String NAME = "database"; public static final String NAME = "database";

52
app/src/main/java/org/tasks/caldav/Account.java
Unescape Escape View File

@ -1,52 +0,0 @@
package org.tasks.caldav;
import android.accounts.AccountManager;
import android.content.ContentResolver;
import android.os.Bundle;
import java.util.concurrent.TimeUnit;
public class Account {
private static final String AUTHORITY = "org.tasks";
private final AccountManager accountManager;
private final android.accounts.Account account;
public Account(AccountManager accountManager, android.accounts.Account account) {
this.accountManager = accountManager;
this.account = account;
}
public String getUuid() {
return account.name;
}
String getPassword() {
return accountManager.getPassword(account);
}
void setPassword(String password) {
accountManager.setPassword(account, password);
}
public android.accounts.Account getAccount() {
return account;
}
void setSynchronizationEnabled(boolean enabled) {
ContentResolver.setSyncAutomatically(account, AUTHORITY, enabled);
if (enabled) {
ContentResolver
.addPeriodicSync(account, AUTHORITY, Bundle.EMPTY, TimeUnit.HOURS.toSeconds(1));
} else {
ContentResolver.removePeriodicSync(account, AUTHORITY, Bundle.EMPTY);
}
}
@Override
public String toString() {
return "Account{" +
"account=" + account +
'}';
}
}

63
app/src/main/java/org/tasks/caldav/CalDAVAccountAuthenticator.java
Unescape Escape View File

@ -1,63 +0,0 @@
package org.tasks.caldav;
import android.accounts.AbstractAccountAuthenticator;
import android.accounts.Account;
import android.accounts.AccountAuthenticatorResponse;
import android.accounts.AccountManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
class CalDAVAccountAuthenticator extends AbstractAccountAuthenticator {
private final Context context;
public CalDAVAccountAuthenticator(Context context) {
super(context);
this.context = context;
}
@Override
public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
return null;
}
@Override
public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
String authTokenType, String[] requiredFeatures, Bundle options) {
Intent intent = new Intent(context, CalDAVSettingsActivity.class);
intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
Bundle bundle = new Bundle();
bundle.putParcelable(AccountManager.KEY_INTENT, intent);
return bundle;
}
@Override
public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account,
Bundle options) {
return null;
}
@Override
public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
String authTokenType, Bundle options) {
return null;
}
@Override
public String getAuthTokenLabel(String authTokenType) {
return null;
}
@Override
public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account,
String authTokenType, Bundle options) {
return null;
}
@Override
public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account,
String[] features) {
return null;
}
}

25
app/src/main/java/org/tasks/caldav/CalDAVAccountAuthenticatorService.java
Unescape Escape View File

@ -1,25 +0,0 @@
package org.tasks.caldav;
import android.accounts.AccountManager;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import android.support.annotation.Nullable;
public class CalDAVAccountAuthenticatorService extends Service {
private CalDAVAccountAuthenticator authenticator;
@Override
public void onCreate() {
authenticator = new CalDAVAccountAuthenticator(this);
}
@Nullable
@Override
public IBinder onBind(Intent intent) {
return AccountManager.ACTION_AUTHENTICATOR_INTENT.equals(intent.getAction())
? authenticator.getIBinder()
: null;
}
}

4
app/src/main/java/org/tasks/caldav/CalDAVFilterExposer.java
Unescape Escape View File

@ -10,13 +10,13 @@ import org.tasks.data.CaldavAccount;
import org.tasks.data.CaldavDao; import org.tasks.data.CaldavDao;
import org.tasks.sync.SyncAdapters; import org.tasks.sync.SyncAdapters;
public class CalDAVFilterExposer { public class CaldavFilterExposer {
private final SyncAdapters syncAdapters; private final SyncAdapters syncAdapters;
private final CaldavDao caldavDao; private final CaldavDao caldavDao;
@Inject @Inject
public CalDAVFilterExposer(CaldavDao caldavDao, SyncAdapters syncAdapters) { public CaldavFilterExposer(CaldavDao caldavDao, SyncAdapters syncAdapters) {
this.caldavDao = caldavDao; this.caldavDao = caldavDao;
this.syncAdapters = syncAdapters; this.syncAdapters = syncAdapters;
} }

85
app/src/main/java/org/tasks/caldav/CalDAVSettingsActivity.java
Unescape Escape View File

@ -1,7 +1,6 @@
package org.tasks.caldav; package org.tasks.caldav;
import static android.text.TextUtils.isEmpty; import static android.text.TextUtils.isEmpty;
import static org.tasks.caldav.DeleteAccountDialog.newDeleteAccountDialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
@ -17,7 +16,6 @@ import android.text.InputType;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.Toast;
import at.bitfire.dav4android.exception.HttpException; import at.bitfire.dav4android.exception.HttpException;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -48,15 +46,14 @@ import org.tasks.themes.ThemeColor;
import org.tasks.ui.DisplayableException; import org.tasks.ui.DisplayableException;
import timber.log.Timber; import timber.log.Timber;
public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity public class CaldavSettingsActivity extends ThemedInjectingAppCompatActivity
implements Toolbar.OnMenuItemClickListener, DeleteAccountDialog.DeleteAccountDialogCallback { implements Toolbar.OnMenuItemClickListener {
public static final String EXTRA_CALDAV_DATA = "caldavData"; //$NON-NLS-1$ public static final String EXTRA_CALDAV_DATA = "caldavData"; //$NON-NLS-1$
private static final String EXTRA_CALDAV_UUID = "uuid"; //$NON-NLS-1$ private static final String EXTRA_CALDAV_UUID = "uuid"; //$NON-NLS-1$
public static final String ACTION_RELOAD = "accountRenamed"; public static final String ACTION_RELOAD = "accountRenamed";
public static final String ACTION_DELETED = "accountDeleted"; public static final String ACTION_DELETED = "accountDeleted";
private static final String EXTRA_SELECTED_THEME = "extra_selected_theme"; private static final String EXTRA_SELECTED_THEME = "extra_selected_theme";
private static final String FRAG_TAG_DELETE_ACCOUNT = "frag_tag_delete_account";
private static final String PASSWORD_MASK = "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022"; private static final String PASSWORD_MASK = "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
private static final int REQUEST_COLOR_PICKER = 10109; private static final int REQUEST_COLOR_PICKER = 10109;
@Inject DialogBuilder dialogBuilder; @Inject DialogBuilder dialogBuilder;
@ -65,7 +62,6 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
@Inject ThemeColor themeColor; @Inject ThemeColor themeColor;
@Inject Tracker tracker; @Inject Tracker tracker;
@Inject CaldavDao caldavDao; @Inject CaldavDao caldavDao;
@Inject CaldavAccountManager caldavAccountManager;
@Inject SyncAdapters syncAdapters; @Inject SyncAdapters syncAdapters;
@BindView(R.id.root_layout) LinearLayout root; @BindView(R.id.root_layout) LinearLayout root;
@BindView(R.id.url) TextInputEditText url; @BindView(R.id.url) TextInputEditText url;
@ -77,7 +73,6 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
@BindView(R.id.color) TextInputEditText color; @BindView(R.id.color) TextInputEditText color;
@BindView(R.id.toolbar) Toolbar toolbar; @BindView(R.id.toolbar) Toolbar toolbar;
private CaldavAccount caldavAccount; private CaldavAccount caldavAccount;
private Account localAccount;
private int selectedTheme; private int selectedTheme;
@Override @Override
@ -90,8 +85,7 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
caldavAccount = getIntent().getParcelableExtra(EXTRA_CALDAV_DATA); caldavAccount = getIntent().getParcelableExtra(EXTRA_CALDAV_DATA);
if (caldavAccount != null) { if (!isEmpty(caldavAccount.getPassword())) {
localAccount = caldavAccountManager.getAccount(caldavAccount.getUuid());
password.setText(PASSWORD_MASK); password.setText(PASSWORD_MASK);
} }
@ -153,12 +147,11 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
@OnFocusChange(R.id.password) @OnFocusChange(R.id.password)
void onPasswordFocused(boolean hasFocus) { void onPasswordFocused(boolean hasFocus) {
if (hasFocus) { if (hasFocus) {
if (localAccount != null && PASSWORD_MASK.equals(password.getText().toString())) { if (PASSWORD_MASK.equals(password.getText().toString())) {
password.setText(""); password.setText("");
} }
} else { } else {
if (localAccount != null && isEmpty(password.getText()) && !isEmpty( if (isEmpty(password.getText()) && !isEmpty(caldavAccount.getPassword())) {
localAccount.getPassword())) {
password.setText(PASSWORD_MASK); password.setText(PASSWORD_MASK);
} }
} }
@ -181,7 +174,7 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
@OnClick(R.id.color) @OnClick(R.id.color)
protected void showThemePicker() { protected void showThemePicker() {
Intent intent = new Intent(CalDAVSettingsActivity.this, ColorPickerActivity.class); Intent intent = new Intent(CaldavSettingsActivity.this, ColorPickerActivity.class);
intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPickerActivity.ColorPalette.COLORS); intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPickerActivity.ColorPalette.COLORS);
intent.putExtra(ColorPickerActivity.EXTRA_SHOW_NONE, true); intent.putExtra(ColorPickerActivity.EXTRA_SHOW_NONE, true);
startActivityForResult(intent, REQUEST_COLOR_PICKER); startActivityForResult(intent, REQUEST_COLOR_PICKER);
@ -202,8 +195,7 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
private String getNewPassword() { private String getNewPassword() {
String input = password.getText().toString().trim(); String input = password.getText().toString().trim();
return localAccount == null || !PASSWORD_MASK.equals(input) ? input return PASSWORD_MASK.equals(input) ? caldavAccount.getPassword() : input;
: localAccount.getPassword();
} }
private void save() { private void save() {
@ -250,7 +242,7 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
failed = true; failed = true;
} }
if (localAccount == null && isEmpty(password)) { if (isEmpty(password)) {
passwordLayout.setError(getString(R.string.password_required)); passwordLayout.setError(getString(R.string.password_required));
failed = true; failed = true;
} }
@ -285,39 +277,20 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
newAccount.setColor(selectedTheme); newAccount.setColor(selectedTheme);
newAccount.setUrl(getNewURL()); newAccount.setUrl(getNewURL());
newAccount.setUsername(getNewUsername()); newAccount.setUsername(getNewUsername());
if (caldavAccountManager.addAccount(newAccount, getNewPassword())) { newAccount.setPassword(getNewPassword());
Account account = caldavAccountManager.getAccount(newAccount.getUuid()); newAccount.setId(caldavDao.insert(newAccount));
if (account == null) { setResult(RESULT_OK,
showGenericError(); new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(newAccount)));
} else { finish();
account.setSynchronizationEnabled(preferences.getBoolean(R.string.p_background_sync, true));
newAccount.setId(caldavDao.insert(newAccount));
setResult(RESULT_OK,
new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(newAccount)));
finish();
}
} else {
showGenericError();
} }
}
private void updateAccount(String name) { private void updateAccount(String name) {
if (localAccount == null) {
if (caldavAccountManager.addAccount(caldavAccount, getNewPassword())) {
localAccount = caldavAccountManager.getAccount(caldavAccount.getUuid());
} else {
showGenericError();
return;
}
}
caldavAccount.setName(name); caldavAccount.setName(name);
caldavAccount.setUrl(getNewURL()); caldavAccount.setUrl(getNewURL());
caldavAccount.setUsername(getNewUsername()); caldavAccount.setUsername(getNewUsername());
caldavAccount.setColor(selectedTheme); caldavAccount.setColor(selectedTheme);
caldavAccount.setPassword(getNewPassword());
caldavDao.update(caldavAccount); caldavDao.update(caldavAccount);
localAccount.setPassword(getNewPassword());
localAccount
.setSynchronizationEnabled(preferences.getBoolean(R.string.p_background_sync, true));
setResult(RESULT_OK, setResult(RESULT_OK,
new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(caldavAccount))); new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(caldavAccount)));
finish(); finish();
@ -357,15 +330,14 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
!isEmpty(getNewPassword()) || !isEmpty(getNewURL()) || !isEmpty(getNewPassword()) || !isEmpty(getNewURL()) ||
!isEmpty(getNewUsername()); !isEmpty(getNewUsername());
} }
return localAccount == null || return selectedTheme != caldavAccount.getColor() ||
selectedTheme != caldavAccount.getColor() ||
needsValidation(); needsValidation();
} }
private boolean needsValidation() { private boolean needsValidation() {
return !getNewURL().equals(caldavAccount.getUrl()) || return !getNewURL().equals(caldavAccount.getUrl()) ||
!getNewUsername().equals(caldavAccount.getUsername()) || !getNewUsername().equals(caldavAccount.getUsername()) ||
!getNewPassword().equals(localAccount.getPassword()); !getNewPassword().equals(caldavAccount.getPassword());
} }
@Override @Override
@ -401,12 +373,12 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
private void deleteAccount() { private void deleteAccount() {
dialogBuilder.newMessageDialog(R.string.delete_tag_confirmation, caldavAccount.getName()) dialogBuilder.newMessageDialog(R.string.delete_tag_confirmation, caldavAccount.getName())
.setPositiveButton(R.string.delete, (dialog, which) -> { .setPositiveButton(R.string.delete, (dialog, which) -> {
if (localAccount == null) { if (caldavAccount != null) {
onListDeleted(); caldavDao.delete(caldavAccount);
} else { setResult(RESULT_OK,
newDeleteAccountDialog(localAccount.getUuid()) new Intent(ACTION_DELETED).putExtra(EXTRA_CALDAV_UUID, caldavAccount.getUuid()));
.show(getSupportFragmentManager(), FRAG_TAG_DELETE_ACCOUNT);
} }
finish();
}) })
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.show(); .show();
@ -445,19 +417,4 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override
public void onListDeleted() {
if (caldavAccount != null) {
caldavAccountManager.deleteAccount(caldavAccount);
setResult(RESULT_OK,
new Intent(ACTION_DELETED).putExtra(EXTRA_CALDAV_UUID, caldavAccount.getUuid()));
}
finish();
}
@Override
public void deleteAccountFailed() {
Toast.makeText(this, R.string.error_deleting_account, Toast.LENGTH_LONG).show();
}
} }

34
app/src/main/java/org/tasks/caldav/CalDAVSyncService.java
Unescape Escape View File

@ -1,34 +0,0 @@
package org.tasks.caldav;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import timber.log.Timber;
public class CalDAVSyncService extends Service {
private static final Object lock = new Object();
private static CalDAVSyncAdapter syncAdapter = null;
@Override
public void onCreate() {
super.onCreate();
Timber.d("Service created");
synchronized (lock) {
if (syncAdapter == null) {
syncAdapter = new CalDAVSyncAdapter(getApplicationContext(), true);
}
}
}
@Override
public void onDestroy() {
super.onDestroy();
Timber.d("Service destroyed");
}
@Override
public IBinder onBind(Intent intent) {
return syncAdapter.getSyncAdapterBinder();
}
}

140
app/src/main/java/org/tasks/caldav/CaldavAccountManager.java
Unescape Escape View File

@ -1,140 +0,0 @@
package org.tasks.caldav;
import static com.google.common.collect.Iterables.tryFind;
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.content.ContentResolver;
import android.content.Context;
import android.os.Bundle;
import com.google.common.base.Optional;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskDeleter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
import org.tasks.LocalBroadcastManager;
import org.tasks.data.CaldavAccount;
import org.tasks.data.CaldavDao;
import org.tasks.injection.ApplicationScope;
import org.tasks.injection.ForApplication;
import org.tasks.preferences.PermissionChecker;
import timber.log.Timber;
@ApplicationScope
public class CaldavAccountManager {
private static final String AUTHORITY = "org.tasks";
private static final String ACCOUNT_TYPE = "org.tasks.caldav";
private final PermissionChecker permissionChecker;
private final android.accounts.AccountManager accountManager;
private final LocalBroadcastManager localBroadcastManager;
private final TaskDeleter taskDeleter;
private final CaldavDao caldavDao;
private final TaskDao taskDao;
@Inject
public CaldavAccountManager(@ForApplication Context context, PermissionChecker permissionChecker,
CaldavDao caldavDao, TaskDeleter taskDeleter,
LocalBroadcastManager localBroadcastManager, TaskDao taskDao) {
this.permissionChecker = permissionChecker;
this.caldavDao = caldavDao;
this.taskDao = taskDao;
this.taskDeleter = taskDeleter;
this.localBroadcastManager = localBroadcastManager;
accountManager = android.accounts.AccountManager.get(context);
syncAccountList();
}
public Account getAccount(String uuid) {
for (Account account : getAccounts()) {
if (uuid.equals(account.getUuid())) {
return account;
}
}
return null;
}
private List<Account> getAccounts() {
if (!permissionChecker.canAccessAccounts()) {
return Collections.emptyList();
}
List<Account> accounts = new ArrayList<>();
for (android.accounts.Account account : accountManager.getAccountsByType(ACCOUNT_TYPE)) {
accounts.add(new Account(accountManager, account));
}
return accounts;
}
boolean removeAccount(Account account) {
return removeAccount(account.getAccount());
}
boolean removeAccount(android.accounts.Account account) {
try {
return accountManager
.removeAccount(account, null, null)
.getResult();
} catch (OperationCanceledException | IOException | AuthenticatorException e) {
Timber.e(e.getMessage(), e);
}
return false;
}
boolean addAccount(CaldavAccount caldavAccount, String password) {
Timber.d("Adding %s", caldavAccount);
android.accounts.Account account = new android.accounts.Account(caldavAccount.getUuid(),
ACCOUNT_TYPE);
return accountManager.addAccountExplicitly(account, password, null);
}
private void syncAccountList() {
List<CaldavAccount> oldAccountList = caldavDao.getAllOrderedByName();
List<Account> newAccountList = getAccounts();
for (CaldavAccount local : oldAccountList) {
Optional<Account> match = tryFind(newAccountList,
remote -> local.getUuid().equals(remote.getUuid()));
if (!match.isPresent()) {
addAccount(local, null);
}
}
}
void deleteAccount(CaldavAccount account) {
String uuid = account.getUuid();
for (Task task : taskDao.getCaldavTasks(uuid)) {
taskDeleter.markDeleted(task);
}
caldavDao.deleteTasksForAccount(uuid);
caldavDao.delete(account);
localBroadcastManager.broadcastRefreshList();
}
public boolean initiateManualSync() {
for (org.tasks.caldav.Account account : getAccounts()) {
Bundle extras = new Bundle();
extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
ContentResolver.requestSync(account.getAccount(), AUTHORITY, extras);
}
return true;
}
public void requestSynchronization() {
for (org.tasks.caldav.Account account : getAccounts()) {
ContentResolver.requestSync(account.getAccount(), AUTHORITY, new Bundle());
}
}
public void setBackgroundSynchronization(boolean enabled) {
for (org.tasks.caldav.Account account : getAccounts()) {
account.setSynchronizationEnabled(enabled);
}
}
}

45
app/src/main/java/org/tasks/caldav/CaldavFilterExposer.java
Unescape Escape View File

@ -0,0 +1,45 @@
package org.tasks.caldav;
import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.api.Filter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
import org.tasks.data.CaldavAccount;
import org.tasks.data.CaldavDao;
import org.tasks.sync.SyncAdapters;
public class CaldavFilterExposer {
private final SyncAdapters syncAdapters;
private final CaldavDao caldavDao;
@Inject
public CaldavFilterExposer(CaldavDao caldavDao, SyncAdapters syncAdapters) {
this.caldavDao = caldavDao;
this.syncAdapters = syncAdapters;
}
public List<Filter> getFilters() {
if (!syncAdapters.isCaldavSyncEnabled()) {
return Collections.emptyList();
}
List<CaldavAccount> allOrderedByName = caldavDao.getAllOrderedByName();
List<Filter> result = new ArrayList<>();
for (CaldavAccount account : allOrderedByName) {
result.add(new CaldavFilter(account));
}
return result;
}
public Filter getFilterByUuid(String uuid) {
if (syncAdapters.isCaldavSyncEnabled()) {
CaldavAccount caldavAccount = caldavDao.getByUuid(uuid);
if (caldavAccount != null) {
return new CaldavFilter(caldavAccount);
}
}
return null;
}
}

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

@ -1,7 +1,7 @@
package org.tasks.caldav; package org.tasks.caldav;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
import static org.tasks.caldav.CalDAVSettingsActivity.EXTRA_CALDAV_DATA; import static org.tasks.caldav.CaldavSettingsActivity.EXTRA_CALDAV_DATA;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@ -47,7 +47,7 @@ public class CaldavListFragment extends TaskListFragment {
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.menu_caldav_list_fragment: case R.id.menu_caldav_list_fragment:
Intent intent = new Intent(getActivity(), CalDAVSettingsActivity.class); Intent intent = new Intent(getActivity(), CaldavSettingsActivity.class);
intent.putExtra(EXTRA_CALDAV_DATA, account); intent.putExtra(EXTRA_CALDAV_DATA, account);
startActivityForResult(intent, REQUEST_ACCOUNT_SETTINGS); startActivityForResult(intent, REQUEST_ACCOUNT_SETTINGS);
return true; return true;
@ -62,9 +62,9 @@ public class CaldavListFragment extends TaskListFragment {
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
TaskListActivity activity = (TaskListActivity) getActivity(); TaskListActivity activity = (TaskListActivity) getActivity();
String action = data.getAction(); String action = data.getAction();
if (CalDAVSettingsActivity.ACTION_DELETED.equals(action)) { if (CaldavSettingsActivity.ACTION_DELETED.equals(action)) {
activity.onFilterItemClicked(null); activity.onFilterItemClicked(null);
} else if (CalDAVSettingsActivity.ACTION_RELOAD.equals(action)) { } else if (CaldavSettingsActivity.ACTION_RELOAD.equals(action)) {
activity.getIntent().putExtra(TaskListActivity.OPEN_FILTER, activity.getIntent().putExtra(TaskListActivity.OPEN_FILTER,
(Filter) data.getParcelableExtra(TaskListActivity.OPEN_FILTER)); (Filter) data.getParcelableExtra(TaskListActivity.OPEN_FILTER));
activity.recreate(); activity.recreate();

420
app/src/main/java/org/tasks/caldav/CaldavSettingsActivity.java
Unescape Escape View File

@ -0,0 +1,420 @@
package org.tasks.caldav;
import static android.text.TextUtils.isEmpty;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.design.widget.TextInputEditText;
import android.support.design.widget.TextInputLayout;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.Toolbar;
import android.text.InputType;
import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout;
import at.bitfire.dav4android.exception.HttpException;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnFocusChange;
import butterknife.OnTextChanged;
import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.helper.UUIDHelper;
import java.net.ConnectException;
import java.net.IDN;
import java.net.URI;
import java.net.URISyntaxException;
import javax.inject.Inject;
import org.tasks.R;
import org.tasks.activities.ColorPickerActivity;
import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking;
import org.tasks.data.CaldavAccount;
import org.tasks.data.CaldavDao;
import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.ActivityComponent;
import org.tasks.injection.ThemedInjectingAppCompatActivity;
import org.tasks.preferences.Preferences;
import org.tasks.sync.SyncAdapters;
import org.tasks.themes.ThemeCache;
import org.tasks.themes.ThemeColor;
import org.tasks.ui.DisplayableException;
import timber.log.Timber;
public class CaldavSettingsActivity extends ThemedInjectingAppCompatActivity
implements Toolbar.OnMenuItemClickListener {
public static final String EXTRA_CALDAV_DATA = "caldavData"; //$NON-NLS-1$
private static final String EXTRA_CALDAV_UUID = "uuid"; //$NON-NLS-1$
public static final String ACTION_RELOAD = "accountRenamed";
public static final String ACTION_DELETED = "accountDeleted";
private static final String EXTRA_SELECTED_THEME = "extra_selected_theme";
private static final String PASSWORD_MASK = "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
private static final int REQUEST_COLOR_PICKER = 10109;
@Inject DialogBuilder dialogBuilder;
@Inject Preferences preferences;
@Inject ThemeCache themeCache;
@Inject ThemeColor themeColor;
@Inject Tracker tracker;
@Inject CaldavDao caldavDao;
@Inject SyncAdapters syncAdapters;
@BindView(R.id.root_layout) LinearLayout root;
@BindView(R.id.url) TextInputEditText url;
@BindView(R.id.user) TextInputEditText user;
@BindView(R.id.password) TextInputEditText password;
@BindView(R.id.url_layout) TextInputLayout urlLayout;
@BindView(R.id.user_layout) TextInputLayout userLayout;
@BindView(R.id.password_layout) TextInputLayout passwordLayout;
@BindView(R.id.color) TextInputEditText color;
@BindView(R.id.toolbar) Toolbar toolbar;
private CaldavAccount caldavAccount;
private int selectedTheme;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_caldav_settings);
ButterKnife.bind(this);
caldavAccount = getIntent().getParcelableExtra(EXTRA_CALDAV_DATA);
if (!isEmpty(caldavAccount.getPassword())) {
password.setText(PASSWORD_MASK);
}
if (savedInstanceState == null) {
if (caldavAccount == null) {
selectedTheme = -1;
} else {
selectedTheme = caldavAccount.getColor();
url.setText(caldavAccount.getUrl());
user.setText(caldavAccount.getUsername());
}
} else {
selectedTheme = savedInstanceState.getInt(EXTRA_SELECTED_THEME);
}
final boolean backButtonSavesTask = preferences.backButtonSavesTask();
toolbar.setTitle(
caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName());
toolbar.setNavigationIcon(ContextCompat.getDrawable(this,
backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp));
toolbar.setNavigationOnClickListener(v -> {
if (backButtonSavesTask) {
discard();
} else {
save();
}
});
toolbar.inflateMenu(R.menu.menu_tag_settings);
toolbar.setOnMenuItemClickListener(this);
toolbar.showOverflowMenu();
color.setInputType(InputType.TYPE_NULL);
if (caldavAccount == null) {
toolbar.getMenu().findItem(R.id.delete).setVisible(false);
url.requestFocus();
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(url, InputMethodManager.SHOW_IMPLICIT);
}
updateTheme();
}
@OnTextChanged(R.id.url)
void onUrlChanged(CharSequence text) {
urlLayout.setError(null);
}
@OnTextChanged(R.id.user)
void onUserChanged(CharSequence text) {
userLayout.setError(null);
}
@OnTextChanged(R.id.password)
void onPasswordChanged(CharSequence text) {
passwordLayout.setError(null);
}
@OnFocusChange(R.id.password)
void onPasswordFocused(boolean hasFocus) {
if (hasFocus) {
if (PASSWORD_MASK.equals(password.getText().toString())) {
password.setText("");
}
} else {
if (isEmpty(password.getText()) && !isEmpty(caldavAccount.getPassword())) {
password.setText(PASSWORD_MASK);
}
}
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putInt(EXTRA_SELECTED_THEME, selectedTheme);
}
@OnFocusChange(R.id.color)
void onFocusChange(boolean focused) {
if (focused) {
color.clearFocus();
showThemePicker();
}
}
@OnClick(R.id.color)
protected void showThemePicker() {
Intent intent = new Intent(CaldavSettingsActivity.this, ColorPickerActivity.class);
intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPickerActivity.ColorPalette.COLORS);
intent.putExtra(ColorPickerActivity.EXTRA_SHOW_NONE, true);
startActivityForResult(intent, REQUEST_COLOR_PICKER);
}
@Override
public void inject(ActivityComponent component) {
component.inject(this);
}
private String getNewURL() {
return url.getText().toString().trim();
}
private String getNewUsername() {
return user.getText().toString().trim();
}
private String getNewPassword() {
String input = password.getText().toString().trim();
return PASSWORD_MASK.equals(input) ? caldavAccount.getPassword() : input;
}
private void save() {
String username = getNewUsername();
String url = getNewURL();
String password = getNewPassword();
boolean failed = false;
if (isEmpty(url)) {
urlLayout.setError(getString(R.string.url_required));
failed = true;
} else {
Uri baseURL = Uri.parse(url);
String scheme = baseURL.getScheme();
if ("https".equalsIgnoreCase(scheme) || "http".equalsIgnoreCase(scheme)) {
String host = baseURL.getHost();
if (isEmpty(host)) {
urlLayout.setError(getString(R.string.url_host_name_required));
failed = true;
} else {
try {
host = IDN.toASCII(host);
} catch (Exception e) {
Timber.e(e.getMessage(), e);
}
String path = baseURL.getEncodedPath();
int port = baseURL.getPort();
try {
new URI(scheme, null, host, port, path, null, null);
} catch (URISyntaxException e) {
urlLayout.setError(e.getLocalizedMessage());
failed = true;
}
}
} else {
urlLayout.setError(getString(R.string.url_invalid_scheme));
failed = true;
}
}
if (isEmpty(username)) {
userLayout.setError(getString(R.string.username_required));
failed = true;
}
if (isEmpty(password)) {
passwordLayout.setError(getString(R.string.password_required));
failed = true;
}
if (failed) {
return;
}
if (caldavAccount == null) {
CaldavClient client = new CaldavClient(url, username, password);
ProgressDialog dialog = dialogBuilder.newProgressDialog(R.string.contacting_server);
dialog.show();
client.getDisplayName()
.doAfterTerminate(dialog::dismiss)
.subscribe(this::addAccount, this::getDisplayNameFailed);
} else if (needsValidation()) {
CaldavClient client = new CaldavClient(url, username, password);
ProgressDialog dialog = dialogBuilder.newProgressDialog(R.string.contacting_server);
dialog.show();
client.getDisplayName()
.doAfterTerminate(dialog::dismiss)
.subscribe(this::updateAccount, this::getDisplayNameFailed);
} else if (hasChanges()) {
updateAccount(caldavAccount.getName());
} else {
finish();
}
}
private void addAccount(String name) {
CaldavAccount newAccount = new CaldavAccount(name, UUIDHelper.newUUID());
newAccount.setColor(selectedTheme);
newAccount.setUrl(getNewURL());
newAccount.setUsername(getNewUsername());
newAccount.setPassword(getNewPassword());
newAccount.setId(caldavDao.insert(newAccount));
setResult(RESULT_OK,
new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(newAccount)));
finish();
}
private void updateAccount(String name) {
caldavAccount.setName(name);
caldavAccount.setUrl(getNewURL());
caldavAccount.setUsername(getNewUsername());
caldavAccount.setColor(selectedTheme);
caldavAccount.setPassword(getNewPassword());
caldavDao.update(caldavAccount);
setResult(RESULT_OK,
new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(caldavAccount)));
finish();
}
private void getDisplayNameFailed(Throwable t) {
if (t instanceof HttpException) {
showSnackbar(t.getMessage());
} else if (t instanceof DisplayableException) {
showSnackbar(((DisplayableException) t).getResId());
} else if (t instanceof ConnectException) {
showSnackbar(R.string.network_error);
} else {
showGenericError();
}
}
private void showGenericError() {
showSnackbar(R.string.error_adding_account);
}
private void showSnackbar(int resId) {
showSnackbar(getString(resId));
}
private void showSnackbar(String message) {
Snackbar snackbar = Snackbar.make(root, message, 8000)
.setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_text_color));
snackbar.getView()
.setBackgroundColor(ContextCompat.getColor(this, R.color.snackbar_background));
snackbar.show();
}
private boolean hasChanges() {
if (caldavAccount == null) {
return selectedTheme >= 0 ||
!isEmpty(getNewPassword()) || !isEmpty(getNewURL()) ||
!isEmpty(getNewUsername());
}
return selectedTheme != caldavAccount.getColor() ||
needsValidation();
}
private boolean needsValidation() {
return !getNewURL().equals(caldavAccount.getUrl()) ||
!getNewUsername().equals(caldavAccount.getUsername()) ||
!getNewPassword().equals(caldavAccount.getPassword());
}
@Override
public void finish() {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(url.getWindowToken(), 0);
super.finish();
}
@Override
public void onBackPressed() {
if (preferences.backButtonSavesTask()) {
save();
} else {
discard();
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_COLOR_PICKER) {
if (resultCode == RESULT_OK) {
int index = data.getIntExtra(ColorPickerActivity.EXTRA_THEME_INDEX, 0);
tracker.reportEvent(Tracking.Events.SET_TAG_COLOR, Integer.toString(index));
selectedTheme = index;
updateTheme();
}
} else {
super.onActivityResult(requestCode, resultCode, data);
}
}
private void deleteAccount() {
dialogBuilder.newMessageDialog(R.string.delete_tag_confirmation, caldavAccount.getName())
.setPositiveButton(R.string.delete, (dialog, which) -> {
if (caldavAccount != null) {
caldavDao.delete(caldavAccount);
setResult(RESULT_OK,
new Intent(ACTION_DELETED).putExtra(EXTRA_CALDAV_UUID, caldavAccount.getUuid()));
}
finish();
})
.setNegativeButton(android.R.string.cancel, null)
.show();
}
private void discard() {
if (!hasChanges()) {
finish();
} else {
dialogBuilder.newMessageDialog(R.string.discard_changes)
.setPositiveButton(R.string.discard, (dialog, which) -> finish())
.setNegativeButton(android.R.string.cancel, null)
.show();
}
}
private void updateTheme() {
ThemeColor themeColor;
if (selectedTheme < 0) {
themeColor = this.themeColor;
color.setText(R.string.none);
} else {
themeColor = themeCache.getThemeColor(selectedTheme);
color.setText(themeColor.getName());
}
themeColor.apply(toolbar);
themeColor.applyToStatusBar(this);
}
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.delete:
deleteAccount();
break;
}
return super.onOptionsItemSelected(item);
}
}

73
app/src/main/java/org/tasks/caldav/CalDAVSyncAdapter.java → app/src/main/java/org/tasks/caldav/CaldavSynchronizer.java
Unescape Escape View File

@ -9,11 +9,7 @@ import static com.google.common.collect.Sets.difference;
import static com.google.common.collect.Sets.newHashSet; import static com.google.common.collect.Sets.newHashSet;
import static org.tasks.time.DateTimeUtils.currentTimeMillis; import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.accounts.Account;
import android.content.ContentProviderClient;
import android.content.Context; import android.content.Context;
import android.content.SyncResult;
import android.os.Bundle;
import at.bitfire.dav4android.BasicDigestAuthHandler; import at.bitfire.dav4android.BasicDigestAuthHandler;
import at.bitfire.dav4android.DavCalendar; import at.bitfire.dav4android.DavCalendar;
import at.bitfire.dav4android.DavResource; import at.bitfire.dav4android.DavResource;
@ -55,52 +51,55 @@ import org.tasks.LocalBroadcastManager;
import org.tasks.data.CaldavAccount; import org.tasks.data.CaldavAccount;
import org.tasks.data.CaldavDao; import org.tasks.data.CaldavDao;
import org.tasks.data.CaldavTask; import org.tasks.data.CaldavTask;
import org.tasks.injection.InjectingAbstractThreadedSyncAdapter; import org.tasks.injection.ForApplication;
import org.tasks.injection.SyncAdapterComponent;
import timber.log.Timber; import timber.log.Timber;
public class CalDAVSyncAdapter extends InjectingAbstractThreadedSyncAdapter { public class CaldavSynchronizer {
static { static {
iCalendar.Companion iCalendar.Companion
.setProdId(new ProdId("+//IDN tasks.org//android-" + BuildConfig.VERSION_CODE + "//EN")); .setProdId(new ProdId("+//IDN tasks.org//android-" + BuildConfig.VERSION_CODE + "//EN"));
} }
@Inject CaldavDao caldavDao; private final CaldavDao caldavDao;
@Inject CaldavAccountManager caldavAccountManager; private final TaskDao taskDao;
@Inject TaskDao taskDao; private final LocalBroadcastManager localBroadcastManager;
@Inject LocalBroadcastManager localBroadcastManager; private final TaskCreator taskCreator;
@Inject TaskCreator taskCreator; private final TaskDeleter taskDeleter;
@Inject TaskDeleter taskDeleter; private final Context context;
@Inject
public CaldavSynchronizer(@ForApplication Context context, CaldavDao caldavDao, TaskDao taskDao,
LocalBroadcastManager localBroadcastManager, TaskCreator taskCreator,
TaskDeleter taskDeleter) {
this.context = context;
this.caldavDao = caldavDao;
this.taskDao = taskDao;
this.localBroadcastManager = localBroadcastManager;
this.taskCreator = taskCreator;
this.taskDeleter = taskDeleter;
}
CalDAVSyncAdapter(Context context, boolean autoInitialize) { public boolean sync() {
super(context, autoInitialize); Thread.currentThread().setContextClassLoader(context.getClassLoader());
boolean success = true;
for (CaldavAccount account : caldavDao.getAccounts()) {
success &= sync(account);
}
return success;
} }
@Override private boolean sync(CaldavAccount caldavAccount) {
public void onPerformSync(Account account, Bundle extras, String authority,
ContentProviderClient provider, SyncResult syncResult) {
// required for dav4android (ServiceLoader) // required for dav4android (ServiceLoader)
Thread.currentThread().setContextClassLoader(getContext().getClassLoader());
String uuid = account.name; String uuid = caldavAccount.getUuid();
CaldavAccount caldavAccount = caldavDao.getAccount(uuid);
if (caldavAccount == null) {
Timber.e("Unknown account %s", uuid);
caldavAccountManager.removeAccount(account);
return;
}
Timber.d("onPerformSync: %s [%s]", caldavAccount.getName(), uuid); Timber.d("onPerformSync: %s [%s]", caldavAccount.getName(), uuid);
org.tasks.caldav.Account localAccount = caldavAccountManager if (isNullOrEmpty(caldavAccount.getPassword())) {
.getAccount(caldavAccount.getUuid());
if (isNullOrEmpty(localAccount.getPassword())) {
Timber.e("Missing password for %s", caldavAccount.getName()); Timber.e("Missing password for %s", caldavAccount.getName());
syncResult.stats.numAuthExceptions++; return false;
return;
} }
syncResult.stats.numAuthExceptions = 0;
BasicDigestAuthHandler basicDigestAuthHandler = new BasicDigestAuthHandler(null, BasicDigestAuthHandler basicDigestAuthHandler = new BasicDigestAuthHandler(null,
caldavAccount.getUsername(), localAccount.getPassword()); caldavAccount.getUsername(), caldavAccount.getPassword());
OkHttpClient httpClient = new OkHttpClient().newBuilder() OkHttpClient httpClient = new OkHttpClient().newBuilder()
.addNetworkInterceptor(basicDigestAuthHandler) .addNetworkInterceptor(basicDigestAuthHandler)
.authenticator(basicDigestAuthHandler) .authenticator(basicDigestAuthHandler)
@ -131,7 +130,7 @@ public class CalDAVSyncAdapter extends InjectingAbstractThreadedSyncAdapter {
if (localCtag != null && localCtag.equals(remoteCtag)) { if (localCtag != null && localCtag.equals(remoteCtag)) {
Timber.d("%s up to date", caldavAccount.getName()); Timber.d("%s up to date", caldavAccount.getName());
return; return true;
} }
davCalendar.calendarQuery("VTODO", null, null); davCalendar.calendarQuery("VTODO", null, null);
@ -214,6 +213,7 @@ public class CalDAVSyncAdapter extends InjectingAbstractThreadedSyncAdapter {
} }
localBroadcastManager.broadcastRefresh(); localBroadcastManager.broadcastRefresh();
return true;
} }
private void pushLocalChanges(CaldavAccount caldavAccount, OkHttpClient httpClient, private void pushLocalChanges(CaldavAccount caldavAccount, OkHttpClient httpClient,
@ -350,9 +350,4 @@ public class CalDAVSyncAdapter extends InjectingAbstractThreadedSyncAdapter {
Timber.e("Received VCALENDAR with %s VTODOs; ignoring %s", tasks.size(), fileName); Timber.e("Received VCALENDAR with %s VTODOs; ignoring %s", tasks.size(), fileName);
} }
} }
@Override
protected void inject(SyncAdapterComponent component) {
component.inject(this);
}
} }

90
app/src/main/java/org/tasks/caldav/DeleteAccountDialog.java
Unescape Escape View File

@ -1,90 +0,0 @@
package org.tasks.caldav;
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import javax.inject.Inject;
import org.tasks.R;
import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.DialogFragmentComponent;
import org.tasks.injection.InjectingDialogFragment;
public class DeleteAccountDialog extends InjectingDialogFragment {
private static final String EXTRA_UUID = "extra_uuid";
@Inject DialogBuilder dialogBuilder;
@Inject CaldavAccountManager caldavAccountManager;
private DeleteAccountDialogCallback callback;
private String uuid;
private ProgressDialog dialog;
public static DeleteAccountDialog newDeleteAccountDialog(String uuid) {
DeleteAccountDialog dialog = new DeleteAccountDialog();
Bundle args = new Bundle();
args.putString(EXTRA_UUID, uuid);
dialog.setArguments(args);
return dialog;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setRetainInstance(true);
Bundle arguments = getArguments();
uuid = arguments.getString(EXTRA_UUID);
dialog = dialogBuilder.newProgressDialog(R.string.deleting_list);
execute();
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return dialog;
}
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
callback = (DeleteAccountDialogCallback) activity;
}
@Override
protected void inject(DialogFragmentComponent component) {
component.inject(this);
}
private void execute() {
new AsyncTask<Void, Void, Boolean>() {
@Override
protected Boolean doInBackground(Void... voids) {
Account account = caldavAccountManager.getAccount(uuid);
return account == null || caldavAccountManager.removeAccount(account);
}
@Override
protected void onPostExecute(Boolean result) {
if (dialog.isShowing()) {
dialog.dismiss();
}
if (result) {
callback.onListDeleted();
} else {
callback.deleteAccountFailed();
}
}
}.execute();
}
public interface DeleteAccountDialogCallback {
void onListDeleted();
void deleteAccountFailed();
}
}

21
app/src/main/java/org/tasks/data/CaldavAccount.java
Unescape Escape View File

@ -9,6 +9,7 @@ import android.arch.persistence.room.Ignore;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils;
@Entity(tableName = "caldav_account") @Entity(tableName = "caldav_account")
public final class CaldavAccount implements Parcelable { public final class CaldavAccount implements Parcelable {
@ -24,6 +25,7 @@ public final class CaldavAccount implements Parcelable {
return new CaldavAccount[size]; return new CaldavAccount[size];
} }
}; };
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)
@ColumnInfo(name = "_id") @ColumnInfo(name = "_id")
private long id; private long id;
@ -39,6 +41,8 @@ public final class CaldavAccount implements Parcelable {
private String url = ""; private String url = "";
@ColumnInfo(name = "username") @ColumnInfo(name = "username")
private String username = ""; private String username = "";
@ColumnInfo(name = "password")
private transient String password = "";
public CaldavAccount() { public CaldavAccount() {
@ -59,6 +63,7 @@ public final class CaldavAccount implements Parcelable {
ctag = source.readString(); ctag = source.readString();
url = source.readString(); url = source.readString();
username = source.readString(); username = source.readString();
password = source.readString();
} }
public long getId() { public long getId() {
@ -117,6 +122,14 @@ public final class CaldavAccount implements Parcelable {
this.username = username; this.username = username;
} }
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
@Override @Override
public int describeContents() { public int describeContents() {
return 0; return 0;
@ -131,6 +144,7 @@ public final class CaldavAccount implements Parcelable {
dest.writeString(ctag); dest.writeString(ctag);
dest.writeString(url); dest.writeString(url);
dest.writeString(username); dest.writeString(username);
dest.writeString(password);
} }
@Override @Override
@ -143,6 +157,7 @@ public final class CaldavAccount implements Parcelable {
", ctag='" + ctag + '\'' + ", ctag='" + ctag + '\'' +
", url='" + url + '\'' + ", url='" + url + '\'' +
", username='" + username + '\'' + ", username='" + username + '\'' +
", password='" + (TextUtils.isEmpty(password) ? "null" : "******") + '\'' +
'}'; '}';
} }
@ -175,7 +190,10 @@ public final class CaldavAccount implements Parcelable {
if (url != null ? !url.equals(that.url) : that.url != null) { if (url != null ? !url.equals(that.url) : that.url != null) {
return false; return false;
} }
return username != null ? username.equals(that.username) : that.username == null; if (username != null ? !username.equals(that.username) : that.username != null) {
return false;
}
return password != null ? password.equals(that.password) : that.password == null;
} }
@Override @Override
@ -187,6 +205,7 @@ public final class CaldavAccount implements Parcelable {
result = 31 * result + (ctag != null ? ctag.hashCode() : 0); result = 31 * result + (ctag != null ? ctag.hashCode() : 0);
result = 31 * result + (url != null ? url.hashCode() : 0); result = 31 * result + (url != null ? url.hashCode() : 0);
result = 31 * result + (username != null ? username.hashCode() : 0); result = 31 * result + (username != null ? username.hashCode() : 0);
result = 31 * result + (password != null ? password.hashCode() : 0);
return result; return result;
} }
} }

11
app/src/main/java/org/tasks/db/Migrations.java
Unescape Escape View File

@ -185,6 +185,14 @@ public class Migrations {
database.execSQL("ALTER TABLE `caldav_tasks` ADD COLUMN `vtodo` TEXT"); database.execSQL("ALTER TABLE `caldav_tasks` ADD COLUMN `vtodo` TEXT");
} }
}; };
private static final Migration MIGRATION_56_57 = new Migration(56, 57) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase database) {
database.execSQL("ALTER TABLE `caldav_account` ADD COLUMN `password` TEXT");
}
};
public static final Migration[] MIGRATIONS = new Migration[]{ public static final Migration[] MIGRATIONS = new Migration[]{
MIGRATION_35_36, MIGRATION_35_36,
MIGRATION_36_37, MIGRATION_36_37,
@ -200,7 +208,8 @@ public class Migrations {
MIGRATION_52_53, MIGRATION_52_53,
MIGRATION_53_54, MIGRATION_53_54,
MIGRATION_54_55, MIGRATION_54_55,
MIGRATION_55_56 MIGRATION_55_56,
MIGRATION_56_57
}; };
private static Migration NOOP(int from, int to) { private static Migration NOOP(int from, int to) {

12
app/src/main/java/org/tasks/filters/FilterProvider.java
Unescape Escape View File

@ -9,7 +9,7 @@ import com.todoroo.astrid.timers.TimerFilterExposer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.caldav.CalDAVFilterExposer; import org.tasks.caldav.CaldavFilterExposer;
public class FilterProvider { public class FilterProvider {
@ -18,19 +18,19 @@ public class FilterProvider {
private final CustomFilterExposer customFilterExposer; private final CustomFilterExposer customFilterExposer;
private final TagFilterExposer tagFilterExposer; private final TagFilterExposer tagFilterExposer;
private final GtasksFilterExposer gtasksFilterExposer; private final GtasksFilterExposer gtasksFilterExposer;
private final CalDAVFilterExposer calDAVFilterExposer; private final CaldavFilterExposer caldavFilterExposer;
@Inject @Inject
public FilterProvider(BuiltInFilterExposer builtInFilterExposer, public FilterProvider(BuiltInFilterExposer builtInFilterExposer,
TimerFilterExposer timerFilterExposer, TimerFilterExposer timerFilterExposer,
CustomFilterExposer customFilterExposer, TagFilterExposer tagFilterExposer, CustomFilterExposer customFilterExposer, TagFilterExposer tagFilterExposer,
GtasksFilterExposer gtasksFilterExposer, CalDAVFilterExposer calDAVFilterExposer) { GtasksFilterExposer gtasksFilterExposer, CaldavFilterExposer caldavFilterExposer) {
this.builtInFilterExposer = builtInFilterExposer; this.builtInFilterExposer = builtInFilterExposer;
this.timerFilterExposer = timerFilterExposer; this.timerFilterExposer = timerFilterExposer;
this.customFilterExposer = customFilterExposer; this.customFilterExposer = customFilterExposer;
this.tagFilterExposer = tagFilterExposer; this.tagFilterExposer = tagFilterExposer;
this.gtasksFilterExposer = gtasksFilterExposer; this.gtasksFilterExposer = gtasksFilterExposer;
this.calDAVFilterExposer = calDAVFilterExposer; this.caldavFilterExposer = caldavFilterExposer;
} }
public Filter getMyTasksFilter() { public Filter getMyTasksFilter() {
@ -53,7 +53,7 @@ public class FilterProvider {
return gtasksFilterExposer.getFilters(); return gtasksFilterExposer.getFilters();
} }
public List<Filter> getCalDAVFilters() { public List<Filter> getCaldavFilters() {
return calDAVFilterExposer.getFilters(); return caldavFilterExposer.getFilters();
} }
} }

4
app/src/main/java/org/tasks/injection/ActivityComponent.java
Unescape Escape View File

@ -22,7 +22,7 @@ import org.tasks.activities.FilterSettingsActivity;
import org.tasks.activities.GoogleTaskListSettingsActivity; import org.tasks.activities.GoogleTaskListSettingsActivity;
import org.tasks.activities.TagSettingsActivity; import org.tasks.activities.TagSettingsActivity;
import org.tasks.activities.TimePickerActivity; import org.tasks.activities.TimePickerActivity;
import org.tasks.caldav.CalDAVSettingsActivity; import org.tasks.caldav.CaldavSettingsActivity;
import org.tasks.dashclock.DashClockSettings; import org.tasks.dashclock.DashClockSettings;
import org.tasks.files.FileExplore; import org.tasks.files.FileExplore;
import org.tasks.files.MyFilePickerActivity; import org.tasks.files.MyFilePickerActivity;
@ -129,7 +129,7 @@ public interface ActivityComponent {
void inject(GoogleTaskListSettingsActivity googleTaskListSettingsActivity); void inject(GoogleTaskListSettingsActivity googleTaskListSettingsActivity);
void inject(CalDAVSettingsActivity calDAVSettingsActivity); void inject(CaldavSettingsActivity caldavSettingsActivity);
void inject(TaskerCreateTaskActivity taskerCreateTaskActivity); void inject(TaskerCreateTaskActivity taskerCreateTaskActivity);

3
app/src/main/java/org/tasks/injection/DialogFragmentComponent.java
Unescape Escape View File

@ -3,7 +3,6 @@ package org.tasks.injection;
import dagger.Subcomponent; import dagger.Subcomponent;
import org.tasks.activities.CalendarSelectionDialog; import org.tasks.activities.CalendarSelectionDialog;
import org.tasks.activities.RemoteListSupportPicker; import org.tasks.activities.RemoteListSupportPicker;
import org.tasks.caldav.DeleteAccountDialog;
import org.tasks.dialogs.AddAttachmentDialog; import org.tasks.dialogs.AddAttachmentDialog;
import org.tasks.dialogs.ColorPickerDialog; import org.tasks.dialogs.ColorPickerDialog;
import org.tasks.dialogs.RecordAudioDialog; import org.tasks.dialogs.RecordAudioDialog;
@ -44,6 +43,4 @@ public interface DialogFragmentComponent {
void inject(RenameListDialog renameListDialog); void inject(RenameListDialog renameListDialog);
void inject(CustomRecurrenceDialog customRecurrenceDialog); void inject(CustomRecurrenceDialog customRecurrenceDialog);
void inject(DeleteAccountDialog deleteAccountDialog);
} }

3
app/src/main/java/org/tasks/injection/SyncAdapterComponent.java
Unescape Escape View File

@ -1,13 +1,10 @@
package org.tasks.injection; package org.tasks.injection;
import dagger.Subcomponent; import dagger.Subcomponent;
import org.tasks.caldav.CalDAVSyncAdapter;
import org.tasks.gtasks.GoogleTaskSyncAdapter; import org.tasks.gtasks.GoogleTaskSyncAdapter;
@Subcomponent(modules = SyncAdapterModule.class) @Subcomponent(modules = SyncAdapterModule.class)
public interface SyncAdapterComponent { public interface SyncAdapterComponent {
void inject(GoogleTaskSyncAdapter googleTaskSyncAdapter); void inject(GoogleTaskSyncAdapter googleTaskSyncAdapter);
void inject(CalDAVSyncAdapter calDAVSyncAdapter);
} }

20
app/src/main/java/org/tasks/jobs/CaldavSyncJob.java
Unescape Escape View File

@ -0,0 +1,20 @@
package org.tasks.jobs;
import android.support.annotation.NonNull;
import com.evernote.android.job.Job;
import org.tasks.caldav.CaldavSynchronizer;
public class CaldavSyncJob extends Job{
private final CaldavSynchronizer caldavSynchronizer;
CaldavSyncJob(CaldavSynchronizer caldavSynchronizer) {
this.caldavSynchronizer = caldavSynchronizer;
}
@NonNull
@Override
protected Result onRunJob(@NonNull Params params) {
return caldavSynchronizer.sync() ? Result.SUCCESS : Result.FAILURE;
}
}

9
app/src/main/java/org/tasks/jobs/JobCreator.java
Unescape Escape View File

@ -8,6 +8,7 @@ import javax.inject.Inject;
import org.tasks.LocalBroadcastManager; import org.tasks.LocalBroadcastManager;
import org.tasks.Notifier; import org.tasks.Notifier;
import org.tasks.backup.TasksJsonExporter; import org.tasks.backup.TasksJsonExporter;
import org.tasks.caldav.CaldavSynchronizer;
import org.tasks.injection.ApplicationScope; import org.tasks.injection.ApplicationScope;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
@ -23,16 +24,19 @@ public class JobCreator implements com.evernote.android.job.JobCreator {
private final TasksJsonExporter tasksJsonExporter; private final TasksJsonExporter tasksJsonExporter;
private final RefreshScheduler refreshScheduler; private final RefreshScheduler refreshScheduler;
private final LocalBroadcastManager localBroadcastManager; private final LocalBroadcastManager localBroadcastManager;
private final CaldavSynchronizer caldavSynchronizer;
static final String TAG_BACKUP = "tag_backup"; static final String TAG_BACKUP = "tag_backup";
static final String TAG_REFRESH = "tag_refresh"; static final String TAG_REFRESH = "tag_refresh";
static final String TAG_MIDNIGHT_REFRESH = "tag_midnight_refresh"; static final String TAG_MIDNIGHT_REFRESH = "tag_midnight_refresh";
static final String TAG_NOTIFICATION = "tag_notification"; static final String TAG_NOTIFICATION = "tag_notification";
static final String TAG_CALDAV_SYNC = "tag_caldav_sync";
@Inject @Inject
public JobCreator(@ForApplication Context context, Preferences preferences, Notifier notifier, public JobCreator(@ForApplication Context context, Preferences preferences, Notifier notifier,
NotificationQueue notificationQueue, TasksJsonExporter tasksJsonExporter, NotificationQueue notificationQueue, TasksJsonExporter tasksJsonExporter,
RefreshScheduler refreshScheduler, LocalBroadcastManager localBroadcastManager) { RefreshScheduler refreshScheduler, LocalBroadcastManager localBroadcastManager,
CaldavSynchronizer caldavSynchronizer) {
this.context = context; this.context = context;
this.preferences = preferences; this.preferences = preferences;
this.notifier = notifier; this.notifier = notifier;
@ -40,6 +44,7 @@ public class JobCreator implements com.evernote.android.job.JobCreator {
this.tasksJsonExporter = tasksJsonExporter; this.tasksJsonExporter = tasksJsonExporter;
this.refreshScheduler = refreshScheduler; this.refreshScheduler = refreshScheduler;
this.localBroadcastManager = localBroadcastManager; this.localBroadcastManager = localBroadcastManager;
this.caldavSynchronizer = caldavSynchronizer;
} }
@Nullable @Nullable
@ -48,6 +53,8 @@ public class JobCreator implements com.evernote.android.job.JobCreator {
switch (tag) { switch (tag) {
case TAG_NOTIFICATION: case TAG_NOTIFICATION:
return new NotificationJob(preferences, notifier, notificationQueue); return new NotificationJob(preferences, notifier, notificationQueue);
case TAG_CALDAV_SYNC:
return new CaldavSyncJob(caldavSynchronizer);
case TAG_BACKUP: case TAG_BACKUP:
return new BackupJob(context, tasksJsonExporter, preferences); return new BackupJob(context, tasksJsonExporter, preferences);
case TAG_MIDNIGHT_REFRESH: case TAG_MIDNIGHT_REFRESH:

30
app/src/main/java/org/tasks/jobs/JobManager.java
Unescape Escape View File

@ -6,6 +6,7 @@ import static org.tasks.time.DateTimeUtils.printTimestamp;
import com.evernote.android.job.DailyJob; import com.evernote.android.job.DailyJob;
import com.evernote.android.job.JobRequest; import com.evernote.android.job.JobRequest;
import com.evernote.android.job.JobRequest.Builder; import com.evernote.android.job.JobRequest.Builder;
import com.evernote.android.job.JobRequest.NetworkType;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.injection.ApplicationScope; import org.tasks.injection.ApplicationScope;
@ -33,6 +34,7 @@ public class JobManager {
Timber.d("schedule notification: %s", printTimestamp(time)); Timber.d("schedule notification: %s", printTimestamp(time));
new JobRequest.Builder(JobCreator.TAG_NOTIFICATION) new JobRequest.Builder(JobCreator.TAG_NOTIFICATION)
.setExact(calculateDelay(time)) .setExact(calculateDelay(time))
.setUpdateCurrent(true)
.build() .build()
.schedule(); .schedule();
} }
@ -41,6 +43,7 @@ public class JobManager {
Timber.d("schedule refresh: %s", printTimestamp(time)); Timber.d("schedule refresh: %s", printTimestamp(time));
new JobRequest.Builder(JobCreator.TAG_REFRESH) new JobRequest.Builder(JobCreator.TAG_REFRESH)
.setExact(calculateDelay(time)) .setExact(calculateDelay(time))
.setUpdateCurrent(true)
.build() .build()
.schedule(); .schedule();
} }
@ -50,7 +53,32 @@ public class JobManager {
} }
public void scheduleBackup() { public void scheduleBackup() {
DailyJob.schedule(new Builder(JobCreator.TAG_BACKUP), 0, TimeUnit.HOURS.toMillis(24) - 1); DailyJob.schedule(new Builder(JobCreator.TAG_BACKUP), 0,
TimeUnit.HOURS.toMillis(24) - 1);
}
public void setBackgroundSynchronization(boolean enabled) {
if (enabled) {
new JobRequest.Builder(JobCreator.TAG_CALDAV_SYNC)
.setRequiredNetworkType(NetworkType.CONNECTED)
.setRequirementsEnforced(true)
.setPeriodic(TimeUnit.HOURS.toMillis(1))
.setUpdateCurrent(true)
.build()
.schedule();
} else {
jobManager.cancelAllForTag(JobCreator.TAG_CALDAV_SYNC);
}
}
public boolean syncCaldavNow() {
new JobRequest.Builder(JobCreator.TAG_CALDAV_SYNC)
.setRequiredNetworkType(NetworkType.CONNECTED)
.setRequirementsEnforced(true)
.setExecutionWindow(1, 5000)
.build()
.schedule();
return true;
} }
public void cancelNotifications() { public void cancelNotifications() {

10
app/src/main/java/org/tasks/preferences/DefaultFilterProvider.java
Unescape Escape View File

@ -25,7 +25,7 @@ import javax.inject.Inject;
import org.tasks.R; import org.tasks.R;
import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking; import org.tasks.analytics.Tracking;
import org.tasks.caldav.CalDAVFilterExposer; import org.tasks.caldav.CaldavFilterExposer;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
import timber.log.Timber; import timber.log.Timber;
@ -48,20 +48,20 @@ public class DefaultFilterProvider {
private final CustomFilterExposer customFilterExposer; private final CustomFilterExposer customFilterExposer;
private final TagFilterExposer tagFilterExposer; private final TagFilterExposer tagFilterExposer;
private final GtasksFilterExposer gtasksFilterExposer; private final GtasksFilterExposer gtasksFilterExposer;
private final CalDAVFilterExposer calDAVFilterExposer; private final CaldavFilterExposer caldavFilterExposer;
@Inject @Inject
public DefaultFilterProvider(@ForApplication Context context, Preferences preferences, public DefaultFilterProvider(@ForApplication Context context, Preferences preferences,
Tracker tracker, CustomFilterExposer customFilterExposer, Tracker tracker, CustomFilterExposer customFilterExposer,
TagFilterExposer tagFilterExposer, GtasksFilterExposer gtasksFilterExposer, TagFilterExposer tagFilterExposer, GtasksFilterExposer gtasksFilterExposer,
CalDAVFilterExposer calDAVFilterExposer) { CaldavFilterExposer caldavFilterExposer) {
this.context = context; this.context = context;
this.preferences = preferences; this.preferences = preferences;
this.tracker = tracker; this.tracker = tracker;
this.customFilterExposer = customFilterExposer; this.customFilterExposer = customFilterExposer;
this.tagFilterExposer = tagFilterExposer; this.tagFilterExposer = tagFilterExposer;
this.gtasksFilterExposer = gtasksFilterExposer; this.gtasksFilterExposer = gtasksFilterExposer;
this.calDAVFilterExposer = calDAVFilterExposer; this.caldavFilterExposer = caldavFilterExposer;
} }
public Filter getDashclockFilter() { public Filter getDashclockFilter() {
@ -134,7 +134,7 @@ public class DefaultFilterProvider {
case TYPE_GOOGLE_TASKS: case TYPE_GOOGLE_TASKS:
return gtasksFilterExposer.getFilter(Long.parseLong(split[1])); return gtasksFilterExposer.getFilter(Long.parseLong(split[1]));
case TYPE_CALDAV: case TYPE_CALDAV:
return calDAVFilterExposer.getFilterByUuid(split[1]); return caldavFilterExposer.getFilterByUuid(split[1]);
default: default:
return null; return null;
} }

9
app/src/main/java/org/tasks/preferences/PermissionRequestor.java
Unescape Escape View File

@ -12,7 +12,6 @@ public abstract class PermissionRequestor {
public static final int REQUEST_GOOGLE_ACCOUNTS = 53; public static final int REQUEST_GOOGLE_ACCOUNTS = 53;
public static final int REQUEST_LOCATION = 54; public static final int REQUEST_LOCATION = 54;
public static final int REQUEST_CONTACTS = 55; public static final int REQUEST_CONTACTS = 55;
public static final int REQUEST_CALDAV_ACCOUNTS = 56;
private final PermissionChecker permissionChecker; private final PermissionChecker permissionChecker;
@ -58,14 +57,6 @@ public abstract class PermissionRequestor {
return false; return false;
} }
public boolean requestCaldavPermissions() {
if (permissionChecker.canAccessAccounts()) {
return true;
}
requestPermission(Manifest.permission.GET_ACCOUNTS, REQUEST_CALDAV_ACCOUNTS);
return false;
}
public boolean requestFineLocation() { public boolean requestFineLocation() {
if (permissionChecker.canAccessLocation()) { if (permissionChecker.canAccessLocation()) {
return true; return true;

10
app/src/main/java/org/tasks/receivers/CalDAVPushReceiver.java
Unescape Escape View File

@ -3,17 +3,17 @@ package org.tasks.receivers;
import com.todoroo.astrid.data.SyncFlags; import com.todoroo.astrid.data.SyncFlags;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.caldav.CaldavAccountManager; import org.tasks.jobs.JobManager;
import org.tasks.sync.SyncAdapters; import org.tasks.sync.SyncAdapters;
public class CalDAVPushReceiver { public class CalDAVPushReceiver {
private final CaldavAccountManager caldavAccountManager; private final JobManager jobManager;
private final SyncAdapters syncAdapters; private final SyncAdapters syncAdapters;
@Inject @Inject
public CalDAVPushReceiver(CaldavAccountManager caldavAccountManager, SyncAdapters syncAdapters) { public CalDAVPushReceiver(JobManager jobManager, SyncAdapters syncAdapters) {
this.caldavAccountManager = caldavAccountManager; this.jobManager = jobManager;
this.syncAdapters = syncAdapters; this.syncAdapters = syncAdapters;
} }
@ -26,6 +26,6 @@ public class CalDAVPushReceiver {
return; return;
} }
caldavAccountManager.requestSynchronization(); jobManager.syncCaldavNow();
} }
} }

18
app/src/main/java/org/tasks/sync/SyncAdapters.java
Unescape Escape View File

@ -4,34 +4,31 @@ import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.R; import org.tasks.R;
import org.tasks.caldav.CaldavAccountManager;
import org.tasks.gtasks.GtaskSyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.preferences.PermissionChecker; import org.tasks.jobs.JobManager;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
public class SyncAdapters { public class SyncAdapters {
private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper; private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
private final Preferences preferences; private final Preferences preferences;
private final CaldavAccountManager caldavAccountManager; private final JobManager jobManager;
private final PermissionChecker permissionChecker;
@Inject @Inject
public SyncAdapters(GtaskSyncAdapterHelper gtaskSyncAdapterHelper, Preferences preferences, public SyncAdapters(GtaskSyncAdapterHelper gtaskSyncAdapterHelper, Preferences preferences,
CaldavAccountManager caldavAccountManager, PermissionChecker permissionChecker) { JobManager jobManager) {
this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper;
this.preferences = preferences; this.preferences = preferences;
this.caldavAccountManager = caldavAccountManager; this.jobManager = jobManager;
this.permissionChecker = permissionChecker;
} }
public void requestSynchronization() { public void requestSynchronization() {
gtaskSyncAdapterHelper.requestSynchronization(); gtaskSyncAdapterHelper.requestSynchronization();
caldavAccountManager.requestSynchronization(); jobManager.syncCaldavNow();
} }
public boolean initiateManualSync() { public boolean initiateManualSync() {
return gtaskSyncAdapterHelper.initiateManualSync() | caldavAccountManager.initiateManualSync(); return gtaskSyncAdapterHelper.initiateManualSync() | jobManager.syncCaldavNow();
} }
public boolean isMasterSyncEnabled() { public boolean isMasterSyncEnabled() {
@ -47,8 +44,7 @@ public class SyncAdapters {
} }
public boolean isCaldavSyncEnabled() { public boolean isCaldavSyncEnabled() {
return preferences.getBoolean(R.string.p_sync_caldav, false) && permissionChecker return preferences.getBoolean(R.string.p_sync_caldav, false);
.canAccessAccounts();
} }
public void checkPlayServices(Activity activity) { public void checkPlayServices(Activity activity) {

13
app/src/main/java/org/tasks/sync/SynchronizationPreferences.java
Unescape Escape View File

@ -19,7 +19,6 @@ import javax.inject.Inject;
import org.tasks.R; import org.tasks.R;
import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking; import org.tasks.analytics.Tracking;
import org.tasks.caldav.CaldavAccountManager;
import org.tasks.data.GoogleTaskDao; import org.tasks.data.GoogleTaskDao;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
import org.tasks.gtasks.GoogleAccountManager; import org.tasks.gtasks.GoogleAccountManager;
@ -27,6 +26,7 @@ import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.gtasks.PlayServices; import org.tasks.gtasks.PlayServices;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingPreferenceActivity; import org.tasks.injection.InjectingPreferenceActivity;
import org.tasks.jobs.JobManager;
import org.tasks.preferences.ActivityPermissionRequestor; import org.tasks.preferences.ActivityPermissionRequestor;
import org.tasks.preferences.PermissionChecker; import org.tasks.preferences.PermissionChecker;
import org.tasks.preferences.PermissionRequestor; import org.tasks.preferences.PermissionRequestor;
@ -46,8 +46,8 @@ public class SynchronizationPreferences extends InjectingPreferenceActivity {
@Inject SyncAdapters syncAdapters; @Inject SyncAdapters syncAdapters;
@Inject GoogleTaskDao googleTaskDao; @Inject GoogleTaskDao googleTaskDao;
@Inject GoogleAccountManager googleAccountManager; @Inject GoogleAccountManager googleAccountManager;
@Inject CaldavAccountManager caldavAccountManager;
@Inject Preferences preferences; @Inject Preferences preferences;
@Inject JobManager jobManager;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -59,8 +59,8 @@ public class SynchronizationPreferences extends InjectingPreferenceActivity {
getString(R.string.p_sync_caldav)); getString(R.string.p_sync_caldav));
caldavEnabled.setChecked(syncAdapters.isCaldavSyncEnabled()); caldavEnabled.setChecked(syncAdapters.isCaldavSyncEnabled());
caldavEnabled.setOnPreferenceChangeListener((preference, newValue) -> { caldavEnabled.setOnPreferenceChangeListener((preference, newValue) -> {
boolean enabled = ((boolean) newValue) && permissionRequestor.requestCaldavPermissions(); boolean enabled = ((boolean) newValue);
caldavAccountManager.setBackgroundSynchronization( jobManager.setBackgroundSynchronization(
enabled && preferences.getBoolean(R.string.p_background_sync, true)); enabled && preferences.getBoolean(R.string.p_background_sync, true));
return enabled; return enabled;
}); });
@ -90,7 +90,7 @@ public class SynchronizationPreferences extends InjectingPreferenceActivity {
findPreference(getString(R.string.p_background_sync)) findPreference(getString(R.string.p_background_sync))
.setOnPreferenceChangeListener((preference, o) -> { .setOnPreferenceChangeListener((preference, o) -> {
boolean backgroundSyncEnabled = (Boolean) o; boolean backgroundSyncEnabled = (Boolean) o;
caldavAccountManager.setBackgroundSynchronization(backgroundSyncEnabled); jobManager.setBackgroundSynchronization(backgroundSyncEnabled);
googleAccountManager.setBackgroundSynchronization(backgroundSyncEnabled); googleAccountManager.setBackgroundSynchronization(backgroundSyncEnabled);
return true; return true;
}); });
@ -155,9 +155,6 @@ public class SynchronizationPreferences extends InjectingPreferenceActivity {
if (verifyPermissions(grantResults)) { if (verifyPermissions(grantResults)) {
requestLogin(); requestLogin();
} }
} else if (requestCode == PermissionRequestor.REQUEST_CALDAV_ACCOUNTS) {
((CheckBoxPreference) findPreference(getString(R.string.p_sync_caldav)))
.setChecked(verifyPermissions(grantResults));
} else { } else {
super.onRequestPermissionsResult(requestCode, permissions, grantResults); super.onRequestPermissionsResult(requestCode, permissions, grantResults);
} }

1
app/src/main/res/values-es/strings.xml
Unescape Escape View File

@ -452,7 +452,6 @@
<string name="user">Usuario</string> <string name="user">Usuario</string>
<string name="password">Contraseña</string> <string name="password">Contraseña</string>
<string name="error_adding_account">Error añadiendo cuenta</string> <string name="error_adding_account">Error añadiendo cuenta</string>
<string name="error_deleting_account">Error borrando cuenta</string>
<string name="account_settings">Configuración de cuenta</string> <string name="account_settings">Configuración de cuenta</string>
<string name="notification_channel_settings">Gestionar notificaciones</string> <string name="notification_channel_settings">Gestionar notificaciones</string>
<string name="battery_optimization_settings">Optimizaciones en gestión de batería</string> <string name="battery_optimization_settings">Optimizaciones en gestión de batería</string>

2
app/src/main/res/values-fr/strings.xml
Unescape Escape View File

@ -439,8 +439,6 @@
<string name="password">Mot de passe</string> <string name="password">Mot de passe</string>
<string name="url">Adresse URL</string> <string name="url">Adresse URL</string>
<string name="error_adding_account">Erreur dans l\'ajout du compte</string> <string name="error_adding_account">Erreur dans l\'ajout du compte</string>
<string name="error_deleting_account">Erreur dans la suppression du compte</string>
<string name="account_settings">Paramètres du compte</string> <string name="account_settings">Paramètres du compte</string>
<string name="notification_channel_settings">Gérer les notifications</string> <string name="notification_channel_settings">Gérer les notifications</string>
<string name="battery_optimization_settings">Gérer les optimisations de la batterie</string> <string name="battery_optimization_settings">Gérer les optimisations de la batterie</string>

1
app/src/main/res/values-hu/strings.xml
Unescape Escape View File

@ -459,7 +459,6 @@
<string name="password">Jelszó</string> <string name="password">Jelszó</string>
<string name="url">Link</string> <string name="url">Link</string>
<string name="error_adding_account">Felhasználói fiók hozzáadása sikertelen</string> <string name="error_adding_account">Felhasználói fiók hozzáadása sikertelen</string>
<string name="error_deleting_account">Felhasználói fiók törlése sikertelen</string>
<string name="account_settings">Felhasználói fiók beállítások</string> <string name="account_settings">Felhasználói fiók beállítások</string>
<string name="notification_channel_settings">Értesítések kezelése</string> <string name="notification_channel_settings">Értesítések kezelése</string>
<string name="battery_optimization_settings">Akkumulátor optimalizálások kezelése</string> <string name="battery_optimization_settings">Akkumulátor optimalizálások kezelése</string>

1
app/src/main/res/values-it/strings.xml
Unescape Escape View File

@ -454,7 +454,6 @@
<string name="add_account">Aggiungi account</string> <string name="add_account">Aggiungi account</string>
<string name="user">Utente</string> <string name="user">Utente</string>
<string name="error_adding_account">Aggiunta account fallita</string> <string name="error_adding_account">Aggiunta account fallita</string>
<string name="error_deleting_account">Cancellazione account fallita</string>
<string name="account_settings">Impostazioni account</string> <string name="account_settings">Impostazioni account</string>
<string name="notification_channel_settings">Gestione notifiche</string> <string name="notification_channel_settings">Gestione notifiche</string>
<string name="battery_optimization_settings">Ottimizza consumo batteria</string> <string name="battery_optimization_settings">Ottimizza consumo batteria</string>

1
app/src/main/res/values-ja/strings.xml
Unescape Escape View File

@ -456,7 +456,6 @@
<string name="user">ユーザー</string> <string name="user">ユーザー</string>
<string name="password">パスワード</string> <string name="password">パスワード</string>
<string name="error_adding_account">アカウントの追加時にエラーが発生しました</string> <string name="error_adding_account">アカウントの追加時にエラーが発生しました</string>
<string name="error_deleting_account">アカウントの削除時にエラーが発生しました</string>
<string name="account_settings">アカウント設定</string> <string name="account_settings">アカウント設定</string>
<string name="notification_channel_settings">通知を管理</string> <string name="notification_channel_settings">通知を管理</string>
<string name="battery_optimization_settings">バッテリー最適化を管理</string> <string name="battery_optimization_settings">バッテリー最適化を管理</string>

1
app/src/main/res/values-lt/strings.xml
Unescape Escape View File

@ -455,7 +455,6 @@
<string name="user">Vartotojas</string> <string name="user">Vartotojas</string>
<string name="password">Slaptažodis</string> <string name="password">Slaptažodis</string>
<string name="error_adding_account">Klaida kuriant paskyrą</string> <string name="error_adding_account">Klaida kuriant paskyrą</string>
<string name="error_deleting_account">Klaida šalinant vartotojo paskyrą</string>
<string name="account_settings">Paskyros nustatymai</string> <string name="account_settings">Paskyros nustatymai</string>
<string name="notification_channel_settings">Valdyti pranešimus</string> <string name="notification_channel_settings">Valdyti pranešimus</string>
<string name="battery_optimization_settings">Valdyti baterijos optimizacijas</string> <string name="battery_optimization_settings">Valdyti baterijos optimizacijas</string>

1
app/src/main/res/values-sk/strings.xml
Unescape Escape View File

@ -455,7 +455,6 @@
<string name="user">Užívateľ</string> <string name="user">Užívateľ</string>
<string name="password">Heslo</string> <string name="password">Heslo</string>
<string name="error_adding_account">Chyba pridania účtu</string> <string name="error_adding_account">Chyba pridania účtu</string>
<string name="error_deleting_account">Chyba vymazania účtu</string>
<string name="account_settings">Nastavenie účtu</string> <string name="account_settings">Nastavenie účtu</string>
<string name="notification_channel_settings">Spravovať upozornenia</string> <string name="notification_channel_settings">Spravovať upozornenia</string>
<string name="battery_optimization_settings">Zníženie spotreby energie</string> <string name="battery_optimization_settings">Zníženie spotreby energie</string>

1
app/src/main/res/values-tr/strings.xml
Unescape Escape View File

@ -461,7 +461,6 @@
<string name="user">Kullanıcı</string> <string name="user">Kullanıcı</string>
<string name="password">Parola</string> <string name="password">Parola</string>
<string name="error_adding_account">Hesap eklenirken hata</string> <string name="error_adding_account">Hesap eklenirken hata</string>
<string name="error_deleting_account">Hesap silinirken hata</string>
<string name="account_settings">Hesap ayarları</string> <string name="account_settings">Hesap ayarları</string>
<string name="notification_channel_settings">Bildirimleri yönet</string> <string name="notification_channel_settings">Bildirimleri yönet</string>
<string name="battery_optimization_settings">Pil optimizasyonlarını yönet</string> <string name="battery_optimization_settings">Pil optimizasyonlarını yönet</string>

1
app/src/main/res/values-zh-rCN/strings.xml
Unescape Escape View File

@ -456,7 +456,6 @@
<string name="password">密码</string> <string name="password">密码</string>
<string name="url">网址</string> <string name="url">网址</string>
<string name="error_adding_account">添加帐号错误</string> <string name="error_adding_account">添加帐号错误</string>
<string name="error_deleting_account">删除帐号错误</string>
<string name="account_settings">帐号设置</string> <string name="account_settings">帐号设置</string>
<string name="notification_channel_settings">管理通知</string> <string name="notification_channel_settings">管理通知</string>
<string name="battery_optimization_settings">电池优化管理</string> <string name="battery_optimization_settings">电池优化管理</string>

1
app/src/main/res/values/keys.xml
Unescape Escape View File

@ -290,7 +290,6 @@
<string name="debug">Debug</string> <string name="debug">Debug</string>
<string name="p_start_of_week">start_of_week</string> <string name="p_start_of_week">start_of_week</string>
<string name="p_use_native_datetime_pickers">use_native_datetime_pickers</string> <string name="p_use_native_datetime_pickers">use_native_datetime_pickers</string>
<string name="account_type_caldav">org.tasks.caldav</string>
<string name="p_background_sync">gtask_background_sync</string> <string name="p_background_sync">gtask_background_sync</string>
<string name="p_bundle_notifications">bundle_notifications</string> <string name="p_bundle_notifications">bundle_notifications</string>
<string name="p_strict_mode">strict_mode</string> <string name="p_strict_mode">strict_mode</string>

1
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -842,7 +842,6 @@ File %1$s contained %2$s.\n\n
<string name="password">Password</string> <string name="password">Password</string>
<string name="url">URL</string> <string name="url">URL</string>
<string name="error_adding_account">Error adding account</string> <string name="error_adding_account">Error adding account</string>
<string name="error_deleting_account">Error deleting account</string>
<string name="account_settings">Account settings</string> <string name="account_settings">Account settings</string>
<string name="notification_channel_settings">Manage notifications</string> <string name="notification_channel_settings">Manage notifications</string>
<string name="battery_optimization_settings">Manage battery optimizations</string> <string name="battery_optimization_settings">Manage battery optimizations</string>

6
app/src/main/res/xml/account_authenticator.xml
Unescape Escape View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="@string/account_type_caldav"
android:icon="@mipmap/ic_launcher"
android:label="@string/CalDAV"
android:smallIcon="@mipmap/ic_launcher" />

7
app/src/main/res/xml/sync_adapter_caldav.xml
Unescape Escape View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="@string/account_type_caldav"
android:contentAuthority="org.tasks"
android:supportsUploading="true"
android:isAlwaysSyncable="true"
android:userVisible="false" />

1
app/src/release/res/xml/google_analytics.xml
Unescape Escape View File

@ -42,4 +42,5 @@
<screenName name="org.tasks.preferences.HelpAndFeedbackActivity">HelpAndFeedbackActivity</screenName> <screenName name="org.tasks.preferences.HelpAndFeedbackActivity">HelpAndFeedbackActivity</screenName>
<screenName name="org.tasks.preferences.MiscellaneousPreferences">MiscellaneousPreferences</screenName> <screenName name="org.tasks.preferences.MiscellaneousPreferences">MiscellaneousPreferences</screenName>
<screenName name="org.tasks.widget.WidgetConfigActivity">WidgetConfigActivity</screenName> <screenName name="org.tasks.widget.WidgetConfigActivity">WidgetConfigActivity</screenName>
<screenName name="org.tasks.caldav.CaldavSettingsActivity">CaldavSettingsActivity</screenName>
</resources> </resources>
Write Preview
Loading…
Cancel
Save