Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed database classes to table classes.

Browse Source 
Because they're not databases. They're tables.
This commit is contained in:
Greyson Parrelli
2022-11-29 10:47:12 -05:00
committed by Cody Henthorne
parent b190f9495a
commit 7949996c5c
382 changed files with 3420 additions and 3464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java
View File

@@ -12,7 +12,7 @@ import androidx.fragment.app.Fragment;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.MediaDatabase;
import org.thoughtcrime.securesms.database.MediaTable;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.util.AttachmentUtil;
import org.thoughtcrime.securesms.util.SaveAttachmentTask;
@@ -29,7 +29,7 @@ final class MediaActions {
}
static void handleSaveMedia(@NonNull Fragment fragment,
@NonNull Collection<MediaDatabase.MediaRecord> mediaRecords,
@NonNull Collection<MediaTable.MediaRecord> mediaRecords,
@Nullable Runnable postExecute)
{
Context context = fragment.requireContext();
@@ -49,7 +49,7 @@ final class MediaActions {
}
static void handleDeleteMedia(@NonNull Context context,
@NonNull Collection<MediaDatabase.MediaRecord> mediaRecords)
@NonNull Collection<MediaTable.MediaRecord> mediaRecords)
{
int recordCount = mediaRecords.size();
Resources res = context.getResources();
@@ -65,29 +65,29 @@ final class MediaActions {
.setCancelable(true);
builder.setPositiveButton(R.string.delete, (dialogInterface, i) ->
new ProgressDialogAsyncTask<MediaDatabase.MediaRecord, Void, Void>(context,
R.string.MediaOverviewActivity_Media_delete_progress_title,
R.string.MediaOverviewActivity_Media_delete_progress_message)
new ProgressDialogAsyncTask<MediaTable.MediaRecord, Void, Void>(context,
R.string.MediaOverviewActivity_Media_delete_progress_title,
R.string.MediaOverviewActivity_Media_delete_progress_message)
{
@Override
protected Void doInBackground(MediaDatabase.MediaRecord... records) {
protected Void doInBackground(MediaTable.MediaRecord... records) {
if (records == null || records.length == 0) {
return null;
}
for (MediaDatabase.MediaRecord record : records) {
for (MediaTable.MediaRecord record : records) {
AttachmentUtil.deleteAttachment(context, record.getAttachment());
}
return null;
}
}.execute(mediaRecords.toArray(new MediaDatabase.MediaRecord[0]))
}.execute(mediaRecords.toArray(new MediaTable.MediaRecord[0]))
);
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
}
private static void performSaveToDisk(@NonNull Context context, @NonNull Collection<MediaDatabase.MediaRecord> mediaRecords, @Nullable Runnable postExecute) {
private static void performSaveToDisk(@NonNull Context context, @NonNull Collection<MediaTable.MediaRecord> mediaRecords, @Nullable Runnable postExecute) {
new ProgressDialogAsyncTask<Void, Void, List<SaveAttachmentTask.Attachment>>(context,
R.string.MediaOverviewActivity_collecting_attachments,
R.string.please_wait)
@@ -96,7 +96,7 @@ final class MediaActions {
protected List<SaveAttachmentTask.Attachment> doInBackground(Void... params) {
List<SaveAttachmentTask.Attachment> attachments = new LinkedList<>();
for (MediaDatabase.MediaRecord mediaRecord : mediaRecords) {
for (MediaTable.MediaRecord mediaRecord : mediaRecords) {
if (mediaRecord.getAttachment().getUri() != null) {
attachments.add(new SaveAttachmentTask.Attachment(mediaRecord.getAttachment().getUri(),
mediaRecord.getContentType(),

38
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java
View File

@@ -40,8 +40,8 @@ import org.thoughtcrime.securesms.attachments.AttachmentId;
import org.thoughtcrime.securesms.components.AudioView;
import org.thoughtcrime.securesms.components.ThumbnailView;
import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
import org.thoughtcrime.securesms.database.MediaDatabase;
import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
import org.thoughtcrime.securesms.database.MediaTable;
import org.thoughtcrime.securesms.database.MediaTable.MediaRecord;
import org.thoughtcrime.securesms.database.loaders.GroupedThreadMediaLoader.GroupedThreadMedia;
import org.thoughtcrime.securesms.mms.AudioSlide;
import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -142,8 +142,8 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
@Override
public int getSectionItemViewType(int section, int offset) {
MediaDatabase.MediaRecord mediaRecord = media.get(section, offset);
Slide slide = MediaUtil.getSlideForAttachment(context, mediaRecord.getAttachment());
MediaTable.MediaRecord mediaRecord = media.get(section, offset);
Slide slide = MediaUtil.getSlideForAttachment(context, mediaRecord.getAttachment());
if (slide.hasAudio()) return AUDIO_DETAIL;
if (slide.hasImage() || slide.hasVideo()) return detailView ? GALLERY_DETAIL : GALLERY;
@@ -169,8 +169,8 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
@Override
public void onBindItemViewHolder(ItemViewHolder viewHolder, int section, int offset) {
MediaDatabase.MediaRecord mediaRecord = media.get(section, offset);
Slide slide = MediaUtil.getSlideForAttachment(context, mediaRecord.getAttachment());
MediaTable.MediaRecord mediaRecord = media.get(section, offset);
Slide slide = MediaUtil.getSlideForAttachment(context, mediaRecord.getAttachment());
((SelectableViewHolder) viewHolder).bind(context, mediaRecord, slide);
}
@@ -194,8 +194,8 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
}
public void toggleSelection(@NonNull MediaRecord mediaRecord) {
AttachmentId attachmentId = mediaRecord.getAttachment().getAttachmentId();
MediaDatabase.MediaRecord removed = selected.remove(attachmentId);
AttachmentId attachmentId = mediaRecord.getAttachment().getAttachmentId();
MediaTable.MediaRecord removed = selected.remove(attachmentId);
if (removed == null) {
selected.put(attachmentId, mediaRecord);
}
@@ -247,15 +247,15 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
protected final View selectedIndicator;
private MediaDatabase.MediaRecord mediaRecord;
private boolean bound;
private MediaTable.MediaRecord mediaRecord;
private boolean bound;
SelectableViewHolder(@NonNull View itemView) {
super(itemView);
this.selectedIndicator = itemView.findViewById(R.id.selected_indicator);
}
public void bind(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord, @NonNull Slide slide) {
public void bind(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord, @NonNull Slide slide) {
if (bound) {
unbind();
}
@@ -314,7 +314,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
}
@Override
public void bind(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord, @NonNull Slide slide) {
public void bind(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord, @NonNull Slide slide) {
super.bind(context, mediaRecord, slide);
if (showFileSizes | detailView) {
@@ -377,7 +377,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
}
@Override
public void bind(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord, @NonNull Slide slide) {
public void bind(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord, @NonNull Slide slide) {
super.bind(context, mediaRecord, slide);
fileName = slide.getFileName();
@@ -406,7 +406,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
super.unbind();
}
private String getLine2(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord, @NonNull Slide slide) {
private String getLine2(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord, @NonNull Slide slide) {
return context.getString(R.string.MediaOverviewActivity_detail_line_3_part,
Util.getPrettyFileSize(slide.getFileSize()),
getFileTypeDescription(context, slide),
@@ -474,7 +474,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
}
@Override
public void bind(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord, @NonNull Slide slide) {
public void bind(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord, @NonNull Slide slide) {
super.bind(context, mediaRecord, slide);
documentType.setText(slide.getFileType(context).orElse("").toLowerCase());
@@ -493,7 +493,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
}
@Override
public void bind(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord, @NonNull Slide slide) {
public void bind(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord, @NonNull Slide slide) {
if (!slide.hasAudio()) {
throw new AssertionError();
}
@@ -539,7 +539,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
}
@Override
public void bind(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord, @NonNull Slide slide) {
public void bind(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord, @NonNull Slide slide) {
super.bind(context, mediaRecord, slide);
thumbnailView.setImageResource(glideRequests, slide, false, false);
@@ -601,9 +601,9 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
}
interface ItemClickListener {
void onMediaClicked(@NonNull MediaDatabase.MediaRecord mediaRecord);
void onMediaClicked(@NonNull MediaTable.MediaRecord mediaRecord);
void onMediaLongClicked(MediaDatabase.MediaRecord mediaRecord);
void onMediaLongClicked(MediaTable.MediaRecord mediaRecord);
}
interface AudioItemListener {

10
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java
View File

@@ -41,8 +41,8 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.AnimatingToggle;
import org.thoughtcrime.securesms.components.BoldSelectionTabItem;
import org.thoughtcrime.securesms.components.ControllableTabLayout;
import org.thoughtcrime.securesms.database.MediaDatabase;
import org.thoughtcrime.securesms.database.MediaDatabase.Sorting;
import org.thoughtcrime.securesms.database.MediaTable;
import org.thoughtcrime.securesms.database.MediaTable.Sorting;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.loaders.MediaLoader;
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
@@ -81,7 +81,7 @@ public final class MediaOverviewActivity extends PassphraseRequiredActivity {
}
public static Intent forAll(@NonNull Context context) {
return forThread(context, MediaDatabase.ALL_THREADS);
return forThread(context, MediaTable.ALL_THREADS);
}
@Override
@@ -96,7 +96,7 @@ public final class MediaOverviewActivity extends PassphraseRequiredActivity {
initializeResources();
initializeToolbar();
boolean allThreads = threadId == MediaDatabase.ALL_THREADS;
boolean allThreads = threadId == MediaTable.ALL_THREADS;
BoldSelectionTabItem.registerListeners(tabLayout);
fillTabLayoutIfFits(tabLayout);
@@ -196,7 +196,7 @@ public final class MediaOverviewActivity extends PassphraseRequiredActivity {
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (threadId == MediaDatabase.ALL_THREADS) {
if (threadId == MediaTable.ALL_THREADS) {
getSupportActionBar().setTitle(R.string.MediaOverviewActivity_All_storage_use);
} else {
SimpleTask.run(() -> SignalDatabase.threads().getRecipientForThreadId(threadId),

22
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
View File

@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.components.menu.ActionItem;
import org.thoughtcrime.securesms.components.menu.SignalBottomActionBar;
import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
import org.thoughtcrime.securesms.database.MediaDatabase;
import org.thoughtcrime.securesms.database.MediaTable;
import org.thoughtcrime.securesms.database.loaders.GroupedThreadMediaLoader;
import org.thoughtcrime.securesms.database.loaders.MediaLoader;
import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory;
@@ -60,9 +60,9 @@ public final class MediaOverviewPageFragment extends Fragment
private static final String MEDIA_TYPE_EXTRA = "media_type";
private static final String GRID_MODE = "grid_mode";
private final ActionModeCallback actionModeCallback = new ActionModeCallback();
private MediaDatabase.Sorting sorting = MediaDatabase.Sorting.Newest;
private MediaLoader.MediaType mediaType = MediaLoader.MediaType.GALLERY;
private final ActionModeCallback actionModeCallback = new ActionModeCallback();
private MediaTable.Sorting sorting = MediaTable.Sorting.Newest;
private MediaLoader.MediaType mediaType = MediaLoader.MediaType.GALLERY;
private long threadId;
private TextView noMedia;
private RecyclerView recyclerView;
@@ -127,7 +127,7 @@ public final class MediaOverviewPageFragment extends Fragment
this,
this,
sorting.isRelatedToFileSize(),
threadId == MediaDatabase.ALL_THREADS);
threadId == MediaTable.ALL_THREADS);
this.recyclerView.setAdapter(adapter);
this.recyclerView.setLayoutManager(gridManager);
this.recyclerView.setHasFixedSize(true);
@@ -196,7 +196,7 @@ public final class MediaOverviewPageFragment extends Fragment
}
@Override
public void onMediaClicked(@NonNull MediaDatabase.MediaRecord mediaRecord) {
public void onMediaClicked(@NonNull MediaTable.MediaRecord mediaRecord) {
if (actionMode != null) {
handleMediaMultiSelectClick(mediaRecord);
} else {
@@ -213,7 +213,7 @@ public final class MediaOverviewPageFragment extends Fragment
}
}
private void handleMediaMultiSelectClick(@NonNull MediaDatabase.MediaRecord mediaRecord) {
private void handleMediaMultiSelectClick(@NonNull MediaTable.MediaRecord mediaRecord) {
MediaGalleryAllAdapter adapter = getListAdapter();
adapter.toggleSelection(mediaRecord);
@@ -224,7 +224,7 @@ public final class MediaOverviewPageFragment extends Fragment
}
}
private void handleMediaPreviewClick(@NonNull MediaDatabase.MediaRecord mediaRecord) {
private void handleMediaPreviewClick(@NonNull MediaTable.MediaRecord mediaRecord) {
if (mediaRecord.getAttachment().getUri() == null) {
return;
}
@@ -246,7 +246,7 @@ public final class MediaOverviewPageFragment extends Fragment
mediaRecord.getAttachment().getCaption(),
true,
true,
threadId == MediaDatabase.ALL_THREADS,
threadId == MediaTable.ALL_THREADS,
true,
sorting,
attachment.isVideoGif());
@@ -258,7 +258,7 @@ public final class MediaOverviewPageFragment extends Fragment
}
}
private static void showFileExternally(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord) {
private static void showFileExternally(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord) {
Uri uri = mediaRecord.getAttachment().getUri();
Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -273,7 +273,7 @@ public final class MediaOverviewPageFragment extends Fragment
}
@Override
public void onMediaLongClicked(MediaDatabase.MediaRecord mediaRecord) {
public void onMediaLongClicked(MediaTable.MediaRecord mediaRecord) {
if (actionMode == null) {
enterMultiSelect();
}

2
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewViewModel.java
View File

@@ -9,7 +9,7 @@ import androidx.lifecycle.SavedStateViewModelFactory;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import org.thoughtcrime.securesms.database.MediaDatabase.Sorting;
import org.thoughtcrime.securesms.database.MediaTable.Sorting;
public class MediaOverviewViewModel extends ViewModel {