From 4510aff00a858a449dc1fc92fddccc874a395051 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Sun, 10 May 2020 23:35:17 +0200 Subject: [PATCH] ktlint --- .../matrix/android/internal/session/SessionModule.kt | 3 --- .../session/identity/db/RealmIdentityServiceStore.kt | 1 - .../identity/model/IdentityAccountResponse.kt | 1 - .../identity/model/IdentityHashDetailResponse.kt | 2 +- .../session/profile/AccountThreePidsResponse.kt | 2 +- .../internal/session/profile/UnbindThreePidsTask.kt | 3 ++- .../internal/session/terms/DefaultTermsService.kt | 4 ++-- .../android/internal/session/terms/TermsResponse.kt | 1 - .../discovery/DiscoverySettingsController.kt | 3 +-- .../features/discovery/DiscoverySettingsFragment.kt | 12 ++++++------ .../features/discovery/DiscoverySettingsViewModel.kt | 1 - .../riotx/features/discovery/SettingsEditTextItem.kt | 1 - .../vector/riotx/features/discovery/SettingsItem.kt | 1 - .../discovery/SettingsTextButtonSingleLineItem.kt | 3 +-- .../discovery/change/SetIdentityServerFragment.kt | 3 +-- .../discovery/change/SetIdentityServerViewModel.kt | 4 ++-- .../im/vector/riotx/features/navigation/Navigator.kt | 6 +++++- .../vector/riotx/features/terms/TermsController.kt | 2 +- 18 files changed, 23 insertions(+), 30 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt index 08151f8b58..a19cf5decb 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt @@ -39,11 +39,9 @@ import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageSer import im.vector.matrix.android.internal.crypto.secrets.DefaultSharedSecretStorageService import im.vector.matrix.android.internal.crypto.verification.VerificationMessageLiveObserver import im.vector.matrix.android.internal.database.LiveEntityObserver -import im.vector.matrix.android.internal.database.RealmKeysUtils import im.vector.matrix.android.internal.database.SessionRealmConfigurationFactory import im.vector.matrix.android.internal.di.Authenticated import im.vector.matrix.android.internal.di.DeviceId -import im.vector.matrix.android.internal.di.IdentityDatabase import im.vector.matrix.android.internal.di.SessionCacheDirectory import im.vector.matrix.android.internal.di.SessionDatabase import im.vector.matrix.android.internal.di.SessionFilesDirectory @@ -64,7 +62,6 @@ import im.vector.matrix.android.internal.network.token.AccessTokenProvider import im.vector.matrix.android.internal.network.token.HomeserverAccessTokenProvider import im.vector.matrix.android.internal.session.group.GroupSummaryUpdater import im.vector.matrix.android.internal.session.homeserver.DefaultHomeServerCapabilitiesService -import im.vector.matrix.android.internal.session.identity.db.IdentityRealmModule import im.vector.matrix.android.internal.session.room.EventRelationsAggregationUpdater import im.vector.matrix.android.internal.session.room.create.RoomCreateEventLiveObserver import im.vector.matrix.android.internal.session.room.prune.EventsPruner diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServiceStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServiceStore.kt index e9f3db68f2..d04c7da91e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServiceStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServiceStore.kt @@ -17,7 +17,6 @@ package im.vector.matrix.android.internal.session.identity.db import im.vector.matrix.android.api.session.identity.ThreePid -import im.vector.matrix.android.api.session.identity.toMedium import im.vector.matrix.android.internal.di.IdentityDatabase import im.vector.matrix.android.internal.session.SessionScope import im.vector.matrix.android.internal.session.identity.model.IdentityHashDetailResponse diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityAccountResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityAccountResponse.kt index 56cc6c1701..a72eb75537 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityAccountResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityAccountResponse.kt @@ -27,4 +27,3 @@ internal data class IdentityAccountResponse( @Json(name = "user_id") val userId: String ) - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityHashDetailResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityHashDetailResponse.kt index d0e3d908e1..16a4e1fc71 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityHashDetailResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityHashDetailResponse.kt @@ -38,7 +38,7 @@ internal data class IdentityHashDetailResponse( @Json(name = "algorithms") val algorithms: List ) { - companion object{ + companion object { const val ALGORITHM_SHA256 = "sha256" const val ALGORITHM_NONE = "none" } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/AccountThreePidsResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/AccountThreePidsResponse.kt index 6161ccaf46..17f12113dd 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/AccountThreePidsResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/AccountThreePidsResponse.kt @@ -25,4 +25,4 @@ import com.squareup.moshi.JsonClass internal data class AccountThreePidsResponse( @Json(name = "threepids") val threePids: List? = null -) \ No newline at end of file +) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidsTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidsTask.kt index 0f84eb9926..4a11950ab5 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidsTask.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidsTask.kt @@ -36,7 +36,8 @@ internal class DefaultUnbindThreePidsTask @Inject constructor(private val profil private val identityServiceStore: IdentityServiceStore, private val eventBus: EventBus) : UnbindThreePidsTask() { override suspend fun execute(params: Params): Boolean { - val identityServerUrlWithoutProtocol = identityServiceStore.getIdentityServerUrlWithoutProtocol() ?: throw IdentityServiceError.NoIdentityServerConfigured + val identityServerUrlWithoutProtocol = identityServiceStore.getIdentityServerUrlWithoutProtocol() + ?: throw IdentityServiceError.NoIdentityServerConfigured return executeRequest(eventBus) { apiCall = profileAPI.unbindThreePid( diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/DefaultTermsService.kt index 84b3eb4ef9..7313c3d80e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/DefaultTermsService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/DefaultTermsService.kt @@ -88,9 +88,9 @@ internal class DefaultTermsService @Inject constructor( apiCall = termsAPI.agreeToTerms("${url}terms", AcceptTermsBody(agreedUrls), "Bearer $tokenToUse") } - //client SHOULD update this account data section adding any the URLs + // client SHOULD update this account data section adding any the URLs // of any additional documents that the user agreed to this list. - //Get current m.accepted_terms append new ones and update account data + // Get current m.accepted_terms append new ones and update account data val listOfAcceptedTerms = getAlreadyAcceptedTermUrlsFromAccountData() val newList = listOfAcceptedTerms.toMutableSet().apply { addAll(agreedUrls) }.toList() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsResponse.kt index 86ebda88b5..7c6451e3a0 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsResponse.kt @@ -53,4 +53,3 @@ data class TermsResponse( const val URL = "url" } } - diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt index 1af9788f38..506d5b2467 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt @@ -339,7 +339,7 @@ class DiscoverySettingsController @Inject constructor( val errorText = if (pidInfo.finalRequest is Fail) { val error = pidInfo.finalRequest.error // Deal with error 500 - //Ref: https://github.com/matrix-org/sydent/issues/292 + // Ref: https://github.com/matrix-org/sydent/issues/292 if (error is Failure.ServerError && error.httpCode == HttpsURLConnection.HTTP_INTERNAL_ERROR /* 500 */) { stringProvider.getString(R.string.settings_text_message_sent_wrong_code) @@ -410,4 +410,3 @@ class DiscoverySettingsController @Inject constructor( fun onTapRetryToRetrieveBindings() } } - diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt index 0c77c8d1a2..ef26d09927 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt @@ -87,7 +87,7 @@ class DiscoverySettingsFragment @Inject constructor( super.onResume() (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.settings_discovery_category) - //If some 3pids are pending, we can try to check if they have been verified here + // If some 3pids are pending, we can try to check if they have been verified here viewModel.handle(DiscoverySettingsAction.Refresh) } @@ -96,7 +96,7 @@ class DiscoverySettingsFragment @Inject constructor( if (Activity.RESULT_OK == resultCode) { viewModel.handle(DiscoverySettingsAction.RetrieveBinding) } else { - //add some error? + // add some error? } } @@ -135,12 +135,12 @@ class DiscoverySettingsFragment @Inject constructor( } override fun onTapChangeIdentityServer() = withState(viewModel) { state -> - //we should prompt if there are bound items with current is + // we should prompt if there are bound items with current is val pidList = state.emailList().orEmpty() + state.phoneNumbersList().orEmpty() val hasBoundIds = pidList.any { it.isShared() == SharedState.SHARED } if (hasBoundIds) { - //we should prompt + // we should prompt AlertDialog.Builder(requireActivity()) .setTitle(R.string.change_identity_server) .setMessage(getString(R.string.settings_discovery_disconnect_with_bound_pid, state.identityServer(), state.identityServer())) @@ -154,13 +154,13 @@ class DiscoverySettingsFragment @Inject constructor( } override fun onTapDisconnectIdentityServer() { - //we should prompt if there are bound items with current is + // we should prompt if there are bound items with current is withState(viewModel) { state -> val pidList = state.emailList().orEmpty() + state.phoneNumbersList().orEmpty() val hasBoundIds = pidList.any { it.isShared() == SharedState.SHARED } if (hasBoundIds) { - //we should prompt + // we should prompt AlertDialog.Builder(requireActivity()) .setTitle(R.string.disconnect_identity_server) .setMessage(getString(R.string.settings_discovery_disconnect_with_bound_pid, state.identityServer(), state.identityServer())) diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt index 4eb184117b..dcad4c644a 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt @@ -402,7 +402,6 @@ class DiscoverySettingsViewModel @AssistedInject constructor( } } }) - } private fun refreshPendingEmailBindings() = withState { state -> diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt index 9a40ab4f7a..e22c3466a5 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt @@ -41,7 +41,6 @@ abstract class SettingsEditTextItem : EpoxyModelWithHolder() { var itemClickListener: View.OnClickListener? = null override fun bind(holder: Holder) { - if (titleResId != null) { holder.titleText.setText(titleResId!!) } else { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt index 6574c796ba..90a1a9ef99 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt @@ -128,7 +128,7 @@ abstract class SettingsTextButtonSingleLineItem : EpoxyModelWithHolder { holder.mainButton.isVisible = false holder.switchButton.isVisible = true - //set to null before changing the state + // set to null before changing the state holder.switchButton.setOnCheckedChangeListener(null) checked?.let { holder.switchButton.isChecked = it } holder.switchButton.setOnCheckedChangeListener(switchChangeListener) @@ -136,7 +136,6 @@ abstract class SettingsTextButtonSingleLineItem : EpoxyModelWithHolder { holder.textView.setCompoundDrawables(null, null, null, null) diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt index ffb4b94870..91af7f2a93 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt @@ -106,7 +106,6 @@ class SetIdentityServerFragment @Inject constructor( return@setOnEditorActionListener false } - viewModel.observeViewEvents { when (it) { is SetIdentityServerViewEvents.NoTerms -> { @@ -140,7 +139,7 @@ class SetIdentityServerFragment @Inject constructor( if (Activity.RESULT_OK == resultCode) { processIdentityServerChange() } else { - //add some error? + // add some error? } } super.onActivityResult(requestCode, resultCode, data) diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt index 4d80166691..2037a5629c 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt @@ -115,14 +115,14 @@ class SetIdentityServerViewModel @AssistedInject constructor( baseUrl, object : MatrixCallback { override fun onSuccess(data: GetTermsResponse) { - //has all been accepted? + // has all been accepted? setState { copy(isVerifyingServer = false) } val resp = data.serverResponse val tos = resp.getLocalizedTerms(userLanguage) if (tos.isEmpty()) { - //prompt do not define policy + // prompt do not define policy _viewEvents.post(SetIdentityServerViewEvents.NoTerms) } else { val shouldPrompt = tos.any { !data.alreadyAcceptedTermUrls.contains(it.localizedUrl) } diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt index 224c6d4b19..07ec0e4ca2 100644 --- a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt @@ -71,5 +71,9 @@ interface Navigator { fun openBigImageViewer(activity: Activity, sharedElement: View?, matrixItem: MatrixItem) - fun openTerms(fragment: Fragment,serviceType: TermsService.ServiceType, baseUrl: String, token: String?, requestCode : Int = ReviewTermsActivity.TERMS_REQUEST_CODE) + fun openTerms(fragment: Fragment, + serviceType: TermsService.ServiceType, + baseUrl: String, + token: String?, + requestCode: Int = ReviewTermsActivity.TERMS_REQUEST_CODE) } diff --git a/vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt b/vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt index 36fc3291ec..daec58a26b 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt +++ b/vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt @@ -46,7 +46,7 @@ class TermsController @Inject constructor() : TypedEpoxyController>() } } } - //TODO error mgmt + // TODO error mgmt } interface Listener {