mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-07 11:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement "see removed" for other types of posts. Improve removed thing detection.

Browse Source
This commit is contained in:
Hermes Junior 2020-06-12 22:06:35 +02:00 committed by OHermesJunior
parent e0020e3cf2
commit 46a8b0d276
5 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java
View File

@ -566,7 +566,10 @@ public class ViewPostDetailActivity extends BaseActivity implements FlairBottomS
mMenu.findItem(R.id.action_view_crosspost_parent_view_post_detail_activity).setVisible(mPost.getCrosspostParentId() != null); mMenu.findItem(R.id.action_view_crosspost_parent_view_post_detail_activity).setVisible(mPost.getCrosspostParentId() != null);
if ("[deleted]".equals(mPost.getAuthor()) || "[deleted]".equals(mPost.getSelfText())) { if ("[deleted]".equals(mPost.getAuthor()) ||
"[deleted]".equals(mPost.getSelfText()) ||
"[removed]".equals(mPost.getSelfText())
) {
mMenu.findItem(R.id.action_see_removed_view_post_detail_activity).setVisible(true); mMenu.findItem(R.id.action_see_removed_view_post_detail_activity).setVisible(true);
} }
} }

5
app/src/main/java/ml/docilealligator/infinityforreddit/BottomSheetFragment/CommentMoreBottomSheetFragment.java
View File

@ -134,7 +134,10 @@ public class CommentMoreBottomSheetFragment extends RoundedBottomSheetDialogFrag
dismiss(); dismiss();
}); });
if ("[removed]".equals(commentData.getCommentRawText())) { if ("[deleted]".equals(commentData.getAuthor()) ||
"[deleted]".equals(commentData.getCommentRawText()) ||
"[removed]".equals(commentData.getCommentRawText())
) {
seeRemovedTextView.setVisibility(View.VISIBLE); seeRemovedTextView.setVisibility(View.VISIBLE);
seeRemovedTextView.setOnClickListener(view -> { seeRemovedTextView.setOnClickListener(view -> {

1
app/src/main/java/ml/docilealligator/infinityforreddit/FetchRemovedComment.java
View File

@ -80,6 +80,7 @@ public class FetchRemovedComment {
comment = parseRemovedComment(commentJSON, comment); comment = parseRemovedComment(commentJSON, comment);
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
comment = null;
} }
return null; return null;
} }

41
app/src/main/java/ml/docilealligator/infinityforreddit/FetchRemovedPost.java
View File

@ -1,6 +1,8 @@
package ml.docilealligator.infinityforreddit; package ml.docilealligator.infinityforreddit;
import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.text.Html;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -43,16 +45,46 @@ public class FetchRemovedPost {
if (id.equals(post.getId())) { if (id.equals(post.getId())) {
String author = postJson.getString(JSONUtils.AUTHOR_KEY); String author = postJson.getString(JSONUtils.AUTHOR_KEY);
String title = postJson.getString(JSONUtils.TITLE_KEY); String title = postJson.getString(JSONUtils.TITLE_KEY);
String postContent = ""; String postContent = Utils.modifyMarkdown(postJson.getString(JSONUtils.SELFTEXT_KEY).trim());
if (!postJson.isNull(JSONUtils.SELFTEXT_KEY)) {
postContent = Utils.modifyMarkdown(postJson.getString(JSONUtils.SELFTEXT_KEY).trim());
}
post.setAuthor(author); post.setAuthor(author);
post.setTitle(title); post.setTitle(title);
post.setSelfText(postContent); post.setSelfText(postContent);
post.setSelfTextPlain(""); post.setSelfTextPlain("");
post.setSelfTextPlainTrimmed(""); post.setSelfTextPlainTrimmed("");
String url = postJson.optString(JSONUtils.URL_KEY);
if (url.endsWith("gif") || url.endsWith("mp4")) {
post.setVideoUrl(url);
post.setVideoDownloadUrl(url);
} else if (post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE) {
JSONObject redditVideoObject = postJson.getJSONObject("secure_media").getJSONObject(JSONUtils.REDDIT_VIDEO_KEY);
String videoUrl = Html.fromHtml(redditVideoObject.getString(JSONUtils.HLS_URL_KEY)).toString();
String videoDownloadUrl = redditVideoObject.getString(JSONUtils.FALLBACK_URL_KEY);
post.setVideoUrl(videoUrl);
post.setVideoDownloadUrl(videoDownloadUrl);
} else if (post.getPostType() == Post.LINK_TYPE) {
post.setUrl(url);
}
if (post.getPostType() == Post.VIDEO_TYPE) {
try {
Uri uri = Uri.parse(url);
String authority = uri.getAuthority();
if (authority != null && (authority.contains("gfycat.com") || authority.contains("redgifs.com"))) {
post.setPostType(Post.LINK_TYPE);
post.setUrl(url);
}
} catch (IllegalArgumentException ignore) {
}
}
if (!postJson.isNull("thumbnail")) {
post.setThumbnailPreviewUrl(postJson.getString("thumbnail"));
}
return post; return post;
} else { } else {
return null; return null;
@ -84,6 +116,7 @@ public class FetchRemovedPost {
post = parseRemovedPost(postJson, post); post = parseRemovedPost(postJson, post);
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
post = null;
} }
return null; return null;
} }

4
app/src/main/java/ml/docilealligator/infinityforreddit/Post/Post.java
View File

@ -325,6 +325,10 @@ public class Post implements Parcelable {
return thumbnailPreviewUrl; return thumbnailPreviewUrl;
} }
public void setThumbnailPreviewUrl(String thumbnailPreviewUrl) {
this.thumbnailPreviewUrl = thumbnailPreviewUrl;
}
public String getUrl() { public String getUrl() {
return url; return url;
} }