From 9c8daf1ebd460911fe93794322ea1750a23988f8 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 16 Apr 2019 17:14:49 +0100 Subject: [PATCH] More optimise imports. --- .../java/com/etesync/syncadapter/HttpClient.kt | 1 - .../com/etesync/syncadapter/model/Settings.java | 1 + .../syncadapter/AccountAuthenticatorService.kt | 2 -- .../syncadapter/AddressBooksSyncAdapterService.kt | 5 ++++- .../syncadapter/CalendarsSyncAdapterService.kt | 5 ++++- .../syncadapter/ContactsSyncAdapterService.kt | 5 ++++- .../syncadapter/TasksSyncAdapterService.kt | 5 ++++- .../etesync/syncadapter/ui/AccountListFragment.kt | 8 ++++---- .../com/etesync/syncadapter/ui/AccountsActivity.kt | 14 +++++++------- .../etesync/syncadapter/ui/AddMemberFragment.kt | 4 ++-- .../etesync/syncadapter/ui/AppSettingsActivity.kt | 2 +- .../com/etesync/syncadapter/ui/BaseActivity.kt | 4 +--- .../syncadapter/ui/CollectionMembersActivity.kt | 3 +-- .../ui/CollectionMembersListFragment.kt | 4 ++-- .../syncadapter/ui/CreateCollectionActivity.kt | 5 +---- .../syncadapter/ui/DeleteCollectionFragment.kt | 4 ++-- .../syncadapter/ui/EditCollectionActivity.kt | 2 +- .../syncadapter/ui/ExceptionInfoFragment.kt | 2 +- .../etesync/syncadapter/ui/JournalItemActivity.kt | 11 +++++------ .../etesync/syncadapter/ui/PermissionsActivity.kt | 3 +-- .../etesync/syncadapter/ui/RemoveMemberFragment.kt | 3 +-- .../syncadapter/ui/StartupDialogFragment.kt | 2 +- .../syncadapter/ui/ViewCollectionActivity.kt | 2 +- .../com/etesync/syncadapter/ui/WebViewActivity.kt | 2 +- .../syncadapter/ui/importlocal/ImportActivity.kt | 2 +- .../ui/importlocal/LocalCalendarImportFragment.kt | 2 +- .../ui/importlocal/LocalContactImportFragment.kt | 7 +++---- .../syncadapter/ui/importlocal/ResultFragment.kt | 2 +- .../ui/journalviewer/ListEntriesFragment.kt | 2 +- .../ui/setup/EncryptionDetailsFragment.kt | 5 ++--- .../ui/setup/LoginCredentialsFragment.kt | 4 ++-- 31 files changed, 61 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/HttpClient.kt b/app/src/main/java/com/etesync/syncadapter/HttpClient.kt index 6f2a3b6f..4bef5439 100644 --- a/app/src/main/java/com/etesync/syncadapter/HttpClient.kt +++ b/app/src/main/java/com/etesync/syncadapter/HttpClient.kt @@ -27,7 +27,6 @@ import java.io.IOException import java.net.InetSocketAddress import java.net.Proxy import java.net.Socket -import java.net.URI import java.security.KeyStore import java.security.Principal import java.util.* diff --git a/app/src/main/java/com/etesync/syncadapter/model/Settings.java b/app/src/main/java/com/etesync/syncadapter/model/Settings.java index 05e04680..8258b6be 100644 --- a/app/src/main/java/com/etesync/syncadapter/model/Settings.java +++ b/app/src/main/java/com/etesync/syncadapter/model/Settings.java @@ -11,6 +11,7 @@ package com.etesync.syncadapter.model; import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; + import androidx.annotation.Nullable; public class Settings { diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.kt index a5333cf9..2c5b305f 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/AccountAuthenticatorService.kt @@ -12,13 +12,11 @@ import android.annotation.SuppressLint import android.app.Service import android.content.Context import android.content.Intent -import android.database.DatabaseUtils import android.os.Bundle import at.bitfire.vcard4android.ContactsStorageException import com.etesync.syncadapter.App import com.etesync.syncadapter.R import com.etesync.syncadapter.log.Logger -import com.etesync.syncadapter.model.ServiceDB import com.etesync.syncadapter.model.ServiceEntity import com.etesync.syncadapter.resource.LocalAddressBook import com.etesync.syncadapter.ui.setup.LoginActivity diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt index 1240b89c..df19c85d 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt @@ -16,8 +16,11 @@ import android.database.sqlite.SQLiteException import android.os.Bundle import android.provider.ContactsContract import at.bitfire.vcard4android.ContactsStorageException -import com.etesync.syncadapter.* +import com.etesync.syncadapter.AccountSettings +import com.etesync.syncadapter.App +import com.etesync.syncadapter.Constants import com.etesync.syncadapter.Constants.KEY_ACCOUNT +import com.etesync.syncadapter.R import com.etesync.syncadapter.journalmanager.Exceptions import com.etesync.syncadapter.log.Logger import com.etesync.syncadapter.model.CollectionInfo diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt index 4a66901f..2b5fbfdb 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt @@ -14,8 +14,11 @@ import android.os.Bundle import android.provider.CalendarContract import at.bitfire.ical4android.AndroidCalendar import at.bitfire.ical4android.CalendarStorageException -import com.etesync.syncadapter.* +import com.etesync.syncadapter.AccountSettings +import com.etesync.syncadapter.App +import com.etesync.syncadapter.Constants import com.etesync.syncadapter.Constants.KEY_ACCOUNT +import com.etesync.syncadapter.R import com.etesync.syncadapter.journalmanager.Exceptions import com.etesync.syncadapter.log.Logger import com.etesync.syncadapter.model.CollectionInfo diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt index 72df316c..c562ffe4 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt @@ -11,8 +11,11 @@ import android.accounts.Account import android.content.* import android.os.Bundle import at.bitfire.vcard4android.ContactsStorageException -import com.etesync.syncadapter.* +import com.etesync.syncadapter.AccountSettings +import com.etesync.syncadapter.Constants import com.etesync.syncadapter.Constants.KEY_ACCOUNT +import com.etesync.syncadapter.InvalidAccountException +import com.etesync.syncadapter.R import com.etesync.syncadapter.journalmanager.Exceptions import com.etesync.syncadapter.log.Logger import com.etesync.syncadapter.resource.LocalAddressBook diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt index 4900eafa..408522bf 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt @@ -18,7 +18,10 @@ import android.os.Build import android.os.Bundle import at.bitfire.ical4android.AndroidTaskList import at.bitfire.ical4android.TaskProvider -import com.etesync.syncadapter.* +import com.etesync.syncadapter.AccountSettings +import com.etesync.syncadapter.App +import com.etesync.syncadapter.Constants +import com.etesync.syncadapter.R import com.etesync.syncadapter.journalmanager.Exceptions import com.etesync.syncadapter.log.Logger import com.etesync.syncadapter.model.CollectionInfo diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt index 3f72888e..09a1c175 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt @@ -15,10 +15,6 @@ import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.os.Bundle -import androidx.fragment.app.ListFragment -import androidx.loader.app.LoaderManager -import androidx.loader.content.AsyncTaskLoader -import androidx.loader.content.Loader import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -26,6 +22,10 @@ import android.widget.AbsListView import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.TextView +import androidx.fragment.app.ListFragment +import androidx.loader.app.LoaderManager +import androidx.loader.content.AsyncTaskLoader +import androidx.loader.content.Loader import com.etesync.syncadapter.App import com.etesync.syncadapter.R diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.kt index 58d31e56..60d1c6ab 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.kt @@ -13,17 +13,14 @@ import android.content.ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS import android.content.Intent import android.content.SyncStatusObserver import android.os.Bundle -import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.google.android.material.navigation.NavigationView -import com.google.android.material.snackbar.Snackbar -import androidx.core.view.GravityCompat -import androidx.drawerlayout.widget.DrawerLayout -import androidx.appcompat.app.ActionBarDrawerToggle -import androidx.appcompat.widget.Toolbar import android.view.Gravity import android.view.MenuItem import android.view.View import android.widget.Toast +import androidx.appcompat.app.ActionBarDrawerToggle +import androidx.appcompat.widget.Toolbar +import androidx.core.view.GravityCompat +import androidx.drawerlayout.widget.DrawerLayout import com.etesync.syncadapter.BuildConfig.DEBUG import com.etesync.syncadapter.Constants import com.etesync.syncadapter.Constants.serviceUrl @@ -31,6 +28,9 @@ import com.etesync.syncadapter.R import com.etesync.syncadapter.ui.setup.LoginActivity import com.etesync.syncadapter.utils.HintManager import com.etesync.syncadapter.utils.ShowcaseBuilder +import com.google.android.material.floatingactionbutton.FloatingActionButton +import com.google.android.material.navigation.NavigationView +import com.google.android.material.snackbar.Snackbar import tourguide.tourguide.ToolTip class AccountsActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, SyncStatusObserver { diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt index 45e4e1be..bfb30d6f 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt @@ -6,11 +6,11 @@ import android.app.ProgressDialog import android.content.Context import android.os.AsyncTask import android.os.Bundle -import androidx.fragment.app.DialogFragment -import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment import com.etesync.syncadapter.* import com.etesync.syncadapter.journalmanager.Crypto import com.etesync.syncadapter.journalmanager.JournalManager diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt index 35775402..e387c5c3 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt @@ -12,7 +12,6 @@ import android.content.Intent import android.os.AsyncTask import android.os.Build import android.os.Bundle -import com.google.android.material.snackbar.Snackbar import androidx.preference.* import at.bitfire.cert4android.CustomCertManager import com.etesync.syncadapter.App @@ -22,6 +21,7 @@ import com.etesync.syncadapter.model.ServiceDB import com.etesync.syncadapter.model.Settings import com.etesync.syncadapter.utils.HintManager import com.etesync.syncadapter.utils.LanguageUtils +import com.google.android.material.snackbar.Snackbar import org.jetbrains.anko.defaultSharedPreferences import java.net.URI import java.net.URISyntaxException diff --git a/app/src/main/java/com/etesync/syncadapter/ui/BaseActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/BaseActivity.kt index 0bccc10e..6014cf18 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/BaseActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/BaseActivity.kt @@ -1,9 +1,7 @@ package com.etesync.syncadapter.ui -import androidx.appcompat.app.AppCompatActivity import android.view.MenuItem - -import com.etesync.syncadapter.App +import androidx.appcompat.app.AppCompatActivity open class BaseActivity : AppCompatActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt index 58922b46..5da5c9ea 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt @@ -4,12 +4,11 @@ import android.accounts.Account import android.content.Context import android.content.Intent import android.os.Bundle -import androidx.appcompat.app.AlertDialog -import android.text.InputType import android.view.View import android.widget.CheckBox import android.widget.EditText import android.widget.TextView +import androidx.appcompat.app.AlertDialog import com.etesync.syncadapter.App import com.etesync.syncadapter.R import com.etesync.syncadapter.model.CollectionInfo diff --git a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt index fb6f3c31..76830b14 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt @@ -3,14 +3,14 @@ package com.etesync.syncadapter.ui import android.accounts.Account import android.content.Context import android.os.Bundle -import androidx.fragment.app.ListFragment -import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.ListFragment import com.etesync.syncadapter.* import com.etesync.syncadapter.journalmanager.JournalManager import com.etesync.syncadapter.model.CollectionInfo diff --git a/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionActivity.kt index a8b33fcc..135205c1 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionActivity.kt @@ -13,20 +13,17 @@ import android.content.Context import android.content.Intent import android.graphics.drawable.ColorDrawable import android.os.Bundle -import androidx.core.app.NavUtils import android.text.TextUtils import android.view.Menu import android.view.MenuItem import android.view.View import android.widget.EditText - +import androidx.core.app.NavUtils import com.etesync.syncadapter.R import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.resource.LocalCalendar import com.etesync.syncadapter.resource.LocalTaskList - import org.apache.commons.lang3.StringUtils - import yuku.ambilwarna.AmbilWarnaDialog open class CreateCollectionActivity : BaseActivity() { diff --git a/app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.kt index 28da708c..c54c9ff6 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.kt @@ -13,12 +13,12 @@ import android.app.Dialog import android.app.ProgressDialog import android.content.Context import android.os.Bundle +import android.text.TextUtils +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import androidx.loader.app.LoaderManager import androidx.loader.content.AsyncTaskLoader import androidx.loader.content.Loader -import androidx.appcompat.app.AlertDialog -import android.text.TextUtils import com.etesync.syncadapter.* import com.etesync.syncadapter.journalmanager.Crypto import com.etesync.syncadapter.journalmanager.Exceptions diff --git a/app/src/main/java/com/etesync/syncadapter/ui/EditCollectionActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/EditCollectionActivity.kt index c5d2fce7..e2abf4b6 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/EditCollectionActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/EditCollectionActivity.kt @@ -12,11 +12,11 @@ import android.accounts.Account import android.content.Context import android.content.Intent import android.os.Bundle -import androidx.appcompat.app.AlertDialog import android.view.Menu import android.view.MenuItem import android.view.View import android.widget.EditText +import androidx.appcompat.app.AlertDialog import com.etesync.syncadapter.App import com.etesync.syncadapter.R import com.etesync.syncadapter.model.CollectionInfo diff --git a/app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.kt index ab44b2f1..353d2630 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.kt @@ -12,8 +12,8 @@ import android.accounts.Account import android.app.Dialog import android.content.Intent import android.os.Bundle -import androidx.fragment.app.DialogFragment import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment import com.etesync.syncadapter.Constants import com.etesync.syncadapter.R import com.etesync.syncadapter.journalmanager.Exceptions.HttpException diff --git a/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt index 4030e390..dc7181dc 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt @@ -4,16 +4,14 @@ import android.accounts.Account import android.content.Context import android.content.Intent import android.os.Bundle -import com.google.android.material.tabs.TabLayout +import android.text.format.DateFormat +import android.text.format.DateUtils +import android.view.* +import android.widget.TextView import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter import androidx.viewpager.widget.ViewPager -import android.text.format.DateFormat -import android.text.format.DateUtils -import android.text.format.Time -import android.view.* -import android.widget.TextView import at.bitfire.ical4android.Event import at.bitfire.ical4android.InvalidCalendarException import at.bitfire.ical4android.Task @@ -26,6 +24,7 @@ import com.etesync.syncadapter.model.JournalEntity import com.etesync.syncadapter.model.SyncEntry import com.etesync.syncadapter.ui.journalviewer.ListEntriesFragment.Companion.setJournalEntryView import com.etesync.syncadapter.utils.EventEmailInvitation +import com.google.android.material.tabs.TabLayout import ezvcard.util.PartialDate import org.jetbrains.anko.doAsync import org.jetbrains.anko.uiThread diff --git a/app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.kt index a81524e3..d211b29d 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.kt @@ -12,10 +12,9 @@ import android.Manifest import android.app.Activity import android.content.pm.PackageManager import android.os.Bundle +import android.view.View import androidx.core.app.ActivityCompat import androidx.core.app.NotificationManagerCompat -import android.view.View - import com.etesync.syncadapter.Constants import com.etesync.syncadapter.R import com.etesync.syncadapter.resource.LocalTaskList diff --git a/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.kt index ca7cf8b6..27b45b49 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.kt @@ -5,13 +5,12 @@ import android.app.Dialog import android.app.ProgressDialog import android.os.AsyncTask import android.os.Bundle -import androidx.fragment.app.DialogFragment import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment import com.etesync.syncadapter.* import com.etesync.syncadapter.journalmanager.JournalManager import com.etesync.syncadapter.model.CollectionInfo import okhttp3.HttpUrl -import okhttp3.OkHttpClient class RemoveMemberFragment : DialogFragment() { private var settings: AccountSettings? = null diff --git a/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.kt index 61d9e843..7578db37 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.kt @@ -17,8 +17,8 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.os.PowerManager -import androidx.fragment.app.DialogFragment import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment import com.etesync.syncadapter.BuildConfig import com.etesync.syncadapter.Constants import com.etesync.syncadapter.R diff --git a/app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.kt index d53ca703..590b14e3 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.kt @@ -15,12 +15,12 @@ import android.os.AsyncTask import android.os.Bundle import android.provider.CalendarContract import android.provider.ContactsContract -import androidx.appcompat.app.AlertDialog import android.view.Gravity import android.view.Menu import android.view.MenuItem import android.view.View import android.widget.TextView +import androidx.appcompat.app.AlertDialog import at.bitfire.ical4android.CalendarStorageException import at.bitfire.ical4android.TaskProvider import at.bitfire.vcard4android.ContactsStorageException diff --git a/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt index fdff9703..e778102e 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt @@ -7,11 +7,11 @@ import android.content.Intent import android.net.Uri import android.os.Build import android.os.Bundle -import androidx.appcompat.app.ActionBar import android.view.KeyEvent import android.view.View import android.webkit.* import android.widget.ProgressBar +import androidx.appcompat.app.ActionBar import com.etesync.syncadapter.Constants import com.etesync.syncadapter.R diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt index c6ae7a7c..e86550be 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt @@ -6,10 +6,10 @@ import android.content.Context import android.content.DialogInterface import android.content.Intent import android.os.Bundle -import androidx.fragment.app.Fragment import android.view.* import android.widget.ImageView import android.widget.TextView +import androidx.fragment.app.Fragment import com.etesync.syncadapter.R import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.ui.BaseActivity diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt index 175c5bce..111c0284 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt @@ -6,7 +6,6 @@ import android.content.Context import android.os.AsyncTask import android.os.Bundle import android.provider.CalendarContract -import androidx.fragment.app.ListFragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,6 +13,7 @@ import android.widget.BaseExpandableListAdapter import android.widget.ExpandableListView import android.widget.ImageView import android.widget.TextView +import androidx.fragment.app.ListFragment import at.bitfire.ical4android.CalendarStorageException import com.etesync.syncadapter.Constants.KEY_ACCOUNT import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt index f0cd88a1..32035afc 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt @@ -11,17 +11,16 @@ import android.graphics.drawable.Drawable import android.os.AsyncTask import android.os.Bundle import android.provider.ContactsContract -import androidx.fragment.app.Fragment -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import at.bitfire.vcard4android.ContactsStorageException -import com.etesync.syncadapter.App import com.etesync.syncadapter.Constants.KEY_ACCOUNT import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO import com.etesync.syncadapter.R diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt index 178a779b..5bac32a8 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt @@ -3,8 +3,8 @@ package com.etesync.syncadapter.ui.importlocal import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import androidx.fragment.app.DialogFragment import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment import com.etesync.syncadapter.R import java.io.Serializable diff --git a/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt index 1b733025..4fa3c060 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt @@ -11,7 +11,6 @@ package com.etesync.syncadapter.ui.journalviewer import android.accounts.Account import android.content.Context import android.os.Bundle -import androidx.fragment.app.ListFragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -19,6 +18,7 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.ImageView import android.widget.TextView +import androidx.fragment.app.ListFragment import com.etesync.syncadapter.App import com.etesync.syncadapter.R import com.etesync.syncadapter.model.* diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.kt index 4c1a3071..1dfe74d2 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.kt @@ -9,16 +9,15 @@ package com.etesync.syncadapter.ui.setup import android.os.Bundle -import com.google.android.material.textfield.TextInputLayout -import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Button import android.widget.TextView - +import androidx.fragment.app.Fragment import com.etesync.syncadapter.Constants import com.etesync.syncadapter.R +import com.google.android.material.textfield.TextInputLayout class EncryptionDetailsFragment : Fragment() { internal lateinit var editPassword: TextInputLayout diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt index f347879a..e5cff8ff 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt @@ -9,8 +9,6 @@ package com.etesync.syncadapter.ui.setup import android.os.Bundle -import com.google.android.material.textfield.TextInputLayout -import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -18,9 +16,11 @@ import android.widget.Button import android.widget.CheckedTextView import android.widget.EditText import android.widget.TextView +import androidx.fragment.app.Fragment import com.etesync.syncadapter.Constants import com.etesync.syncadapter.R import com.etesync.syncadapter.ui.WebViewActivity +import com.google.android.material.textfield.TextInputLayout import net.cachapa.expandablelayout.ExpandableLayout import okhttp3.HttpUrl import java.net.URI