From 0345ca47dddd778c4975b8defeee00c175cdaad7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 13 Oct 2020 14:35:33 +0200 Subject: [PATCH 1/6] protected --- .../main/java/im/vector/app/core/platform/VectorBaseFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt index 4ce4d210b0..f221c29215 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt @@ -58,7 +58,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector { // Butterknife unbinder private var mUnBinder: Unbinder? = null - val vectorBaseActivity: VectorBaseActivity by lazy { + protected val vectorBaseActivity: VectorBaseActivity by lazy { activity as VectorBaseActivity } From ca99a52545c565b37a610498ccd9df7df9d1b94d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 13 Oct 2020 14:40:23 +0200 Subject: [PATCH 2/6] Remove dead code --- vector/src/main/AndroidManifest.xml | 2 - .../im/vector/app/core/di/ScreenComponent.kt | 4 - .../media/ImageMediaViewerActivity.kt | 256 ------------------ .../media/VideoMediaViewerActivity.kt | 115 -------- .../layout/activity_image_media_viewer.xml | 62 ----- .../layout/activity_video_media_viewer.xml | 71 ----- 6 files changed, 510 deletions(-) delete mode 100644 vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt delete mode 100644 vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt delete mode 100644 vector/src/main/res/layout/activity_image_media_viewer.xml delete mode 100644 vector/src/main/res/layout/activity_video_media_viewer.xml diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index 23e483f50b..c905f83113 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -92,7 +92,6 @@ - - diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt index 17ec00952b..fde40f9195 100644 --- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt +++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt @@ -51,9 +51,7 @@ import im.vector.app.features.invite.VectorInviteView import im.vector.app.features.link.LinkHandlerActivity import im.vector.app.features.login.LoginActivity import im.vector.app.features.media.BigImageViewerActivity -import im.vector.app.features.media.ImageMediaViewerActivity import im.vector.app.features.media.VectorAttachmentViewerActivity -import im.vector.app.features.media.VideoMediaViewerActivity import im.vector.app.features.navigation.Navigator import im.vector.app.features.permalink.PermalinkHandlerActivity import im.vector.app.features.pin.PinLocker @@ -125,10 +123,8 @@ interface ScreenComponent { fun inject(activity: MainActivity) fun inject(activity: RoomDirectoryActivity) fun inject(activity: BugReportActivity) - fun inject(activity: ImageMediaViewerActivity) fun inject(activity: FilteredRoomsActivity) fun inject(activity: CreateRoomActivity) - fun inject(activity: VideoMediaViewerActivity) fun inject(activity: CreateDirectRoomActivity) fun inject(activity: IncomingShareActivity) fun inject(activity: SoftLogoutActivity) diff --git a/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt deleted file mode 100644 index fa7f397b8f..0000000000 --- a/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright 2019 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package im.vector.app.features.media - -import android.content.Context -import android.content.Intent -import android.graphics.drawable.Drawable -import android.os.Bundle -import android.view.MenuItem -import android.view.View -import android.view.ViewTreeObserver -import androidx.appcompat.widget.Toolbar -import androidx.core.net.toUri -import androidx.core.transition.addListener -import androidx.core.view.ViewCompat -import androidx.core.view.isInvisible -import androidx.core.view.isVisible -import androidx.transition.Transition -import com.bumptech.glide.load.DataSource -import com.bumptech.glide.load.engine.GlideException -import com.bumptech.glide.request.RequestListener -import com.bumptech.glide.request.target.Target -import com.github.piasy.biv.indicator.progresspie.ProgressPieIndicator -import com.github.piasy.biv.view.GlideImageViewFactory -import im.vector.app.R -import im.vector.app.core.di.ScreenComponent -import im.vector.app.core.glide.GlideApp -import im.vector.app.core.intent.getMimeTypeFromUri -import im.vector.app.core.platform.VectorBaseActivity -import im.vector.app.core.utils.shareMedia -import org.matrix.android.sdk.api.MatrixCallback -import org.matrix.android.sdk.api.session.Session -import org.matrix.android.sdk.api.session.file.FileService -import kotlinx.android.synthetic.main.activity_image_media_viewer.* -import timber.log.Timber -import java.io.File -import javax.inject.Inject - -class ImageMediaViewerActivity : VectorBaseActivity() { - - @Inject lateinit var session: Session - @Inject lateinit var imageContentRenderer: ImageContentRenderer - - private lateinit var mediaData: ImageContentRenderer.Data - - override fun injectWith(injector: ScreenComponent) { - injector.inject(this) - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(im.vector.app.R.layout.activity_image_media_viewer) - - if (intent.hasExtra(EXTRA_MEDIA_DATA)) { - mediaData = intent.getParcelableExtra(EXTRA_MEDIA_DATA)!! - } else { - finish() - } - - intent.extras?.getString(EXTRA_SHARED_TRANSITION_NAME)?.let { - ViewCompat.setTransitionName(imageTransitionView, it) - } - - if (mediaData.url.isNullOrEmpty()) { - supportFinishAfterTransition() - return - } - - configureToolbar(imageMediaViewerToolbar, mediaData) - - if (isFirstCreation() && addTransitionListener()) { - // Encrypted image - imageTransitionView.isVisible = true - imageMediaViewerImageView.isVisible = false - encryptedImageView.isVisible = false - // Postpone transaction a bit until thumbnail is loaded - supportPostponeEnterTransition() - - // We are not passing the exact same image that in the - imageContentRenderer.renderFitTarget(mediaData, ImageContentRenderer.Mode.THUMBNAIL, imageTransitionView) { - // Proceed with transaction - scheduleStartPostponedTransition(imageTransitionView) - } - } else { - imageTransitionView.isVisible = false - - if (mediaData.elementToDecrypt != null) { - // Encrypted image - imageMediaViewerImageView.isVisible = false - encryptedImageView.isVisible = true - - GlideApp - .with(this) - .load(mediaData) - .dontAnimate() - .into(encryptedImageView) - } else { - // Clear image - imageMediaViewerImageView.isVisible = true - encryptedImageView.isVisible = false - - imageMediaViewerImageView.setImageViewFactory(GlideImageViewFactory()) - imageMediaViewerImageView.setProgressIndicator(ProgressPieIndicator()) - imageContentRenderer.render(mediaData, imageMediaViewerImageView) - } - } - } - - override fun getMenuRes() = R.menu.vector_media_viewer - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.mediaViewerShareAction -> { - onShareActionClicked() - return true - } - } - return super.onOptionsItemSelected(item) - } - - private fun onShareActionClicked() { - session.fileService().downloadFile( - downloadMode = FileService.DownloadMode.FOR_EXTERNAL_SHARE, - id = mediaData.eventId, - fileName = mediaData.filename, - mimeType = mediaData.mimeType, - url = mediaData.url, - elementToDecrypt = mediaData.elementToDecrypt, - callback = object : MatrixCallback { - override fun onSuccess(data: File) { - shareMedia(this@ImageMediaViewerActivity, data, getMimeTypeFromUri(this@ImageMediaViewerActivity, data.toUri())) - } - } - ) - } - - private fun configureToolbar(toolbar: Toolbar, mediaData: ImageContentRenderer.Data) { - setSupportActionBar(toolbar) - supportActionBar?.apply { - title = mediaData.filename - setHomeButtonEnabled(true) - setDisplayHomeAsUpEnabled(true) - } - } - - override fun onBackPressed() { - // show again for exit animation - imageTransitionView.isVisible = true - super.onBackPressed() - } - - private fun scheduleStartPostponedTransition(sharedElement: View) { - sharedElement.viewTreeObserver.addOnPreDrawListener( - object : ViewTreeObserver.OnPreDrawListener { - override fun onPreDraw(): Boolean { - sharedElement.viewTreeObserver.removeOnPreDrawListener(this) - supportStartPostponedEnterTransition() - return true - } - }) - } - - /** - * Try and add a [Transition.TransitionListener] to the entering shared element - * [Transition]. We do this so that we can load the full-size image after the transition - * has completed. - * - * @return true if we were successful in adding a listener to the enter transition - */ - private fun addTransitionListener(): Boolean { - val transition = window.sharedElementEnterTransition - - if (transition != null) { - // There is an entering shared element transition so add a listener to it - transition.addListener( - onEnd = { - if (mediaData.elementToDecrypt != null) { - // Encrypted image - GlideApp - .with(this) - .load(mediaData) - .dontAnimate() - .listener(object : RequestListener { - override fun onLoadFailed(e: GlideException?, - model: Any?, - target: Target?, - isFirstResource: Boolean): Boolean { - // TODO ? - Timber.e("TRANSITION onLoadFailed") - imageMediaViewerImageView.isVisible = false - encryptedImageView.isVisible = true - return false - } - - override fun onResourceReady(resource: Drawable?, - model: Any?, - target: Target?, - dataSource: DataSource?, - isFirstResource: Boolean): Boolean { - Timber.e("TRANSITION onResourceReady") - imageTransitionView.isInvisible = true - imageMediaViewerImageView.isVisible = false - encryptedImageView.isVisible = true - return false - } - }) - .into(encryptedImageView) - } else { - imageTransitionView.isInvisible = true - // Clear image - imageMediaViewerImageView.isVisible = true - encryptedImageView.isVisible = false - - imageMediaViewerImageView.setImageViewFactory(GlideImageViewFactory()) - imageMediaViewerImageView.setProgressIndicator(ProgressPieIndicator()) - imageContentRenderer.render(mediaData, imageMediaViewerImageView) - } - }, - onCancel = { - // Something to do? - } - ) - return true - } - - // If we reach here then we have not added a listener - return false - } - - companion object { - - private const val EXTRA_MEDIA_DATA = "EXTRA_MEDIA_DATA" - private const val EXTRA_SHARED_TRANSITION_NAME = "EXTRA_SHARED_TRANSITION_NAME" - - fun newIntent(context: Context, mediaData: ImageContentRenderer.Data, shareTransitionName: String?): Intent { - return Intent(context, ImageMediaViewerActivity::class.java).apply { - putExtra(EXTRA_MEDIA_DATA, mediaData) - putExtra(EXTRA_SHARED_TRANSITION_NAME, shareTransitionName) - } - } - } -} diff --git a/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt deleted file mode 100644 index 5bdda9b0be..0000000000 --- a/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2019 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package im.vector.app.features.media - -import android.content.Context -import android.content.Intent -import android.os.Bundle -import android.view.MenuItem -import androidx.appcompat.widget.Toolbar -import androidx.core.net.toUri -import im.vector.app.R -import im.vector.app.core.di.ScreenComponent -import im.vector.app.core.intent.getMimeTypeFromUri -import im.vector.app.core.platform.VectorBaseActivity -import im.vector.app.core.utils.shareMedia -import org.matrix.android.sdk.api.MatrixCallback -import org.matrix.android.sdk.api.session.Session -import org.matrix.android.sdk.api.session.file.FileService -import kotlinx.android.synthetic.main.activity_video_media_viewer.* -import java.io.File -import javax.inject.Inject - -class VideoMediaViewerActivity : VectorBaseActivity() { - - @Inject lateinit var session: Session - @Inject lateinit var imageContentRenderer: ImageContentRenderer - @Inject lateinit var videoContentRenderer: VideoContentRenderer - - private lateinit var mediaData: VideoContentRenderer.Data - - override fun injectWith(injector: ScreenComponent) { - injector.inject(this) - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(im.vector.app.R.layout.activity_video_media_viewer) - - if (intent.hasExtra(EXTRA_MEDIA_DATA)) { - mediaData = intent.getParcelableExtra(EXTRA_MEDIA_DATA)!! - - configureToolbar(videoMediaViewerToolbar, mediaData) - imageContentRenderer.render(mediaData.thumbnailMediaData, ImageContentRenderer.Mode.FULL_SIZE, videoMediaViewerThumbnailView) - videoContentRenderer.render(mediaData, - videoMediaViewerThumbnailView, - videoMediaViewerLoading, - videoMediaViewerVideoView, - videoMediaViewerErrorView) - } else { - finish() - } - } - - override fun getMenuRes() = R.menu.vector_media_viewer - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.mediaViewerShareAction -> { - onShareActionClicked() - return true - } - } - return super.onOptionsItemSelected(item) - } - - private fun onShareActionClicked() { - session.fileService().downloadFile( - downloadMode = FileService.DownloadMode.FOR_EXTERNAL_SHARE, - id = mediaData.eventId, - fileName = mediaData.filename, - mimeType = mediaData.mimeType, - url = mediaData.url, - elementToDecrypt = mediaData.elementToDecrypt, - callback = object : MatrixCallback { - override fun onSuccess(data: File) { - shareMedia(this@VideoMediaViewerActivity, data, getMimeTypeFromUri(this@VideoMediaViewerActivity, data.toUri())) - } - } - ) - } - - private fun configureToolbar(toolbar: Toolbar, mediaData: VideoContentRenderer.Data) { - setSupportActionBar(toolbar) - supportActionBar?.apply { - title = mediaData.filename - setHomeButtonEnabled(true) - setDisplayHomeAsUpEnabled(true) - } - } - - companion object { - - private const val EXTRA_MEDIA_DATA = "EXTRA_MEDIA_DATA" - - fun newIntent(context: Context, mediaData: VideoContentRenderer.Data): Intent { - return Intent(context, VideoMediaViewerActivity::class.java).apply { - putExtra(EXTRA_MEDIA_DATA, mediaData) - } - } - } -} diff --git a/vector/src/main/res/layout/activity_image_media_viewer.xml b/vector/src/main/res/layout/activity_image_media_viewer.xml deleted file mode 100644 index cfcfa6702b..0000000000 --- a/vector/src/main/res/layout/activity_image_media_viewer.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vector/src/main/res/layout/activity_video_media_viewer.xml b/vector/src/main/res/layout/activity_video_media_viewer.xml deleted file mode 100644 index c68577bcd5..0000000000 --- a/vector/src/main/res/layout/activity_video_media_viewer.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file From ff56414695f9a4c4988b32eddd12d58fc2f28c28 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 13 Oct 2020 14:44:04 +0200 Subject: [PATCH 3/6] Cleanup and log onResume and onPause for VectorAttachmentViewerActivity --- .../vector/app/core/platform/VectorBaseActivity.kt | 8 ++++---- .../platform/VectorBaseBottomSheetDialogFragment.kt | 2 +- .../vector/app/core/platform/VectorBaseFragment.kt | 6 +++--- .../features/media/VectorAttachmentViewerActivity.kt | 12 +++++++++++- .../features/settings/VectorSettingsBaseFragment.kt | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt index cdba5b2ef2..79021902c4 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt @@ -177,7 +177,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector { } override fun onCreate(savedInstanceState: Bundle?) { - Timber.i("onCreate Activity ${this.javaClass.simpleName}") + Timber.i("onCreate Activity ${javaClass.simpleName}") val vectorComponent = getVectorComponent() screenComponent = DaggerScreenComponent.factory().create(vectorComponent, this) val timeForInjection = measureTimeMillis { @@ -305,7 +305,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector { override fun onDestroy() { super.onDestroy() - Timber.i("onDestroy Activity ${this.javaClass.simpleName}") + Timber.i("onDestroy Activity ${javaClass.simpleName}") unBinder?.unbind() unBinder = null @@ -333,7 +333,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector { override fun onResume() { super.onResume() - Timber.i("onResume Activity ${this.javaClass.simpleName}") + Timber.i("onResume Activity ${javaClass.simpleName}") configurationViewModel.onActivityResumed() @@ -373,7 +373,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector { override fun onPause() { super.onPause() - Timber.i("onPause Activity ${this.javaClass.simpleName}") + Timber.i("onPause Activity ${javaClass.simpleName}") rageShake.stop() diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt index 9f4924ebb2..4a251de1a3 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt @@ -141,7 +141,7 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment() override fun onResume() { super.onResume() - Timber.i("onResume BottomSheet ${this.javaClass.simpleName}") + Timber.i("onResume BottomSheet ${javaClass.simpleName}") } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt index f221c29215..179e21a6d8 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt @@ -112,7 +112,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector { } final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - Timber.i("onCreateView Fragment ${this.javaClass.simpleName}") + Timber.i("onCreateView Fragment ${javaClass.simpleName}") return inflater.inflate(getLayoutResId(), container, false) } @@ -122,7 +122,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector { @CallSuper override fun onResume() { super.onResume() - Timber.i("onResume Fragment ${this.javaClass.simpleName}") + Timber.i("onResume Fragment ${javaClass.simpleName}") } @CallSuper @@ -142,7 +142,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector { @CallSuper override fun onDestroyView() { super.onDestroyView() - Timber.i("onDestroyView Fragment ${this.javaClass.simpleName}") + Timber.i("onDestroyView Fragment ${javaClass.simpleName}") mUnBinder?.unbind() mUnBinder = null uiDisposables.clear() diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt index 74f4c7148f..9302be502d 100644 --- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt @@ -74,7 +74,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - Timber.i("onCreate Activity ${this.javaClass.simpleName}") + Timber.i("onCreate Activity ${javaClass.simpleName}") val vectorComponent = getVectorComponent() screenComponent = DaggerScreenComponent.factory().create(vectorComponent, this) val timeForInjection = measureTimeMillis { @@ -154,6 +154,16 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen window.navigationBarColor = ContextCompat.getColor(this, R.color.black_alpha) } + override fun onResume() { + super.onResume() + Timber.i("onResume Activity ${javaClass.simpleName}") + } + + override fun onPause() { + super.onPause() + Timber.i("onPause Activity ${javaClass.simpleName}") + } + private fun getOtherThemes() = ActivityOtherThemes.VectorAttachmentsPreview override fun shouldAnimateDismiss(): Boolean { diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt index 512545afe2..add6fba38c 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt @@ -70,7 +70,7 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScree override fun onResume() { super.onResume() - Timber.i("onResume Fragment ${this.javaClass.simpleName}") + Timber.i("onResume Fragment ${javaClass.simpleName}") vectorActivity.supportActionBar?.setTitle(titleRes) // find the view from parent activity mLoadingView = vectorActivity.findViewById(R.id.vector_settings_spinner_views) From ede5bb0e90b4fad3fd6b72eb0baa5f610a639f3d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 13 Oct 2020 14:57:45 +0200 Subject: [PATCH 4/6] Format files, in particular align `->` --- .idea/codeStyles/Project.xml | 11 +-- .../matrix/android/sdk/api/MatrixCallback.kt | 2 +- .../android/sdk/api/failure/MatrixError.kt | 36 +++++++ .../android/sdk/api/pushrules/Action.kt | 14 +-- .../android/sdk/api/raw/RawCacheStrategy.kt | 6 +- .../api/session/call/CallSignalingService.kt | 2 +- .../android/sdk/api/session/call/MxCall.kt | 1 + .../sdk/api/session/crypto/CryptoService.kt | 8 +- .../crypto/keysbackup/KeysBackupService.kt | 2 +- .../crypto/keysbackup/KeysBackupState.kt | 8 ++ .../keyshare/GossipingRequestListener.kt | 2 +- .../crypto/verification/VerificationMethod.kt | 2 + .../sdk/api/session/events/model/Event.kt | 1 + .../api/session/events/model/RelationType.kt | 3 + .../events/model/UnsignedRelationInfo.kt | 2 +- .../IntegrationManagerConfig.kt | 2 + .../room/members/ChangeMembershipState.kt | 2 +- .../session/room/model/PollSummaryContent.kt | 2 +- .../room/model/RoomGuestAccessContent.kt | 1 + .../room/model/RoomHistoryVisibility.kt | 3 + .../room/model/message/MessageAudioContent.kt | 4 +- .../room/model/message/MessageImageContent.kt | 4 +- .../model/message/MessageStickerContent.kt | 4 +- .../session/room/model/message/MessageType.kt | 1 + .../room/model/message/MessageVideoContent.kt | 4 +- .../sdk/api/session/room/send/SendState.kt | 7 ++ .../sdk/api/session/room/timeline/Timeline.kt | 1 + .../session/room/timeline/TimelineService.kt | 2 +- .../sdk/api/session/sync/FilterService.kt | 1 + .../matrix/android/sdk/api/util/Optional.kt | 2 +- .../sdk/internal/crypto/CryptoConstants.kt | 1 + .../internal/crypto/GossipingRequestState.kt | 3 +- .../crypto/MXMegolmExportEncryption.kt | 1 + .../crypto/OutgoingGossipingRequestManager.kt | 4 +- .../crypto/algorithms/IMXDecrypting.kt | 2 +- .../algorithms/megolm/MXMegolmDecryption.kt | 2 +- .../crypto/crosssigning/ShieldTrustUpdater.kt | 2 +- .../model/OlmInboundGroupSessionWrapper2.kt | 1 + .../model/event/RoomKeyWithHeldContent.kt | 4 + .../crypto/store/SavedKeyBackupKeyInfo.kt | 2 +- .../crypto/store/db/model/OlmSessionEntity.kt | 8 +- ...tgoingSASDefaultVerificationTransaction.kt | 6 +- .../DefaultVerificationTransaction.kt | 2 +- .../SASDefaultVerificationTransaction.kt | 4 + .../VerificationTransportRoomMessage.kt | 4 +- .../sdk/internal/database/RealmKeysUtils.kt | 2 +- .../sdk/internal/database/RealmQueryLatch.kt | 4 +- .../internal/database/model/ChunkEntity.kt | 4 +- .../sdk/internal/database/model/SyncEntity.kt | 2 +- .../EventAnnotationsSummaryEntityQuery.kt | 1 + .../riot/HomeServerConnectionConfig.java | 2 +- .../legacy/riot/WellKnownManagerConfig.kt | 2 +- .../internal/network/UnitConverterFactory.kt | 18 ++-- .../sdk/internal/raw/DefaultGetUrlTask.kt | 4 +- .../session/content/ImageCompressor.kt | 12 +-- .../session/content/UploadContentWorker.kt | 2 +- .../session/profile/AddThreePidTask.kt | 2 +- .../membership/RoomDisplayNameResolver.kt | 6 +- .../session/room/send/DefaultSendService.kt | 2 +- .../room/send/LocalEchoEventFactory.kt | 2 +- .../session/room/send/MarkdownParser.kt | 6 +- .../session/room/timeline/DefaultTimeline.kt | 8 +- .../room/timeline/TimelineEventDecryptor.kt | 1 + .../room/typing/DefaultTypingService.kt | 1 + .../session/sync/ReadReceiptHandler.kt | 6 +- .../internal/session/sync/RoomTagHandler.kt | 2 +- .../widgets/DefaultWidgetPostAPIMediator.kt | 1 + .../im/vector/app/EmojiCompatFontProvider.kt | 2 +- .../java/im/vector/app/EmojiCompatWrapper.kt | 2 +- .../dialogs/UnrecognizedCertificateDialog.kt | 12 +-- .../app/core/epoxy/VectorEpoxyHolder.kt | 2 +- .../bottomsheet/BottomSheetActionItem.kt | 7 ++ .../BottomSheetMessagePreviewItem.kt | 5 + .../BottomSheetQuickReactionsItem.kt | 3 + .../bottomsheet/BottomSheetSendStateItem.kt | 2 + .../epoxy/profiles/BaseProfileMatrixItem.kt | 1 + .../core/epoxy/profiles/ProfileActionItem.kt | 1 + .../core/epoxy/profiles/ProfileSectionItem.kt | 2 +- .../vector/app/core/error/ErrorFormatter.kt | 24 ++--- .../im/vector/app/core/files/FileSaver.kt | 18 ++-- .../app/core/glide/VectorGlideModelLoader.kt | 2 +- .../app/core/intent/ExternalIntentAnalyser.kt | 2 +- .../vector/app/core/linkify/VectorLinkify.kt | 2 +- .../app/core/platform/CheckableFrameLayout.kt | 6 +- .../VectorBaseBottomSheetDialogFragment.kt | 2 +- .../app/core/resources/DrawableProvider.kt | 1 + .../app/core/ui/views/PasswordStrengthBar.kt | 4 + .../preview/AttachmentPreviewItems.kt | 2 + .../preview/AttachmentsPreviewAction.kt | 4 +- .../preview/AttachmentsPreviewFragment.kt | 2 +- .../autocomplete/RecyclerViewPresenter.kt | 1 + .../command/AutocompleteCommandItem.kt | 3 + .../command/CommandAutocompletePolicy.kt | 2 +- .../app/features/call/SdpObserverAdapter.kt | 2 +- .../call/WebRtcPeerConnectionManager.kt | 2 +- .../app/features/command/ParsedCommand.kt | 2 +- .../contactsbook/ContactsBookViewModel.kt | 2 +- .../createdirect/CreateDirectRoomActivity.kt | 4 +- .../createdirect/CreateDirectRoomViewModel.kt | 2 +- .../createdirect/CreateDirectRoomViewState.kt | 2 +- .../KeysBackupRestoreSuccessFragment.kt | 1 + .../recover/BootstrapSharedViewModel.kt | 4 +- .../crypto/recover/BootstrapViewEvents.kt | 4 +- .../VerificationConclusionController.kt | 4 +- .../BottomSheetVerificationActionItem.kt | 4 + .../request/VerificationRequestController.kt | 4 +- .../app/features/home/LoadingFragment.kt | 2 +- .../app/features/home/RoomListDisplayMode.kt | 10 +- .../home/room/detail/RoomDetailAction.kt | 8 +- .../home/room/detail/RoomDetailFragment.kt | 4 +- .../home/room/detail/RoomDetailViewEvents.kt | 15 +-- .../home/room/detail/RoomDetailViewModel.kt | 98 +++++++++---------- .../home/room/detail/RoomDetailViewState.kt | 1 + .../room/detail/composer/TextComposerView.kt | 7 ++ .../home/room/detail/search/SearchFragment.kt | 2 +- .../room/detail/search/SearchViewModel.kt | 4 +- .../action/MessageSharedActionViewModel.kt | 2 +- .../timeline/factory/TimelineItemFactory.kt | 16 +-- .../format/DisplayableEventFormatter.kt | 10 +- .../timeline/format/NoticeEventFormatter.kt | 2 +- .../timeline/item/AbsBaseMessageItem.kt | 2 + .../detail/timeline/item/BaseEventItem.kt | 1 + .../timeline/item/MessageBlockCodeItem.kt | 1 + .../timeline/item/MessageImageVideoItem.kt | 5 + .../timeline/item/MessageInformationData.kt | 4 +- .../detail/timeline/item/MessageTextItem.kt | 3 + .../reactions/ReactionInfoSimpleItem.kt | 3 + .../home/room/detail/widget/RoomWidgetItem.kt | 1 + .../room/list/RoomListDisplayModeFilter.kt | 4 +- .../home/room/list/RoomListFragment.kt | 18 ++-- .../home/room/list/RoomListViewModel.kt | 8 +- .../home/room/list/RoomListViewState.kt | 4 +- .../home/room/list/RoomSummaryItem.kt | 2 + .../invite/InviteUsersToRoomActivity.kt | 2 +- .../invite/InviteUsersToRoomViewEvents.kt | 2 +- .../vector/app/features/login/LoginAction.kt | 1 + .../im/vector/app/features/login/SignMode.kt | 3 + .../features/media/ImageContentRenderer.kt | 5 +- .../features/notifications/NotifiableEvent.kt | 3 + .../NotificationDrawerManager.kt | 4 +- .../notifications/RoomEventGroupInfo.kt | 1 + .../app/features/roomdirectory/JoinState.kt | 1 + .../features/roomprofile/RoomProfileAction.kt | 4 +- .../roomprofile/RoomProfileViewModel.kt | 8 +- .../banned/RoomBannedMemberListFragment.kt | 2 +- .../settings/RoomSettingsViewModel.kt | 4 +- .../uploads/RoomUploadsFragment.kt | 4 +- .../uploads/media/UploadsVideoItem.kt | 6 +- .../settings/VectorSettingsActivity.kt | 4 +- ...ttingsNotificationsTroubleshootFragment.kt | 14 +-- .../VectorSettingsSecurityPrivacyFragment.kt | 2 +- .../threepids/ThreePidsSettingsController.kt | 4 +- .../threepids/ThreePidsSettingsFragment.kt | 2 +- .../threepids/ThreePidsSettingsViewModel.kt | 12 +-- ...ficationTroubleshootRecyclerViewAdapter.kt | 12 ++- .../troubleshoot/TestAccountSettings.kt | 16 +-- .../features/share/IncomingShareFragment.kt | 4 +- .../vector/app/features/share/SharedData.kt | 6 +- .../app/features/widgets/WidgetViewEvents.kt | 2 +- .../RoomWidgetPermissionActions.kt | 6 +- .../SignOutBottomSheetDialogFragment.kt | 4 +- 161 files changed, 477 insertions(+), 325 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 89a7c466fd..b3719669fd 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -4,16 +4,7 @@ -