Skip to content

Commit a6a043c

Browse files
committed
Replace ical4android.BatchOperation with generic synctools.BatchOperation
1 parent 75de730 commit a6a043c

File tree

8 files changed

+10
-279
lines changed

8 files changed

+10
-279
lines changed

lib/src/androidTest/kotlin/at/bitfire/ical4android/AttendeeMappingsTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package at.bitfire.ical4android
99
import android.content.ContentValues
1010
import android.net.Uri
1111
import android.provider.CalendarContract.Attendees
12+
import at.bitfire.synctools.BatchOperation
1213
import net.fortuna.ical4j.model.Parameter
1314
import net.fortuna.ical4j.model.parameter.CuType
1415
import net.fortuna.ical4j.model.parameter.Role

lib/src/androidTest/kotlin/at/bitfire/ical4android/impl/TestEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import android.provider.CalendarContract.Events
1111
import at.bitfire.ical4android.AndroidCalendar
1212
import at.bitfire.ical4android.AndroidEvent
1313
import at.bitfire.ical4android.AndroidEventFactory
14-
import at.bitfire.ical4android.BatchOperation
1514
import at.bitfire.ical4android.Event
15+
import at.bitfire.synctools.BatchOperation
1616
import java.util.UUID
1717

1818
class TestEvent: AndroidEvent {

lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import android.provider.CalendarContract.ExtendedProperties
2020
import android.provider.CalendarContract.Reminders
2121
import android.util.Patterns
2222
import androidx.annotation.CallSuper
23-
import at.bitfire.ical4android.BatchOperation.CpoBuilder
2423
import at.bitfire.ical4android.util.AndroidTimeUtils
2524
import at.bitfire.ical4android.util.DateUtils
2625
import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
@@ -34,6 +33,8 @@ import at.bitfire.ical4android.util.TimeApiExtensions.toLocalDate
3433
import at.bitfire.ical4android.util.TimeApiExtensions.toLocalTime
3534
import at.bitfire.ical4android.util.TimeApiExtensions.toRfc5545Duration
3635
import at.bitfire.ical4android.util.TimeApiExtensions.toZonedDateTime
36+
import at.bitfire.synctools.BatchOperation
37+
import at.bitfire.synctools.BatchOperation.CpoBuilder
3738
import at.bitfire.synctools.LocalStorageException
3839
import net.fortuna.ical4j.model.Date
3940
import net.fortuna.ical4j.model.DateList

lib/src/main/kotlin/at/bitfire/ical4android/AttendeeMappings.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package at.bitfire.ical4android
99
import android.content.ContentValues
1010
import android.provider.CalendarContract
1111
import android.provider.CalendarContract.Attendees
12+
import at.bitfire.synctools.BatchOperation
1213
import net.fortuna.ical4j.model.Parameter
1314
import net.fortuna.ical4j.model.parameter.CuType
1415
import net.fortuna.ical4j.model.parameter.Email

lib/src/main/kotlin/at/bitfire/ical4android/BatchOperation.kt

Lines changed: 0 additions & 276 deletions
This file was deleted.

lib/src/main/kotlin/at/bitfire/ical4android/DmfsTask.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import android.content.ContentValues
1111
import android.net.Uri
1212
import android.os.RemoteException
1313
import androidx.annotation.CallSuper
14-
import at.bitfire.ical4android.BatchOperation.CpoBuilder
1514
import at.bitfire.ical4android.util.AndroidTimeUtils
1615
import at.bitfire.ical4android.util.DateUtils
1716
import at.bitfire.ical4android.util.MiscUtils.toValues
17+
import at.bitfire.synctools.BatchOperation
18+
import at.bitfire.synctools.BatchOperation.CpoBuilder
1819
import at.bitfire.synctools.LocalStorageException
1920
import net.fortuna.ical4j.model.Date
2021
import net.fortuna.ical4j.model.DateTime

lib/src/main/kotlin/at/bitfire/ical4android/DmfsTaskList.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import android.content.ContentUris
1212
import android.content.ContentValues
1313
import android.net.Uri
1414
import androidx.annotation.CallSuper
15+
import at.bitfire.ical4android.DmfsTaskList.Companion.find
1516
import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
1617
import at.bitfire.ical4android.util.MiscUtils.toValues
18+
import at.bitfire.synctools.BatchOperation
1719
import at.bitfire.synctools.LocalStorageException
1820
import org.dmfs.tasks.contract.TaskContract
1921
import org.dmfs.tasks.contract.TaskContract.Property.Relation

lib/src/main/kotlin/at/bitfire/ical4android/JtxICalObject.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.net.Uri
1313
import android.os.ParcelFileDescriptor
1414
import android.util.Base64
1515
import at.bitfire.ical4android.util.MiscUtils.toValues
16+
import at.bitfire.synctools.BatchOperation
1617
import at.techbee.jtx.JtxContract
1718
import at.techbee.jtx.JtxContract.JtxICalObject.TZ_ALLDAY
1819
import at.techbee.jtx.JtxContract.asSyncAdapter

0 commit comments

Comments
 (0)