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

Commit 3450b0d4 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Don't do emulator checks (because we can only use shared runners at the moment); minor lint

parent 913105c5

.gitlab-ci.yml

+4 −3
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ cache: 


test:

  script:

    - (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh)

    - adb install src/androidTest/resources/org.dmfs.tasks_6880.apk

    - ./gradlew check connectedCheck

#   - (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh)

#   - adb install src/androidTest/resources/org.dmfs.tasks_6880.apk

#   - ./gradlew check connectedCheck

    - ./gradlew check

  artifacts:

    paths:

      - build/outputs/lint-results-debug.html

build.gradle

+0 −6
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ android { 


        buildConfigField "String", "version_ical4j", "\"$ical4j_version\""

    }

    buildTypes {

        release {

            minifyEnabled false

            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }

    }

    lintOptions {

        disable 'AllowBackup'

        disable 'InvalidPackage'

src/androidTest/java/at/bitfire/ical4android/AndroidCalendarTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ class AndroidCalendarTest { 


    @After

    fun shutdown() {

        @Suppress("DEPRECATION")

        if (Build.VERSION.SDK_INT >= 24)

            provider.close()

        else

src/androidTest/java/at/bitfire/ical4android/AndroidEventTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ class AndroidEventTest { 
    fun shutdown() {

        calendar.delete()



        @Suppress("DEPRECATION")

        if (Build.VERSION.SDK_INT >= 24)

            provider.close()

        else

src/main/java/at/bitfire/ical4android/AndroidCalendar.kt

+5 −5
Original line number Diff line number Diff line
@@ -151,13 +151,13 @@ abstract class AndroidCalendar<out T: AndroidEvent>( 
    /**

     * Queries events from this calendar. Adds a WHERE clause that restricts the

     * query to [Events.CALENDAR_ID] = [id].

     * @param where selection

     * @param whereArgs arguments for selection

     * @param _where selection

     * @param _whereArgs arguments for selection

     * @return events from this calendar which match the selection

     */

    fun queryEvents(where: String? = null, whereArgs: Array<String>? = null): List<T> {

        val where = "(${where ?: "1"}) AND " + Events.CALENDAR_ID + "=?"

        val whereArgs = (whereArgs ?: arrayOf()) + id.toString()

    fun queryEvents(_where: String? = null, _whereArgs: Array<String>? = null): List<T> {

        val where = "(${_where ?: "1"}) AND " + Events.CALENDAR_ID + "=?"

        val whereArgs = (_whereArgs ?: arrayOf()) + id.toString()



        val events = LinkedList<T>()

        provider.query(eventsSyncURI(), null, where, whereArgs, null)?.use { cursor ->