Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
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

This file was deleted.

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
}
}

This file was deleted.

Loading