From 729dcff81649506bc18244598ef4607dd0980196 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Thu, 23 Sep 2021 15:03:16 +0200 Subject: [PATCH] Remove remaining wildcard imports --- .idea/codeStyles/Project.xml | 2 +- .../AutoUploadChooseVaultPresenter.kt | 1 - .../presenter/BrowseFilesPresenter.kt | 66 +++++++++++++++---- .../presenter/CloudConnectionListPresenter.kt | 1 - .../presenter/SharedFilesPresenter.kt | 20 ++++-- .../ui/adapter/CloudSettingsAdapter.kt | 4 +- .../fragment/AutoUploadChooseVaultFragment.kt | 4 +- 7 files changed, 77 insertions(+), 21 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index c6c582f6..1ed39b2b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -186,4 +186,4 @@ - \ No newline at end of file + diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/AutoUploadChooseVaultPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/AutoUploadChooseVaultPresenter.kt index 64ed5926..3af6a9fb 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/presenter/AutoUploadChooseVaultPresenter.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/AutoUploadChooseVaultPresenter.kt @@ -21,7 +21,6 @@ import org.cryptomator.presentation.ui.activity.view.AutoUploadChooseVaultView import org.cryptomator.presentation.workflow.ActivityResult import org.cryptomator.presentation.workflow.AuthenticationExceptionHandler import org.cryptomator.util.SharedPreferencesHandler -import java.util.* import javax.inject.Inject @PerView diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt index b1af75db..47e03969 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt @@ -13,9 +13,31 @@ import org.cryptomator.domain.CloudFile import org.cryptomator.domain.CloudFolder import org.cryptomator.domain.CloudNode import org.cryptomator.domain.di.PerView -import org.cryptomator.domain.exception.* -import org.cryptomator.domain.usecases.* -import org.cryptomator.domain.usecases.cloud.* +import org.cryptomator.domain.exception.CloudNodeAlreadyExistsException +import org.cryptomator.domain.exception.EmptyDirFileException +import org.cryptomator.domain.exception.FatalBackendException +import org.cryptomator.domain.exception.NoDirFileException +import org.cryptomator.domain.exception.NoSuchCloudFileException +import org.cryptomator.domain.exception.SymLinkException +import org.cryptomator.domain.usecases.CloudFolderRecursiveListing +import org.cryptomator.domain.usecases.CloudNodeRecursiveListing +import org.cryptomator.domain.usecases.CopyDataUseCase +import org.cryptomator.domain.usecases.DownloadFile +import org.cryptomator.domain.usecases.ResultRenamed +import org.cryptomator.domain.usecases.cloud.CreateFolderUseCase +import org.cryptomator.domain.usecases.cloud.DeleteNodesUseCase +import org.cryptomator.domain.usecases.cloud.DownloadFilesUseCase +import org.cryptomator.domain.usecases.cloud.DownloadState +import org.cryptomator.domain.usecases.cloud.GetCloudListRecursiveUseCase +import org.cryptomator.domain.usecases.cloud.GetCloudListUseCase +import org.cryptomator.domain.usecases.cloud.MoveFilesUseCase +import org.cryptomator.domain.usecases.cloud.MoveFoldersUseCase +import org.cryptomator.domain.usecases.cloud.Progress +import org.cryptomator.domain.usecases.cloud.RenameFileUseCase +import org.cryptomator.domain.usecases.cloud.RenameFolderUseCase +import org.cryptomator.domain.usecases.cloud.UploadFile +import org.cryptomator.domain.usecases.cloud.UploadFilesUseCase +import org.cryptomator.domain.usecases.cloud.UploadState import org.cryptomator.domain.usecases.vault.AssertUnlockedUseCase import org.cryptomator.generator.Callback import org.cryptomator.generator.InjectIntent @@ -28,26 +50,48 @@ import org.cryptomator.presentation.intent.BrowseFilesIntent import org.cryptomator.presentation.intent.ChooseCloudNodeSettings import org.cryptomator.presentation.intent.IntentBuilder import org.cryptomator.presentation.intent.Intents -import org.cryptomator.presentation.model.* -import org.cryptomator.presentation.model.mappers.* +import org.cryptomator.presentation.model.CloudFileModel +import org.cryptomator.presentation.model.CloudFolderModel +import org.cryptomator.presentation.model.CloudModel +import org.cryptomator.presentation.model.CloudNodeModel +import org.cryptomator.presentation.model.ImagePreviewFilesStore +import org.cryptomator.presentation.model.ProgressModel +import org.cryptomator.presentation.model.ProgressStateModel +import org.cryptomator.presentation.model.mappers.CloudFileModelMapper +import org.cryptomator.presentation.model.mappers.CloudFolderModelMapper +import org.cryptomator.presentation.model.mappers.CloudNodeModelMapper +import org.cryptomator.presentation.model.mappers.ProgressModelMapper +import org.cryptomator.presentation.model.mappers.ProgressStateModelMapper import org.cryptomator.presentation.service.OpenWritableFileNotification import org.cryptomator.presentation.ui.activity.view.BrowseFilesView import org.cryptomator.presentation.ui.dialog.ExportCloudFilesDialog import org.cryptomator.presentation.ui.dialog.FileNameDialog -import org.cryptomator.presentation.util.* -import org.cryptomator.presentation.workflow.* +import org.cryptomator.presentation.util.ContentResolverUtil +import org.cryptomator.presentation.util.DownloadFileUtil +import org.cryptomator.presentation.util.FileNameBlacklist +import org.cryptomator.presentation.util.FileUtil +import org.cryptomator.presentation.util.FolderNameBlacklist +import org.cryptomator.presentation.util.ShareFileHelper +import org.cryptomator.presentation.workflow.ActivityResult +import org.cryptomator.presentation.workflow.AddExistingVaultWorkflow +import org.cryptomator.presentation.workflow.AuthenticationExceptionHandler +import org.cryptomator.presentation.workflow.CreateNewVaultWorkflow +import org.cryptomator.presentation.workflow.PermissionsResult +import org.cryptomator.presentation.workflow.Workflow import org.cryptomator.util.ExceptionUtil import org.cryptomator.util.SharedPreferencesHandler import org.cryptomator.util.file.FileCacheUtils import org.cryptomator.util.file.MimeType import org.cryptomator.util.file.MimeTypes -import java.io.* +import java.io.File +import java.io.FileInputStream +import java.io.FileNotFoundException +import java.io.FileOutputStream +import java.io.Serializable import java.security.DigestInputStream import java.security.MessageDigest -import java.util.* import java.util.function.Supplier import javax.inject.Inject -import kotlin.collections.ArrayList import kotlin.reflect.KClass import timber.log.Timber @@ -167,7 +211,7 @@ class BrowseFilesPresenter @Inject constructor( // return } e is EmptyDirFileException -> { - view?.showNoDirFileDialog(e.dirName, e.filePath) + view?.showNoDirFileDialog(e.dirName, e.filePath) } e is SymLinkException -> { view?.showSymLinkDialog() diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/CloudConnectionListPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/CloudConnectionListPresenter.kt index 1fa66b76..ff98ce85 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/presenter/CloudConnectionListPresenter.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/CloudConnectionListPresenter.kt @@ -31,7 +31,6 @@ import org.cryptomator.presentation.ui.activity.view.CloudConnectionListView import org.cryptomator.presentation.ui.dialog.PCloudCredentialsUpdatedDialog import org.cryptomator.presentation.workflow.ActivityResult import org.cryptomator.util.crypto.CredentialCryptor -import java.util.* import java.util.concurrent.atomic.AtomicReference import javax.inject.Inject import timber.log.Timber diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/SharedFilesPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/SharedFilesPresenter.kt index 4ed7b75f..8d168049 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/presenter/SharedFilesPresenter.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/SharedFilesPresenter.kt @@ -3,10 +3,19 @@ package org.cryptomator.presentation.presenter import android.Manifest import android.net.Uri import org.cryptomator.data.cloud.crypto.CryptoCloud -import org.cryptomator.domain.* +import org.cryptomator.domain.Cloud +import org.cryptomator.domain.CloudFile +import org.cryptomator.domain.CloudFolder +import org.cryptomator.domain.CloudNode +import org.cryptomator.domain.Vault import org.cryptomator.domain.di.PerView import org.cryptomator.domain.usecases.GetDecryptedCloudForVaultUseCase -import org.cryptomator.domain.usecases.cloud.* +import org.cryptomator.domain.usecases.cloud.GetCloudListUseCase +import org.cryptomator.domain.usecases.cloud.GetRootFolderUseCase +import org.cryptomator.domain.usecases.cloud.Progress +import org.cryptomator.domain.usecases.cloud.UploadFile +import org.cryptomator.domain.usecases.cloud.UploadFilesUseCase +import org.cryptomator.domain.usecases.cloud.UploadState import org.cryptomator.domain.usecases.vault.GetVaultListUseCase import org.cryptomator.generator.Callback import org.cryptomator.generator.InstanceState @@ -15,7 +24,11 @@ import org.cryptomator.presentation.exception.ExceptionHandlers import org.cryptomator.presentation.intent.ChooseCloudNodeSettings import org.cryptomator.presentation.intent.Intents import org.cryptomator.presentation.intent.UnlockVaultIntent -import org.cryptomator.presentation.model.* +import org.cryptomator.presentation.model.CloudFolderModel +import org.cryptomator.presentation.model.CloudModel +import org.cryptomator.presentation.model.ProgressModel +import org.cryptomator.presentation.model.SharedFileModel +import org.cryptomator.presentation.model.VaultModel import org.cryptomator.presentation.model.mappers.CloudFolderModelMapper import org.cryptomator.presentation.model.mappers.ProgressModelMapper import org.cryptomator.presentation.ui.activity.view.SharedFilesView @@ -25,7 +38,6 @@ import org.cryptomator.presentation.workflow.ActivityResult import org.cryptomator.presentation.workflow.AuthenticationExceptionHandler import org.cryptomator.presentation.workflow.PermissionsResult import org.cryptomator.util.file.FileCacheUtils -import java.util.* import javax.inject.Inject import timber.log.Timber diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudSettingsAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudSettingsAdapter.kt index 560a4966..5ad5aab1 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudSettingsAdapter.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudSettingsAdapter.kt @@ -7,7 +7,9 @@ import org.cryptomator.presentation.model.CloudModel import org.cryptomator.presentation.model.CloudTypeModel import org.cryptomator.presentation.ui.adapter.CloudSettingsAdapter.CloudSettingViewHolder import javax.inject.Inject -import kotlinx.android.synthetic.main.item_cloud_setting.view.* +import kotlinx.android.synthetic.main.item_cloud_setting.view.cloudImage +import kotlinx.android.synthetic.main.item_cloud_setting.view.cloudName +import kotlinx.android.synthetic.main.item_cloud_setting.view.cloudUsername class CloudSettingsAdapter @Inject constructor(private val context: Context) : RecyclerViewBaseAdapter() { diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/AutoUploadChooseVaultFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/AutoUploadChooseVaultFragment.kt index c43bd47d..bc96cec8 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/AutoUploadChooseVaultFragment.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/AutoUploadChooseVaultFragment.kt @@ -9,8 +9,8 @@ import org.cryptomator.presentation.presenter.AutoUploadChooseVaultPresenter import org.cryptomator.presentation.ui.adapter.SharedLocationsAdapter import org.cryptomator.util.SharedPreferencesHandler import javax.inject.Inject -import kotlinx.android.synthetic.main.fragment_shared_files.* -import kotlinx.android.synthetic.main.view_receive_save_button.* +import kotlinx.android.synthetic.main.fragment_auto_upload_choose_vault.locationsRecyclerView +import kotlinx.android.synthetic.main.view_receive_save_button.saveFiles @Fragment(R.layout.fragment_auto_upload_choose_vault) class AutoUploadChooseVaultFragment : BaseFragment() {