Skip to content

MediaSend update 1 : Moved fragment UI to compose #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbsession wants to merge 8 commits into
base: improvements/mediasend-compose
Choose a base branch
from
Open

MediaSend update 1 : Moved fragment UI to compose #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c3c296
Initial MediaPickerFolder and MediaPickerItem compose
jbsession Dec 18, 2025
5ac12ef
Initial fragment changes, ComposeViews and minor VM updates
jbsession Dec 19, 2025
414feed
Fixed wrong flag set
jbsession Dec 19, 2025
0e69415
SelectionOverflow error
jbsession Dec 19, 2025
76fd508
Updated hardcoded dimensions, other compose changes
jbsession Jan 7, 2026
6ced08d
Moved most logic to viewmodel
jbsession Jan 7, 2026
0a94f61
Dimensions file and compose cleanups
jbsession Jan 8, 2026
794a101
initial update to checking permission
jbsession Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions ...src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
import android.os.AsyncTask;
Expand All @@ -35,8 +34,6 @@
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;

import com.bumptech.glide.RequestManager;
import com.squareup.phrase.Phrase;
Expand Down Expand Up @@ -349,13 +346,13 @@ public static void selectGallery(Activity activity, int requestCode, @NonNull Ad
.execute();
}

public static boolean hasFullAccess(Activity activity) {
public static boolean hasFullAccess(Context c) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
return Permissions.hasAll(activity,
return Permissions.hasAll(c,
Manifest.permission.READ_MEDIA_IMAGES,
Manifest.permission.READ_MEDIA_VIDEO);
} else {
return Permissions.hasAll(activity, android.Manifest.permission.READ_EXTERNAL_STORAGE);
return Permissions.hasAll(c, android.Manifest.permission.READ_EXTERNAL_STORAGE);
}
}

Expand Down Expand Up @@ -386,9 +383,9 @@ public static void managePhotoAccess(@NonNull Activity activity, @Nullable Runna
}
}

public static boolean shouldShowManagePhoto(@NonNull Activity activity){
public static boolean shouldShowManagePhoto(@NonNull Context c){
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE){
return !hasFullAccess(activity) && hasPartialAccess(activity);
return !hasFullAccess(c) && hasPartialAccess(c);
}else{
// No partial access for <= API 33
return false;
Expand Down
42 changes: 0 additions & 42 deletions app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaFolder.java
View file
Open in desktop

This file was deleted.

18 changes: 18 additions & 0 deletions app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaFolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package org.thoughtcrime.securesms.mediasend

import android.net.Uri


/**
* Represents a folder that's shown in MediaPickerFolderFragment.
*/
data class MediaFolder(
val thumbnailUri: Uri?,
val title: String,
val itemCount: Int,
val bucketId: String,
) {
enum class FolderType {
NORMAL, CAMERA
}
}
1 change: 1 addition & 0 deletions app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;

@Deprecated
Copy link

@ThomasSession ThomasSession Dec 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing to be mindful of if you decide to keep all the old stuff, is to not forget to clean it out later.
With git history you can easily access old files you should be ok deleting and cleaning everything you don't need anymore.
Don't forget to clean out the layout.xml files, and possibly unused views.xml, dimensions, etc...

class MediaPickerFolderAdapter extends RecyclerView.Adapter<MediaPickerFolderAdapter.FolderViewHolder> {

private final RequestManager glideRequests;
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
/**
* Allows the user to select a media folder to explore.
*/
@Deprecated
@AndroidEntryPoint
public class MediaPickerFolderFragment extends Fragment implements MediaPickerFolderAdapter.EventListener {

Expand Down Expand Up @@ -191,6 +192,7 @@ public void onFolderClicked(@NonNull MediaFolder folder) {
controller.onFolderSelected(folder);
}

@Deprecated
public interface Controller {
void onFolderSelected(@NonNull MediaFolder folder);
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.LinkedList;
import java.util.List;

@Deprecated
public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItemAdapter.ItemViewHolder> {

private final RequestManager glideRequests;
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
/**
* Allows the user to select a set of media items from a specified folder.
*/
@Deprecated
@AndroidEntryPoint
public class MediaPickerItemFragment extends Fragment implements MediaPickerItemAdapter.EventListener {

Expand Down
17 changes: 9 additions & 8 deletions app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ import org.thoughtcrime.securesms.ScreenLockActionBarActivity
import org.thoughtcrime.securesms.database.RecipientRepository
import org.thoughtcrime.securesms.mediasend.CameraXActivity.Companion.KEY_MEDIA_SEND_COUNT
import org.thoughtcrime.securesms.mediasend.MediaSendViewModel.CountButtonState
import org.thoughtcrime.securesms.mediasend.compose.MediaPickerFolderComposeFragment
import org.thoughtcrime.securesms.mediasend.compose.MediaPickerItemComposeFragment
import org.thoughtcrime.securesms.permissions.Permissions
import org.thoughtcrime.securesms.scribbles.ImageEditorFragment
import org.thoughtcrime.securesms.util.FilenameUtils.constructPhotoFilename
Expand All @@ -53,8 +55,8 @@ import javax.inject.Inject
* It will return the [Media] that the user decided to send.
*/
@AndroidEntryPoint
class MediaSendActivity : ScreenLockActionBarActivity(), MediaPickerFolderFragment.Controller,
MediaPickerItemFragment.Controller, MediaSendFragment.Controller,
class MediaSendActivity : ScreenLockActionBarActivity(), MediaPickerFolderComposeFragment.Controller,
MediaPickerItemComposeFragment.Controller, MediaSendFragment.Controller,
ImageEditorFragment.Controller {

private var recipient: Recipient? = null
Expand Down Expand Up @@ -117,7 +119,7 @@ class MediaSendActivity : ScreenLockActionBarActivity(), MediaPickerFolderFragme
.replace(R.id.mediasend_fragment_container, fragment, TAG_SEND)
.commit()
} else {
val fragment = MediaPickerFolderFragment.newInstance(
val fragment = MediaPickerFolderComposeFragment.newInstance(
recipient!!
)
supportFragmentManager.beginTransaction()
Expand Down Expand Up @@ -179,10 +181,9 @@ class MediaSendActivity : ScreenLockActionBarActivity(), MediaPickerFolderFragme
override fun onFolderSelected(folder: MediaFolder) {
viewModel.onFolderSelected(folder.bucketId)

val fragment = MediaPickerItemFragment.newInstance(
val fragment = MediaPickerItemComposeFragment.newInstance(
folder.bucketId,
folder.title,
MediaSendViewModel.MAX_SELECTED_FILES
folder.title
)
supportFragmentManager.beginTransaction()
.setCustomAnimations(
Expand All @@ -208,11 +209,11 @@ class MediaSendActivity : ScreenLockActionBarActivity(), MediaPickerFolderFragme
}

override fun onAddMediaClicked(bucketId: String) {
val folderFragment = MediaPickerFolderFragment.newInstance(
val folderFragment = MediaPickerFolderComposeFragment.newInstance(
recipient!!
)
val itemFragment =
MediaPickerItemFragment.newInstance(bucketId, "", MediaSendViewModel.MAX_SELECTED_FILES)
MediaPickerItemComposeFragment.newInstance(bucketId, "")

supportFragmentManager.beginTransaction()
.setCustomAnimations(
Expand Down
Loading