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

Commit 90dce8ba authored by Fahim M. Choudhury's avatar Fahim M. Choudhury Committed by Fahim M. Choudhury
Browse files

refactor: organize imports 

Used Single-Type-Import Declarations instead of Type-Import-on-Demand Declarations.

Reference: https://docs.oracle.com/javase/specs/jls/se7/html/jls-7.html#jls-7.5
parent 53234086

app/src/main/kotlin/at/bitfire/davdroid/network/HttpClient.kt

+13 −6
Original line number Diff line number Diff line
@@ -6,12 +6,10 @@ package at.bitfire.davdroid.network 


import android.accounts.Account

import android.content.Context

import android.os.Build

import android.security.KeyChain

import at.bitfire.cert4android.CustomCertManager

import at.bitfire.dav4jvm.BasicDigestAuthHandler

import at.bitfire.dav4jvm.UrlUtils

import at.bitfire.davdroid.BuildConfig

import at.bitfire.davdroid.OpenIdUtils

import at.bitfire.davdroid.db.Credentials

import at.bitfire.davdroid.log.Logger
@@ -27,7 +25,13 @@ import dagger.hilt.components.SingletonComponent 
import kotlinx.coroutines.flow.MutableStateFlow

import net.openid.appauth.AuthState

import net.openid.appauth.AuthorizationService

import okhttp3.*

import okhttp3.Cache

import okhttp3.ConnectionSpec

import okhttp3.CookieJar

import okhttp3.Interceptor

import okhttp3.OkHttpClient

import okhttp3.Protocol

import okhttp3.Response

import okhttp3.brotli.BrotliInterceptor

import okhttp3.internal.tls.OkHostnameVerifier

import okhttp3.logging.HttpLoggingInterceptor
@@ -37,11 +41,14 @@ import java.net.Proxy 
import java.net.Socket

import java.security.KeyStore

import java.security.Principal

import java.text.SimpleDateFormat

import java.util.*

import java.util.Locale

import java.util.concurrent.TimeUnit

import java.util.logging.Level

import javax.net.ssl.*

import javax.net.ssl.KeyManager

import javax.net.ssl.SSLContext

import javax.net.ssl.TrustManagerFactory

import javax.net.ssl.X509ExtendedKeyManager

import javax.net.ssl.X509TrustManager



class HttpClient private constructor(

    val okHttpClient: OkHttpClient,

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/DefaultAccountAuthenticatorService.kt

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import androidx.annotation.AnyThread 
import at.bitfire.davdroid.OpenIdUtils

import at.bitfire.davdroid.db.AppDatabase

import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.network.HttpClient.HttpClientEntryPoint

import at.bitfire.davdroid.resource.LocalAddressBook

import at.bitfire.davdroid.settings.AccountSettings

import at.bitfire.davdroid.ui.account.SettingsActivity

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/SyncManager.kt

+32 −6
Original line number Diff line number Diff line
@@ -16,20 +16,40 @@ import android.provider.CalendarContract 
import android.provider.ContactsContract

import androidx.core.app.NotificationCompat

import androidx.core.app.NotificationManagerCompat

import at.bitfire.dav4jvm.*

import at.bitfire.dav4jvm.exception.*

import at.bitfire.dav4jvm.DavCollection

import at.bitfire.dav4jvm.DavResource

import at.bitfire.dav4jvm.Error

import at.bitfire.dav4jvm.MultiResponseCallback

import at.bitfire.dav4jvm.Response

import at.bitfire.dav4jvm.exception.ConflictException

import at.bitfire.dav4jvm.exception.DavException

import at.bitfire.dav4jvm.exception.ForbiddenException

import at.bitfire.dav4jvm.exception.GoneException

import at.bitfire.dav4jvm.exception.HttpException

import at.bitfire.dav4jvm.exception.NotFoundException

import at.bitfire.dav4jvm.exception.PreconditionFailedException

import at.bitfire.dav4jvm.exception.ServiceUnavailableException

import at.bitfire.dav4jvm.exception.UnauthorizedException

import at.bitfire.dav4jvm.property.GetCTag

import at.bitfire.dav4jvm.property.GetETag

import at.bitfire.dav4jvm.property.ScheduleTag

import at.bitfire.dav4jvm.property.SyncToken

import at.bitfire.davdroid.*

import at.bitfire.davdroid.Constants

import at.bitfire.davdroid.InvalidAccountException

import at.bitfire.davdroid.OpenIdUtils

import at.bitfire.davdroid.R

import at.bitfire.davdroid.db.AppDatabase

import at.bitfire.davdroid.db.Credentials

import at.bitfire.davdroid.db.SyncState

import at.bitfire.davdroid.db.SyncStats

import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.network.HttpClient

import at.bitfire.davdroid.resource.*

import at.bitfire.davdroid.resource.LocalAddressBook

import at.bitfire.davdroid.resource.LocalCollection

import at.bitfire.davdroid.resource.LocalContact

import at.bitfire.davdroid.resource.LocalEvent

import at.bitfire.davdroid.resource.LocalResource

import at.bitfire.davdroid.resource.LocalTask

import at.bitfire.davdroid.settings.AccountSettings

import at.bitfire.davdroid.ui.DebugInfoActivity

import at.bitfire.davdroid.ui.NetworkUtils
@@ -45,7 +65,11 @@ import dagger.hilt.EntryPoint 
import dagger.hilt.InstallIn

import dagger.hilt.android.EntryPointAccessors

import dagger.hilt.components.SingletonComponent

import kotlinx.coroutines.*

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.asCoroutineDispatcher

import kotlinx.coroutines.launch

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.withContext

import net.openid.appauth.AuthState

import net.openid.appauth.AuthorizationService

import okhttp3.HttpUrl
@@ -60,7 +84,9 @@ import java.net.ConnectException 
import java.net.HttpURLConnection

import java.security.cert.CertificateException

import java.time.Instant

import java.util.*

import java.util.LinkedList

import java.util.Locale

import java.util.ServiceLoader

import java.util.concurrent.Executors

import java.util.concurrent.LinkedBlockingQueue

import java.util.concurrent.ThreadPoolExecutor