Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a75576d authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

merge with upstream/main-ose

parent 1f472c50

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.kt

+2 −4
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


package at.bitfire.davdroid.resource



import android.Manifest

import android.accounts.Account

import android.content.ContentProviderClient

import android.content.ContentUris
@@ -13,12 +12,11 @@ import android.provider.CalendarContract 
import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL

import android.provider.CalendarContract.Events

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.rule.GrantPermissionRule

import at.bitfire.davdroid.InitCalendarProviderRule

import at.bitfire.ical4android.AndroidCalendar

import at.bitfire.ical4android.Event

import at.bitfire.ical4android.MiscUtils.ContentProviderClientHelper.closeCompat

import at.bitfire.ical4android.MiscUtils.UriHelper.asSyncAdapter

import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat

import at.bitfire.ical4android.util.MiscUtils.UriHelper.asSyncAdapter

import net.fortuna.ical4j.model.property.DtStart

import net.fortuna.ical4j.model.property.RRule

import net.fortuna.ical4j.model.property.RecurrenceId

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalEventTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


package at.bitfire.davdroid.resource



import android.Manifest

import android.accounts.Account

import android.content.ContentProviderClient

import android.content.ContentUris
@@ -14,11 +13,10 @@ import android.provider.CalendarContract 
import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL

import android.provider.CalendarContract.Events

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.rule.GrantPermissionRule

import at.bitfire.davdroid.InitCalendarProviderRule

import at.bitfire.ical4android.AndroidCalendar

import at.bitfire.ical4android.Event

import at.bitfire.ical4android.MiscUtils.ContentProviderClientHelper.closeCompat

import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat

import at.techbee.jtx.JtxContract.asSyncAdapter

import net.fortuna.ical4j.model.Date

import net.fortuna.ical4j.model.DateList