AM: Add support for /e/OS Tasks app (53d3edce) · Commits · e / os / AccountManager

app/build.gradle.kts

+12 −2

Original line number	Diff line number	Diff line
		@@ -231,10 +231,12 @@ dependencies {
		exclude(group="junit")
		exclude(group="org.ogce", module="xpp3") // Android has its own XmlPullParser implementation
		}
		/*
		implementation(libs.bitfire.synctools) {
		exclude(group="androidx.test") // synctools declares test rules, but we don't want them in non-test code
		exclude(group = "junit")
		}
		*/

		// third-party libs
		implementation(libs.conscrypt)
		@@ -259,8 +261,16 @@ dependencies {
		implementation(libs.commons.codec)
		implementation(libs.commons.lang)

		// e-Specific dependencies - (Avoid moving into toml)
		implementation("foundation.e:elib:0.0.1-alpha11")
		// e-Specific dependencies
		implementation(libs.elib)
		implementation(libs.ez.vcard)
		implementation(libs.synctools) {
		exclude(group="androidx.test")
		exclude(group = "junit")
		}
		implementation(libs.ical4j) {
		exclude(group = "commons-logging", module = "commons-logging")
		}

		// for tests
		androidTestImplementation(libs.androidx.arch.core.testing)

+1 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,7 @@
		<package android:name="at.techbee.jtx" />
		<package android:name="org.dmfs.tasks" />
		<package android:name="org.tasks" />
		<package android:name="foundation.e.tasks" />

		<!-- ICSx5 for Webcal feeds -->
		<package android:name="at.bitfire.icsdroid"/>

+2 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,8 @@ class AutoMigration18 @Inject constructor() : AutoMigrationSpec {
		CalendarContract.AUTHORITY -> SyncDataType.EVENTS.name
		TaskProvider.ProviderName.JtxBoard.authority,
		TaskProvider.ProviderName.TasksOrg.authority,
		TaskProvider.ProviderName.OpenTasks.authority -> SyncDataType.TASKS.name
		TaskProvider.ProviderName.OpenTasks.authority,
		TaskProvider.ProviderName.EOpenTasks.authority -> SyncDataType.TASKS.name
		else -> {
		db.execSQL("DELETE FROM syncstats WHERE id = ?", arrayOf(id))
		continue

+2 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,8 @@ class LocalTask: DmfsTask, LocalResource {

		override fun getViewUri(context: Context): Uri? = id?.let { id ->
		when (taskList.providerName) {
		TaskProvider.ProviderName.OpenTasks -> {
		TaskProvider.ProviderName.OpenTasks,
		TaskProvider.ProviderName.EOpenTasks -> {
		val contentUri = Tasks.getContentUri(taskList.providerName.authority)
		ContentUris.withAppendedId(contentUri, id)
		}

+11 −4

Original line number	Diff line number	Diff line
		@@ -37,11 +37,18 @@ class AccountSettingsMigration10 @Inject constructor(
		): AccountSettingsMigration {

		override fun migrate(account: Account) {
		TaskProvider.acquire(context, TaskProvider.ProviderName.OpenTasks)?.use { provider ->
		val providerNames = listOf(
		TaskProvider.ProviderName.OpenTasks,
		TaskProvider.ProviderName.EOpenTasks
		)

		providerNames.forEach { providerName ->
		TaskProvider.acquire(context, providerName)?.use { provider ->
		val tasksUri = provider.tasksUri().asSyncAdapter(account)
		val emptyETag = contentValuesOf(LocalTask.COLUMN_ETAG to null)
		provider.client.update(tasksUri, emptyETag, "${TaskContract.Tasks._DIRTY}=0 AND ${TaskContract.Tasks._DELETED}=0", null)
		}
		}

		if (ContextCompat.checkSelfPermission(context, android.Manifest.permission.WRITE_CALENDAR) == PackageManager.PERMISSION_GRANTED)
		context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)?.use { provider ->