From 673ba041104bad25c94d11294358f5fc3b2c3817 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Mon, 17 May 2021 09:16:02 +0800
Subject: [PATCH] Version 4.3.0. Fix video post parsing (v.redd.it).

---
 app/build.gradle                              |  4 +--
 .../infinityforreddit/post/ParsePost.java     | 34 ++++++++++++++-----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cd4e01e9..acac2574 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "ml.docilealligator.infinityforreddit"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 65
-        versionName "4.3.0-beta5"
+        versionCode 66
+        versionName "4.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
index 9df78a45..f3b09d5e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
@@ -217,16 +217,32 @@ public class ParsePost {
                     }
                     post.setPreviews(previews);
                 } else {
-                    //No preview link post
-                    int postType = Post.NO_PREVIEW_LINK_TYPE;
-                    post = new Post(id, fullName, subredditName, subredditNamePrefixed, author,
-                            authorFlair, authorFlairHTML, postTimeMillis, title, url, permalink, score,
-                            postType, voteType, nComments, upvoteRatio, flair, awards, nAwards, hidden,
-                            spoiler, nsfw, stickied, archived, locked, saved, isCrosspost);
-                    if (data.isNull(JSONUtils.SELFTEXT_KEY)) {
-                        post.setSelfText("");
+                    if (isVideo) {
+                        //No preview video post
+                        JSONObject redditVideoObject = data.getJSONObject(JSONUtils.MEDIA_KEY).getJSONObject(JSONUtils.REDDIT_VIDEO_KEY);
+                        int postType = Post.VIDEO_TYPE;
+                        String videoUrl = Html.fromHtml(redditVideoObject.getString(JSONUtils.HLS_URL_KEY)).toString();
+                        String videoDownloadUrl = redditVideoObject.getString(JSONUtils.FALLBACK_URL_KEY);
+
+                        post = new Post(id, fullName, subredditName, subredditNamePrefixed, author, authorFlair,
+                                authorFlairHTML, postTimeMillis, title, permalink, score, postType, voteType,
+                                nComments, upvoteRatio, flair, awards, nAwards, hidden, spoiler, nsfw, stickied,
+                                archived, locked, saved, isCrosspost);
+
+                        post.setVideoUrl(videoUrl);
+                        post.setVideoDownloadUrl(videoDownloadUrl);
                     } else {
-                        post.setSelfText(Utils.modifyMarkdown(data.getString(JSONUtils.SELFTEXT_KEY).trim()));
+                        //No preview link post
+                        int postType = Post.NO_PREVIEW_LINK_TYPE;
+                        post = new Post(id, fullName, subredditName, subredditNamePrefixed, author,
+                                authorFlair, authorFlairHTML, postTimeMillis, title, url, permalink, score,
+                                postType, voteType, nComments, upvoteRatio, flair, awards, nAwards, hidden,
+                                spoiler, nsfw, stickied, archived, locked, saved, isCrosspost);
+                        if (data.isNull(JSONUtils.SELFTEXT_KEY)) {
+                            post.setSelfText("");
+                        } else {
+                            post.setSelfText(Utils.modifyMarkdown(data.getString(JSONUtils.SELFTEXT_KEY).trim()));
+                        }
                     }
                 }
             }