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

Commit 3a4e2163 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Minor cleanup (lint)

parent a0d592c7

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ dependencies { 
    compile "org.mnode.ical4j:ical4j:$ical4j_version"

    compile 'org.slf4j:slf4j-jdk14:1.7.25'



    androidTestCompile 'com.android.support.test:runner:1.0.1'

    androidTestCompile 'com.android.support.test:rules:1.0.1'

    androidTestCompile 'com.android.support.test:runner:1.0.2'

    androidTestCompile 'com.android.support.test:rules:1.0.2'



    testCompile 'junit:junit:4.12'

}

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class MiscUtilsTest { 
        assertEquals(TimeZones.UTC_ID, MiscUtils.getTzId(DtStart(DateTime(1438607288000L))))



        // DATE-TIME with time zone

        assertEquals(tzVienna.getID(), MiscUtils.getTzId(DtStart(DateTime("20150101T000000", tzVienna))))

        assertEquals(tzVienna.id, MiscUtils.getTzId(DtStart(DateTime("20150101T000000", tzVienna))))

    }



    @Test

src/androidTest/java/at/bitfire/ical4android/impl/TestCalendar.kt

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class TestCalendar( 
    companion object {

        fun findOrCreate(account: Account, provider: ContentProviderClient): TestCalendar {

            val calendars = AndroidCalendar.find(account, provider, Factory, null, null)

            if (calendars.isEmpty()) {

            return if (calendars.isEmpty()) {

                val values = ContentValues(3)

                values.put(CalendarContract.Calendars.NAME, "TestCalendar")

                values.put(CalendarContract.Calendars.CALENDAR_DISPLAY_NAME, "ical4android Test Calendar")
@@ -33,9 +33,9 @@ class TestCalendar( 
                        CalendarContract.Reminders.METHOD_DEFAULT)

                val uri = AndroidCalendar.create(account, provider, values)



                return TestCalendar(account, provider, ContentUris.parseId(uri))

                TestCalendar(account, provider, ContentUris.parseId(uri))

            } else

                return calendars.first()

                calendars.first()

        }

    }

src/androidTest/java/at/bitfire/ical4android/impl/TestTask.kt

+5 −5
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 


package at.bitfire.ical4android.impl



import android.content.ContentValues;

import android.content.ContentValues



import at.bitfire.ical4android.AndroidTask;

import at.bitfire.ical4android.AndroidTaskFactory;

import at.bitfire.ical4android.AndroidTaskList;

import at.bitfire.ical4android.Task;

import at.bitfire.ical4android.AndroidTask

import at.bitfire.ical4android.AndroidTaskFactory

import at.bitfire.ical4android.AndroidTaskList

import at.bitfire.ical4android.Task



class TestTask: AndroidTask {

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

+3 −3
Original line number Diff line number Diff line
@@ -578,11 +578,11 @@ abstract class AndroidEvent( 
        event.organizer?.let { organizer ->

            val email: String?

            val uri = organizer.calAddress

            if (uri.scheme.equals("mailto", true))

                email = uri.schemeSpecificPart

            email = if (uri.scheme.equals("mailto", true))

                uri.schemeSpecificPart

            else {

                val emailParam = organizer.getParameter(ICalendar.Email.PARAMETER_NAME) as ICalendar.Email?

                email = emailParam?.value

                emailParam?.value

            }

            if (email != null)

                builder.withValue(Events.ORGANIZER, email)