ktlint cleanup

This commit is contained in:
Benoit Marty 2020-10-07 19:10:53 +02:00
parent f7e040efd2
commit 573ec29829
11 changed files with 5 additions and 13 deletions

View file

@ -16,7 +16,6 @@
package im.vector.lib.multipicker package im.vector.lib.multipicker
import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri

View file

@ -22,7 +22,6 @@ import com.google.firebase.iid.FirebaseInstanceId
import im.vector.app.R import im.vector.app.R
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.utils.startAddGoogleAccountIntent import im.vector.app.core.utils.startAddGoogleAccountIntent
import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
import im.vector.app.features.settings.troubleshoot.TroubleshootTest import im.vector.app.features.settings.troubleshoot.TroubleshootTest
import im.vector.app.push.fcm.FcmHelper import im.vector.app.push.fcm.FcmHelper
import timber.log.Timber import timber.log.Timber

View file

@ -37,7 +37,6 @@ import androidx.browser.customtabs.CustomTabsSession
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import androidx.fragment.app.Fragment
import im.vector.app.BuildConfig import im.vector.app.BuildConfig
import im.vector.app.R import im.vector.app.R
import im.vector.app.features.notifications.NotificationUtils import im.vector.app.features.notifications.NotificationUtils

View file

@ -16,7 +16,6 @@
package im.vector.app.features.crypto.keysbackup.setup package im.vector.app.features.crypto.keysbackup.setup
import android.app.Activity import android.app.Activity
import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View

View file

@ -17,7 +17,6 @@ package im.vector.app.features.crypto.verification
import android.app.Activity import android.app.Activity
import android.app.Dialog import android.app.Dialog
import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable import android.os.Parcelable
import android.view.KeyEvent import android.view.KeyEvent

View file

@ -36,7 +36,6 @@ import org.matrix.android.sdk.api.session.identity.SharedState
import org.matrix.android.sdk.api.session.identity.ThreePid import org.matrix.android.sdk.api.session.identity.ThreePid
import org.matrix.android.sdk.api.session.terms.TermsService import org.matrix.android.sdk.api.session.terms.TermsService
import kotlinx.android.synthetic.main.fragment_generic_recycler.* import kotlinx.android.synthetic.main.fragment_generic_recycler.*
import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
class DiscoverySettingsFragment @Inject constructor( class DiscoverySettingsFragment @Inject constructor(

View file

@ -361,7 +361,7 @@ class RoomDetailFragment @Inject constructor(
}.exhaustive }.exhaustive
} }
if(savedInstanceState == null) { if (savedInstanceState == null) {
handleShareData() handleShareData()
} }
} }
@ -798,7 +798,6 @@ class RoomDetailFragment @Inject constructor(
} }
} }
private fun safeStartCall2(isVideoCall: Boolean) { private fun safeStartCall2(isVideoCall: Boolean) {
val startCallAction = RoomDetailAction.StartCall(isVideoCall) val startCallAction = RoomDetailAction.StartCall(isVideoCall)
roomDetailViewModel.pendingAction = startCallAction roomDetailViewModel.pendingAction = startCallAction

View file

@ -24,7 +24,6 @@ import androidx.activity.result.ActivityResultLauncher
import androidx.core.util.Pair import androidx.core.util.Pair
import im.vector.app.features.crypto.recover.SetupMode import im.vector.app.features.crypto.recover.SetupMode
import im.vector.app.features.media.AttachmentData import im.vector.app.features.media.AttachmentData
import im.vector.app.features.pin.PinActivity
import im.vector.app.features.pin.PinMode import im.vector.app.features.pin.PinMode
import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
import im.vector.app.features.settings.VectorSettingsActivity import im.vector.app.features.settings.VectorSettingsActivity

View file

@ -279,7 +279,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
session.integrationManagerService().removeListener(integrationServiceListener) session.integrationManagerService().removeListener(integrationServiceListener)
} }
private val attachmentPhotoActivityResultLauncher = registerStartForActivityResult {activityResult -> private val attachmentPhotoActivityResultLauncher = registerStartForActivityResult { activityResult ->
if (activityResult.resultCode == Activity.RESULT_OK) { if (activityResult.resultCode == Activity.RESULT_OK) {
avatarCameraUri?.let { uri -> avatarCameraUri?.let { uri ->
MultiPicker.get(MultiPicker.CAMERA) MultiPicker.get(MultiPicker.CAMERA)
@ -291,7 +291,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
} }
} }
private val attachmentImageActivityResultLauncher = registerStartForActivityResult {activityResult -> private val attachmentImageActivityResultLauncher = registerStartForActivityResult { activityResult ->
val data = activityResult.data ?: return@registerStartForActivityResult val data = activityResult.data ?: return@registerStartForActivityResult
if (activityResult.resultCode == Activity.RESULT_OK) { if (activityResult.resultCode == Activity.RESULT_OK) {
MultiPicker MultiPicker

View file

@ -119,7 +119,6 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
// Noop // Noop
} }
// BackgroundSyncModeChooserDialog.InteractionListener // BackgroundSyncModeChooserDialog.InteractionListener
override fun onOptionSelected(mode: BackgroundSyncMode) { override fun onOptionSelected(mode: BackgroundSyncMode) {
// option has change, need to act // option has change, need to act

View file

@ -322,7 +322,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
private val saveMegolmStartForActivityResult = registerStartForActivityResult { private val saveMegolmStartForActivityResult = registerStartForActivityResult {
val uri = it.data?.data ?: return@registerStartForActivityResult val uri = it.data?.data ?: return@registerStartForActivityResult
if (it.resultCode == Activity.RESULT_OK) if (it.resultCode == Activity.RESULT_OK) {
ExportKeysDialog().show(requireActivity(), object : ExportKeysDialog.ExportKeyDialogListener { ExportKeysDialog().show(requireActivity(), object : ExportKeysDialog.ExportKeyDialogListener {
override fun onPassphrase(passphrase: String) { override fun onPassphrase(passphrase: String) {
displayLoadingView() displayLoadingView()
@ -347,6 +347,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
}) })
} }
}) })
}
} }
private val pinActivityResultLauncher = registerStartForActivityResult { private val pinActivityResultLauncher = registerStartForActivityResult {