diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 403a6a2951..02aecd4664 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -359,7 +359,7 @@
errorLine1=" zoomingImageView.setImageUri(requestManager, uri, contentType, () -> events.onMediaReady());"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -403,7 +403,7 @@
errorLine1=" bindToolbar(args.fromRecipientId, args.threadRecipientId, args.outgoing, args.showThread, args.date, args.messageId)"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -414,7 +414,7 @@
errorLine1=" bindTextViews(currentItem, currentState.showThread, currentState.messageBodies)"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -425,7 +425,7 @@
errorLine1=" bindTextViews(currentItem, currentState.showThread, currentState.messageBodies)"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 242b384e68..e06e19e6d1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -653,7 +653,7 @@
android:windowSoftInputMode="stateHidden" />
- if (loadState == MediaPreviewV2State.LoadState.MEDIA_READY) {
+ if (loadState == MediaPreviewState.LoadState.MEDIA_READY) {
hasMediaBeenReady = true
}
if (!isInSharedAnimation && hasMediaBeenReady) {
@@ -134,10 +134,10 @@ class MediaPreviewV2Activity : PassphraseRequiredActivity(), VoiceNoteMediaContr
if (savedInstanceState == null) {
val bundle = Bundle()
- bundle.putParcelable(MediaPreviewV2Fragment.ARGS_KEY, args)
+ bundle.putParcelable(MediaPreviewFragment.ARGS_KEY, args)
supportFragmentManager.commit {
setReorderingAllowed(true)
- add(R.id.fragment_container_view, MediaPreviewV2Fragment::class.java, bundle, FRAGMENT_TAG)
+ add(R.id.fragment_container_view, MediaPreviewFragment::class.java, bundle, FRAGMENT_TAG)
}
}
}
@@ -156,7 +156,7 @@ class MediaPreviewV2Activity : PassphraseRequiredActivity(), VoiceNoteMediaContr
}
companion object {
- private const val FRAGMENT_TAG = "media_preview_fragment_v2"
+ private const val FRAGMENT_TAG = "media_preview_fragment"
const val SHARED_ELEMENT_TRANSITION_NAME = "thumb"
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewAdapter.kt
similarity index 79%
rename from app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt
rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewAdapter.kt
index 105573e54b..bed2db01b0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewAdapter.kt
@@ -11,8 +11,8 @@ import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
import org.thoughtcrime.securesms.util.MediaUtil
import org.thoughtcrime.securesms.util.adapter.StableIdGenerator
-class MediaPreviewV2Adapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
- private val TAG = Log.tag(MediaPreviewV2Adapter::class.java)
+class MediaPreviewAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
+ private val TAG = Log.tag(MediaPreviewAdapter::class.java)
private var items: List = listOf()
private val stableIdGenerator = StableIdGenerator()
private val currentIdSet: HashSet = HashSet()
@@ -30,16 +30,16 @@ class MediaPreviewV2Adapter(fragment: Fragment) : FragmentStateAdapter(fragment)
val contentType = attachment.contentType
val args = bundleOf(
- MediaPreviewFragment.DATA_URI to attachment.displayUri,
- MediaPreviewFragment.DATA_CONTENT_TYPE to contentType,
- MediaPreviewFragment.DATA_SIZE to attachment.size,
- MediaPreviewFragment.AUTO_PLAY to attachment.videoGif,
- MediaPreviewFragment.VIDEO_GIF to attachment.videoGif
+ MediaPreviewPageFragment.DATA_URI to attachment.displayUri,
+ MediaPreviewPageFragment.DATA_CONTENT_TYPE to contentType,
+ MediaPreviewPageFragment.DATA_SIZE to attachment.size,
+ MediaPreviewPageFragment.AUTO_PLAY to attachment.videoGif,
+ MediaPreviewPageFragment.VIDEO_GIF to attachment.videoGif
)
val fragment = if (MediaUtil.isVideo(contentType)) {
- VideoMediaPreviewFragment()
+ VideoMediaPreviewPageFragment()
} else if (MediaUtil.isImageType(contentType)) {
- ImageMediaPreviewFragment()
+ ImageMediaPreviewPageFragment()
} else {
throw AssertionError("Unexpected media type: $contentType")
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.kt
index f2fa1af22a..b122c8604c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.kt
@@ -62,7 +62,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver
import org.thoughtcrime.securesms.database.MediaTable
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.databinding.FragmentMediaPreviewV2Binding
+import org.thoughtcrime.securesms.databinding.FragmentMediaPreviewBinding
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.mediapreview.caption.ExpandingCaptionView
@@ -88,19 +88,19 @@ import java.util.concurrent.TimeUnit
import kotlin.math.roundToInt
import org.signal.core.ui.R as CoreUiR
-class MediaPreviewV2Fragment :
- LoggingFragment(R.layout.fragment_media_preview_v2),
- MediaPreviewFragment.Events {
+class MediaPreviewFragment :
+ LoggingFragment(R.layout.fragment_media_preview),
+ MediaPreviewPageFragment.Events {
private val lifecycleDisposable = LifecycleDisposable()
- private val binding by ViewBinderDelegate(FragmentMediaPreviewV2Binding::bind)
- private val viewModel: MediaPreviewV2ViewModel by viewModels(ownerProducer = {
+ private val binding by ViewBinderDelegate(FragmentMediaPreviewBinding::bind)
+ private val viewModel: MediaPreviewViewModel by viewModels(ownerProducer = {
requireActivity()
})
private val debouncer = Debouncer(2, TimeUnit.SECONDS)
private val args: MediaIntentFactory.MediaPreviewArgs by lazy { MediaIntentFactory.requireArguments(requireArguments()) }
- private lateinit var pagerAdapter: MediaPreviewV2Adapter
+ private lateinit var pagerAdapter: MediaPreviewAdapter
private lateinit var albumRailAdapter: MediaRailAdapter
private lateinit var fullscreenHelper: FullscreenHelper
@@ -154,7 +154,7 @@ class MediaPreviewV2Fragment :
private fun initializeViewModel(args: MediaIntentFactory.MediaPreviewArgs) {
if (!MediaUtil.isImageType(args.initialMediaType) && !MediaUtil.isVideoType(args.initialMediaType)) {
- Log.w(TAG, "Unsupported media type sent to MediaPreviewV2Fragment, finishing.")
+ Log.w(TAG, "Unsupported media type sent to MediaPreviewFragment, finishing.")
Snackbar.make(binding.root, R.string.MediaPreviewActivity_unssuported_media_type, Snackbar.LENGTH_LONG)
.setAction(R.string.MediaPreviewActivity_dismiss_due_to_error) {
activity?.finish()
@@ -186,7 +186,7 @@ class MediaPreviewV2Fragment :
private fun initializeViewPager() {
binding.mediaPager.offscreenPageLimit = OFFSCREEN_PAGE_LIMIT_DEFAULT
binding.mediaPager.setPageTransformer(MarginPageTransformer(ViewUtil.dpToPx(24)))
- pagerAdapter = MediaPreviewV2Adapter(this)
+ pagerAdapter = MediaPreviewAdapter(this)
binding.mediaPager.adapter = pagerAdapter
binding.mediaPager.registerOnPageChangeCallback(object : OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
@@ -204,7 +204,7 @@ class MediaPreviewV2Fragment :
layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
addItemDecoration(CenterDecoration(0))
albumRailAdapter = MediaRailAdapter(
- Glide.with(this@MediaPreviewV2Fragment),
+ Glide.with(this@MediaPreviewFragment),
{ media -> jumpViewPagerToMedia(media) },
object : ImageLoadingListener() {
override fun onAllRequestsFinished() {
@@ -224,19 +224,19 @@ class MediaPreviewV2Fragment :
fullscreenHelper.showAndHideWithSystemUI(requireActivity().window, binding.toolbarLayout, binding.mediaPreviewDetailsContainer)
}
- private fun bindCurrentState(currentState: MediaPreviewV2State) {
+ private fun bindCurrentState(currentState: MediaPreviewState) {
if (currentState.position < 0 && currentState.mediaRecords.isEmpty()) {
onMediaNotAvailable()
return
}
when (currentState.loadState) {
- MediaPreviewV2State.LoadState.DATA_LOADED -> bindDataLoadedState(currentState)
- MediaPreviewV2State.LoadState.MEDIA_READY -> bindMediaReadyState(currentState)
+ MediaPreviewState.LoadState.DATA_LOADED -> bindDataLoadedState(currentState)
+ MediaPreviewState.LoadState.MEDIA_READY -> bindMediaReadyState(currentState)
else -> Unit
}
}
- private fun bindDataLoadedState(currentState: MediaPreviewV2State) {
+ private fun bindDataLoadedState(currentState: MediaPreviewState) {
val currentPosition = currentState.position
val backingItems = currentState.mediaRecords.mapNotNull { it.attachment }
@@ -260,7 +260,7 @@ class MediaPreviewV2Fragment :
* This is not available until after a page has been chosen by the ViewPager, and we receive the
* {@link OnPageChangeCallback}.
*/
- private fun bindMediaReadyState(currentState: MediaPreviewV2State) {
+ private fun bindMediaReadyState(currentState: MediaPreviewState) {
val currentPosition: Int = currentState.position
if (currentState.mediaRecords.isEmpty() || currentPosition < 0) {
onMediaNotAvailable()
@@ -272,7 +272,7 @@ class MediaPreviewV2Fragment :
childFragmentManager.fragments.forEach { fragment ->
if (fragment.tag != currentItemTag) {
- (fragment as? MediaPreviewFragment)?.pause()
+ (fragment as? MediaPreviewPageFragment)?.pause()
}
}
@@ -304,7 +304,7 @@ class MediaPreviewV2Fragment :
/**
* The body passed in via arguments for the initially-opened message. Used as a fallback until the background
- * body resolution populates [MediaPreviewV2State.messageBodies], so the caption never blanks out after the
+ * body resolution populates [MediaPreviewState.messageBodies], so the caption never blanks out after the
* instant render.
*/
private fun initialBodyForMessage(messageId: Long?): SpannableString? {
@@ -394,7 +394,7 @@ class MediaPreviewV2Fragment :
crossfadeViewIn(binding.mediaPreviewDetailsContainer)
}
- private fun bindMediaPreviewPlaybackControls(currentItem: MediaTable.MediaRecord, currentFragment: MediaPreviewFragment?) {
+ private fun bindMediaPreviewPlaybackControls(currentItem: MediaTable.MediaRecord, currentFragment: MediaPreviewPageFragment?) {
val mediaType: MediaPreviewPlayerControlView.MediaMode = if (currentItem.attachment?.videoGif == true) {
MediaPreviewPlayerControlView.MediaMode.IMAGE
} else {
@@ -423,7 +423,7 @@ class MediaPreviewV2Fragment :
}
private fun pauseCurrentMediaIfVideo() {
- (getMediaPreviewFragmentFromChildFragmentManager(binding.mediaPager.currentItem) as? VideoMediaPreviewFragment)?.pause()
+ (getMediaPreviewFragmentFromChildFragmentManager(binding.mediaPager.currentItem) as? VideoMediaPreviewPageFragment)?.pause()
}
private fun tryBindMediaPreviewPlaybackControls(
@@ -505,8 +505,8 @@ class MediaPreviewV2Fragment :
}
}
- private fun getMediaPreviewFragmentFromChildFragmentManager(currentPosition: Int): MediaPreviewFragment? {
- return childFragmentManager.findFragmentByTag(pagerAdapter.getFragmentTag(currentPosition)) as? MediaPreviewFragment
+ private fun getMediaPreviewFragmentFromChildFragmentManager(currentPosition: Int): MediaPreviewPageFragment? {
+ return childFragmentManager.findFragmentByTag(pagerAdapter.getFragmentTag(currentPosition)) as? MediaPreviewPageFragment
}
private fun jumpViewPagerToMedia(media: Media) {
@@ -669,7 +669,7 @@ class MediaPreviewV2Fragment :
)
lifecycleScope.launch {
- AttachmentSaver(this@MediaPreviewV2Fragment).saveAttachments(setOf(saveAttachment))
+ AttachmentSaver(this@MediaPreviewFragment).saveAttachments(setOf(saveAttachment))
}
}
@@ -779,7 +779,7 @@ class MediaPreviewV2Fragment :
private const val EXPANDED_CAPTION_HEIGHT_FALLBACK_DP = 400
private const val EXPANDED_CAPTION_HEIGHT_PERCENT: Float = 0.7F
- private val TAG = Log.tag(MediaPreviewV2Fragment::class.java)
+ private val TAG = Log.tag(MediaPreviewFragment::class.java)
const val ARGS_KEY: String = "args"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPageFragment.java
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPageFragment.java
index 473e72e871..148793d562 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPageFragment.java
@@ -13,7 +13,7 @@ import org.signal.core.util.concurrent.SimpleTask;
import java.util.Objects;
-public abstract class MediaPreviewFragment extends Fragment {
+public abstract class MediaPreviewPageFragment extends Fragment {
public static final String DATA_URI = "DATA_URI";
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2State.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewState.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2State.kt
rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewState.kt
index 3f7191d0e1..8e087ec4df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2State.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewState.kt
@@ -4,7 +4,7 @@ import android.text.SpannableString
import org.signal.core.models.media.Media
import org.thoughtcrime.securesms.database.MediaTable
-data class MediaPreviewV2State(
+data class MediaPreviewState(
val mediaRecords: List = emptyList(),
val loadState: LoadState = LoadState.INIT,
val position: Int = 0,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.kt
similarity index 91%
rename from app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.kt
index cded43c7be..8abd625103 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.kt
@@ -35,17 +35,17 @@ import org.thoughtcrime.securesms.notifications.NotificationIds
import org.thoughtcrime.securesms.util.RemoteConfig
import org.thoughtcrime.securesms.util.rx.RxStore
-class MediaPreviewV2ViewModel : ViewModel() {
+class MediaPreviewViewModel : ViewModel() {
companion object {
- private val TAG = Log.tag(MediaPreviewV2ViewModel::class)
+ private val TAG = Log.tag(MediaPreviewViewModel::class)
}
- private val store = RxStore(MediaPreviewV2State())
+ private val store = RxStore(MediaPreviewState())
private val disposables = CompositeDisposable()
private val repository: MediaPreviewRepository = MediaPreviewRepository()
- val state: Flowable = store.stateFlowable.observeOn(AndroidSchedulers.mainThread())
+ val state: Flowable = store.stateFlowable.observeOn(AndroidSchedulers.mainThread())
val currentPosition: Int
get() = store.state.position
@@ -58,7 +58,7 @@ class MediaPreviewV2ViewModel : ViewModel() {
}
fun fetchAttachments(context: Context, startingAttachmentId: AttachmentId, threadId: Long, sorting: MediaTable.Sorting, forceRefresh: Boolean = false) {
- if (store.state.loadState == MediaPreviewV2State.LoadState.INIT || forceRefresh) {
+ if (store.state.loadState == MediaPreviewState.LoadState.INIT || forceRefresh) {
disposables += repository.getAttachments(context, startingAttachmentId, threadId, sorting).subscribe { result ->
store.update { oldState ->
val albums = result.records.fold(mutableMapOf()) { acc: MutableMap>, mediaRecord: MediaTable.MediaRecord ->
@@ -74,14 +74,14 @@ class MediaPreviewV2ViewModel : ViewModel() {
position = result.initialPosition,
mediaRecords = result.records,
albums = albums,
- loadState = MediaPreviewV2State.LoadState.DATA_LOADED
+ loadState = MediaPreviewState.LoadState.DATA_LOADED
)
} else {
oldState.copy(
position = result.records.size - result.initialPosition - 1,
mediaRecords = result.records.reversed(),
albums = albums.mapValues { it.value.reversed() },
- loadState = MediaPreviewV2State.LoadState.DATA_LOADED
+ loadState = MediaPreviewState.LoadState.DATA_LOADED
)
}
}
@@ -112,7 +112,7 @@ class MediaPreviewV2ViewModel : ViewModel() {
}
fun initialize(showThread: Boolean, allMediaInAlbumRail: Boolean, leftIsRecent: Boolean) {
- if (store.state.loadState == MediaPreviewV2State.LoadState.INIT) {
+ if (store.state.loadState == MediaPreviewState.LoadState.INIT) {
store.update { oldState ->
oldState.copy(showThread = showThread, allMediaInAlbumRail = allMediaInAlbumRail, leftIsRecent = leftIsRecent)
}
@@ -127,7 +127,7 @@ class MediaPreviewV2ViewModel : ViewModel() {
fun setMediaReady() {
store.update { oldState ->
- oldState.copy(loadState = MediaPreviewV2State.LoadState.MEDIA_READY)
+ oldState.copy(loadState = MediaPreviewState.LoadState.MEDIA_READY)
}
}
@@ -168,7 +168,7 @@ class MediaPreviewV2ViewModel : ViewModel() {
fun onDestroyView() {
store.update { oldState ->
- oldState.copy(loadState = MediaPreviewV2State.LoadState.DATA_LOADED)
+ oldState.copy(loadState = MediaPreviewState.LoadState.DATA_LOADED)
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewPageFragment.java
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
rename to app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewPageFragment.java
index 1dd6e66b41..1af7cd92d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewPageFragment.java
@@ -27,16 +27,16 @@ import org.signal.video.VideoPlayer;
import java.util.concurrent.TimeUnit;
@OptIn(markerClass = UnstableApi.class)
-public final class VideoMediaPreviewFragment extends MediaPreviewFragment {
+public final class VideoMediaPreviewPageFragment extends MediaPreviewPageFragment {
- private static final String TAG = Log.tag(VideoMediaPreviewFragment.class);
+ private static final String TAG = Log.tag(VideoMediaPreviewPageFragment.class);
private static final Long MINIMUM_DURATION_FOR_SKIP_MS = TimeUnit.MILLISECONDS.convert(30, TimeUnit.SECONDS);
- private VideoPlayer videoView;
- private boolean isVideoGif;
- private MediaPreviewV2ViewModel viewModel;
- private LifecycleDisposable lifecycleDisposable;
+ private VideoPlayer videoView;
+ private boolean isVideoGif;
+ private MediaPreviewViewModel viewModel;
+ private LifecycleDisposable lifecycleDisposable;
@Override
@@ -61,7 +61,7 @@ public final class VideoMediaPreviewFragment extends MediaPreviewFragment {
}
videoView = itemView.findViewById(R.id.video_player);
- viewModel = new ViewModelProvider(requireActivity()).get(MediaPreviewV2ViewModel.class);
+ viewModel = new ViewModelProvider(requireActivity()).get(MediaPreviewViewModel.class);
lifecycleDisposable = new LifecycleDisposable();
lifecycleDisposable.add(viewModel.getState().distinctUntilChanged().subscribe(state -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 1bebc015bd..95fd1861f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -64,7 +64,7 @@ import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
import org.thoughtcrime.securesms.maps.PlacePickerActivity;
import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory;
import org.thoughtcrime.securesms.mediapreview.MediaPreviewCache;
-import org.thoughtcrime.securesms.mediapreview.MediaPreviewV2Fragment;
+import org.thoughtcrime.securesms.mediapreview.MediaPreviewFragment;
import org.thoughtcrime.securesms.mediasend.MediaSendLauncher;
import org.thoughtcrime.securesms.payments.CanNotSendPaymentDialog;
import org.thoughtcrime.securesms.payments.PaymentsAddressException;
@@ -379,7 +379,7 @@ public class AttachmentManager {
}
private void previewImageDraft(final @NonNull Slide slide) {
- if (MediaPreviewV2Fragment.isContentTypeSupported(slide.getContentType()) && slide.getUri() != null) {
+ if (MediaPreviewFragment.isContentTypeSupported(slide.getContentType()) && slide.getUri() != null) {
MediaIntentFactory.MediaPreviewArgs args = new MediaIntentFactory.MediaPreviewArgs(
MediaIntentFactory.NOT_IN_A_THREAD,
MediaIntentFactory.UNKNOWN_TIMESTAMP,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
index 64feded401..542865d009 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
@@ -73,7 +73,7 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
import org.thoughtcrime.securesms.database.AttachmentTable
import org.thoughtcrime.securesms.database.model.MmsMessageRecord
import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.mediapreview.MediaPreviewFragment
+import org.thoughtcrime.securesms.mediapreview.MediaPreviewPageFragment
import org.thoughtcrime.securesms.mediapreview.VideoControlsDelegate
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
@@ -559,7 +559,7 @@ class StoryViewerPageFragment :
override fun onDestroyView() {
super.onDestroyView()
childFragmentManager.fragments.forEach {
- if (it is MediaPreviewFragment) {
+ if (it is MediaPreviewPageFragment) {
it.cleanUp()
}
}
diff --git a/app/src/main/res/layout/activity_mediapreview_v2.xml b/app/src/main/res/layout/activity_media_preview.xml
similarity index 100%
rename from app/src/main/res/layout/activity_mediapreview_v2.xml
rename to app/src/main/res/layout/activity_media_preview.xml
diff --git a/app/src/main/res/layout/fragment_media_preview_v2.xml b/app/src/main/res/layout/fragment_media_preview.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_media_preview_v2.xml
rename to app/src/main/res/layout/fragment_media_preview.xml