Skip to content

Commit c768b88

Browse files
committed
Remove unused exception and fix log message
1 parent 1ef6bfe commit c768b88

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

domain/src/main/java/org/cryptomator/domain/exception/update/SSLHandshakePreAndroid5UpdateCheckException.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import org.cryptomator.domain.exception.license.LicenseNotValidException
1717
import org.cryptomator.domain.exception.license.NoLicenseAvailableException
1818
import org.cryptomator.domain.exception.update.GeneralUpdateErrorException
1919
import org.cryptomator.domain.exception.update.HashMismatchUpdateCheckException
20-
import org.cryptomator.domain.exception.update.SSLHandshakePreAndroid5UpdateCheckException
2120
import org.cryptomator.domain.exception.vaultconfig.MissingVaultConfigFileException
2221
import org.cryptomator.domain.exception.vaultconfig.UnsupportedMasterkeyLocationException
2322
import org.cryptomator.domain.exception.vaultconfig.VaultConfigLoadException
@@ -52,7 +51,6 @@ class ExceptionHandlers @Inject constructor(private val context: Context, defaul
5251
staticHandler(NoLicenseAvailableException::class.java, R.string.dialog_enter_license_no_content)
5352
staticHandler(HashMismatchUpdateCheckException::class.java, R.string.error_hash_mismatch_update)
5453
staticHandler(GeneralUpdateErrorException::class.java, R.string.error_general_update)
55-
staticHandler(SSLHandshakePreAndroid5UpdateCheckException::class.java, R.string.error_general_update)
5654
staticHandler(
5755
MissingVaultConfigFileException::class.java, String.format(
5856
ResourceHelper.getString(R.string.error_vault_config_file_missing_due_to_format_999),

presentation/src/main/java/org/cryptomator/presentation/presenter/VaultListPresenter.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import org.cryptomator.domain.CloudType
1818
import org.cryptomator.domain.Vault
1919
import org.cryptomator.domain.di.PerView
2020
import org.cryptomator.domain.exception.license.LicenseNotValidException
21-
import org.cryptomator.domain.exception.update.SSLHandshakePreAndroid5UpdateCheckException
2221
import org.cryptomator.domain.usecases.DoLicenseCheckUseCase
2322
import org.cryptomator.domain.usecases.DoUpdateCheckUseCase
2423
import org.cryptomator.domain.usecases.DoUpdateUseCase
@@ -168,15 +167,11 @@ class VaultListPresenter @Inject constructor( //
168167
}
169168

170169
override fun onError(e: Throwable) {
171-
if (e is SSLHandshakePreAndroid5UpdateCheckException) {
172-
Timber.tag("SettingsPresenter").e(e, "Update check failed due to Android pre 5 and SSL Handshake not accepted")
173-
} else {
174-
showError(e)
175-
}
170+
showError(e)
176171
}
177172
})
178173
} else {
179-
Timber.tag("VaultListPresenter").i("Update check not started due to no internal connection")
174+
Timber.tag("VaultListPresenter").i("Update check not started due to no internet connection")
180175
}
181176
}
182177

0 commit comments

Comments
 (0)