Skip to content

Add Subreddit to Multireddit #1251

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
mrboisvert wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add Subreddit to Multireddit #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e0c0f24
Refactor to make request type an argument for CacheRequest
mrboisvert Nov 30, 2024
fb62939
Support PUT requests
mrboisvert Nov 30, 2024
afd8212
Handle 404, 403, 401, and 400 errors separately
mrboisvert Nov 25, 2024
68993be
Handle any 2xx response as a success
mrboisvert Nov 25, 2024
57b5f1a
Refactor to use builder for CacheRequest
mrboisvert Nov 27, 2024
f8da970
Add support for add subreddit to multireddit api method
mrboisvert Nov 28, 2024
6d812ac
Create 'Add to Multireddit' action for subreddits
mrboisvert Nov 28, 2024
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
270 changes: 138 additions & 132 deletions src/main/java/org/quantumbadger/redreader/activities/ImageViewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,150 +881,156 @@ private void makeCacheRequest(
= new AtomicReference<>();
final AtomicReference<String> videoMimetype = new AtomicReference<>();

CacheManager.getInstance(this).makeRequest(mImageOrVideoRequest = new CacheRequest(
uri,
RedditAccountManager.getAnon(),
null,
new Priority(Constants.Priority.IMAGE_VIEW),
DownloadStrategyIfNotCached.INSTANCE,
Constants.FileType.IMAGE,
CacheRequest.DownloadQueueType.IMMEDIATE,
this,
new CacheRequestCallbacks() {

private boolean mProgressTextSet = false;

@Override
public void onFailure(@NonNull final RRError error) {
CacheManager.getInstance(this).makeRequest(
mImageOrVideoRequest = new CacheRequest.Builder()
.setUrl(uri)
.setUser(RedditAccountManager.getAnon())
.setPriority(new Priority(Constants.Priority.IMAGE_VIEW))
.setDownloadStrategy(DownloadStrategyIfNotCached.INSTANCE)
.setFileType(Constants.FileType.IMAGE)
.setQueueType(CacheRequest.DownloadQueueType.IMMEDIATE)
.setRequestMethod(CacheRequest.RequestMethod.GET)
.setCache(true)
.setContext(this)
.setCallbacks(new CacheRequestCallbacks() {
private boolean mProgressTextSet = false;

@Override
public void onFailure(@NonNull final RRError error) {

synchronized(resultLock) {

if(!failed.getAndSet(true)) {
AndroidCommon.UI_THREAD_HANDLER.post(() -> {
final LinearLayout layout
= new LinearLayout(
ImageViewActivity.this);
final ErrorView errorView = new ErrorView(
ImageViewActivity.this,
error);
layout.addView(errorView);
General.setLayoutMatchWidthWrapHeight(errorView);
setMainView(layout);
});
}
}
}

synchronized(resultLock) {

if(!failed.getAndSet(true)) {
AndroidCommon.UI_THREAD_HANDLER.post(() -> {
final LinearLayout layout
= new LinearLayout(ImageViewActivity.this);
final ErrorView errorView = new ErrorView(
ImageViewActivity.this,
error);
layout.addView(errorView);
General.setLayoutMatchWidthWrapHeight(errorView);
setMainView(layout);
@Override
public void onDownloadNecessary() {
AndroidCommon.runOnUiThread(() -> {
progressBar.setVisibility(View.VISIBLE);
progressBar.setIndeterminate(true);
manageAspectRatioIndicator(progressBar);
});
}
}
}

@Override
public void onDownloadNecessary() {
AndroidCommon.runOnUiThread(() -> {
progressBar.setVisibility(View.VISIBLE);
progressBar.setIndeterminate(true);
manageAspectRatioIndicator(progressBar);
});
}

@Override
public void onProgress(
final boolean authorizationInProgress,
final long bytesRead,
final long totalBytes) {

AndroidCommon.runOnUiThread(() -> {
progressBar.setVisibility(View.VISIBLE);
progressBar.setIndeterminate(authorizationInProgress);
progressBar.setProgress(
((float)((1000 * bytesRead) / totalBytes)) / 1000);
manageAspectRatioIndicator(progressBar);

if(!mProgressTextSet) {
mProgressText.setText(General.bytesToMegabytes(totalBytes));
mProgressTextSet = true;
@Override
public void onProgress(
final boolean authorizationInProgress,
final long bytesRead,
final long totalBytes) {

AndroidCommon.runOnUiThread(() -> {
progressBar.setVisibility(View.VISIBLE);
progressBar.setIndeterminate(authorizationInProgress);
progressBar.setProgress(
((float)((1000 * bytesRead) / totalBytes)) / 1000);
manageAspectRatioIndicator(progressBar);

if(!mProgressTextSet) {
mProgressText.setText(General.bytesToMegabytes(totalBytes));
mProgressTextSet = true;
}
});
}
});
}

@Override
public void onDataStreamAvailable(
@NonNull final GenericFactory<SeekableInputStream, IOException>
streamFactory,
final TimestampUTC timestamp,
@NonNull final UUID session,
final boolean fromCache,
@Nullable final String mimetype) {

synchronized(resultLock) {

if(audio.get() != null || audioUri == null) {
onImageStreamReady(
!fromCache,
streamFactory,
audio.get(),
mimetype,
Uri.parse(uri.toString()));

} else {
video.set(streamFactory);
videoMimetype.set(mimetype);
@Override
public void onDataStreamAvailable(
@NonNull final GenericFactory<SeekableInputStream, IOException>
streamFactory,
final TimestampUTC timestamp,
@NonNull final UUID session,
final boolean fromCache,
@Nullable final String mimetype) {

synchronized(resultLock) {

if(audio.get() != null || audioUri == null) {
onImageStreamReady(
!fromCache,
streamFactory,
audio.get(),
mimetype,
Uri.parse(uri.toString()));

} else {
video.set(streamFactory);
videoMimetype.set(mimetype);
}
}
}
}
}
}));
})
.build());

if(audioUri != null) {
CacheManager.getInstance(this).makeRequest(mAudioRequest = new CacheRequest(
audioUri,
RedditAccountManager.getAnon(),
null,
new Priority(Constants.Priority.IMAGE_VIEW),
DownloadStrategyIfNotCached.INSTANCE,
Constants.FileType.IMAGE,
CacheRequest.DownloadQueueType.IMMEDIATE,
this,
new CacheRequestCallbacks() {
@Override
public void onFailure(@NonNull final RRError error) {

synchronized(resultLock) {

if(!failed.getAndSet(true)) {

AndroidCommon.runOnUiThread(() -> {
final LinearLayout layout
= new LinearLayout(ImageViewActivity.this);
final ErrorView errorView = new ErrorView(
ImageViewActivity.this,
error);
layout.addView(errorView);
General.setLayoutMatchWidthWrapHeight(errorView);
setMainView(layout);
});
CacheManager.getInstance(this)
.makeRequest(mAudioRequest = new CacheRequest.Builder()
.setUrl(audioUri)
.setUser(RedditAccountManager.getAnon())
.setPriority(new Priority(Constants.Priority.IMAGE_VIEW))
.setDownloadStrategy(DownloadStrategyIfNotCached.INSTANCE)
.setFileType(Constants.FileType.IMAGE)
.setQueueType(CacheRequest.DownloadQueueType.IMMEDIATE)
.setRequestMethod(CacheRequest.RequestMethod.GET)
.setCache(true)
.setContext(this)
.setCallbacks(new CacheRequestCallbacks() {
@Override
public void onFailure(@NonNull final RRError error) {

synchronized (resultLock) {

if (!failed.getAndSet(true)) {

AndroidCommon.runOnUiThread(() -> {
final LinearLayout layout
= new LinearLayout(ImageViewActivity.this);
final ErrorView errorView = new ErrorView(
ImageViewActivity.this,
error);
layout.addView(errorView);
General.setLayoutMatchWidthWrapHeight(errorView);
setMainView(layout);
});
}
}
}
}
}

@Override
public void onDataStreamAvailable(
@NonNull final GenericFactory<
SeekableInputStream, IOException> streamFactory,
final TimestampUTC timestamp,
@NonNull final UUID session,
final boolean fromCache,
@Nullable final String mimetype) {

synchronized(resultLock) {
if(video.get() != null) {
onImageStreamReady(
!fromCache,
video.get(),
streamFactory,
videoMimetype.get(),
Uri.parse(uri.toString()));
} else {
audio.set(streamFactory);
@Override
public void onDataStreamAvailable(
@NonNull final GenericFactory<
SeekableInputStream, IOException> streamFactory,
final TimestampUTC timestamp,
@NonNull final UUID session,
final boolean fromCache,
@Nullable final String mimetype) {

synchronized (resultLock) {
if (video.get() != null) {
onImageStreamReady(
!fromCache,
video.get(),
streamFactory,
videoMimetype.get(),
Uri.parse(uri.toString()));
} else {
audio.set(streamFactory);
}
}
}
}
}
}));
})
.build());
}
}

Expand Down
Loading