From 3baa82090e553422d0db0fc420310599f8e2607d Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Tue, 26 Jan 2021 21:21:48 -0500
Subject: [PATCH] restore hd avatar

---
 .../instagrabber/asyncs/CommentsFetcher.java     |  6 +++---
 .../dialogs/ProfilePicDialogFragment.java        |  2 +-
 .../responses/HdProfilePicUrlInfo.java           | 16 ++++++++++++++++
 .../repositories/responses/User.java             |  9 ++++++++-
 .../instagrabber/utils/ResponseBodyUtils.java    |  2 +-
 .../instagrabber/webservices/GraphQLService.java |  2 ++
 .../instagrabber/webservices/StoriesService.java |  2 ++
 7 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/awais/instagrabber/repositories/responses/HdProfilePicUrlInfo.java

diff --git a/app/src/main/java/awais/instagrabber/asyncs/CommentsFetcher.java b/app/src/main/java/awais/instagrabber/asyncs/CommentsFetcher.java
index 3d1516e6..6b9929c5 100755
--- a/app/src/main/java/awais/instagrabber/asyncs/CommentsFetcher.java
+++ b/app/src/main/java/awais/instagrabber/asyncs/CommentsFetcher.java
@@ -115,7 +115,7 @@ public final class CommentsFetcher extends AsyncTask<Void, Void, List<CommentMod
                                         owner.getString("profile_pic_url"),
                                         null,
                                         new FriendshipStatus(false, false, false, false, false, false, false, false, false, false),
-                                        false, false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null);
+                                        false, false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null, null);
                                 final JSONObject likedBy = childComment.optJSONObject("edge_liked_by");
                                 commentModels.add(new CommentModel(childComment.getString(Constants.EXTRAS_ID),
                                                                    childComment.getString("text"),
@@ -193,7 +193,7 @@ public final class CommentsFetcher extends AsyncTask<Void, Void, List<CommentMod
                             null,
                             new FriendshipStatus(false, false, false, false, false, false, false, false, false, false),
                             owner.optBoolean("is_verified"),
-                            false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null);
+                            false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null, null);
                     final JSONObject likedBy = comment.optJSONObject("edge_liked_by");
                     final String commentId = comment.getString(Constants.EXTRAS_ID);
                     final CommentModel commentModel = new CommentModel(commentId,
@@ -235,7 +235,7 @@ public final class CommentsFetcher extends AsyncTask<Void, Void, List<CommentMod
                                     null,
                                     new FriendshipStatus(false, false, false, false, false, false, false, false, false, false),
                                     tempJsonObject.optBoolean("is_verified"), false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0,
-                                    null);
+                                    null, null);
 
                             tempJsonObject = childComment.optJSONObject("edge_liked_by");
                             childCommentModels.add(new CommentModel(childComment.getString(Constants.EXTRAS_ID),
diff --git a/app/src/main/java/awais/instagrabber/dialogs/ProfilePicDialogFragment.java b/app/src/main/java/awais/instagrabber/dialogs/ProfilePicDialogFragment.java
index e57e1f86..dbc7d223 100644
--- a/app/src/main/java/awais/instagrabber/dialogs/ProfilePicDialogFragment.java
+++ b/app/src/main/java/awais/instagrabber/dialogs/ProfilePicDialogFragment.java
@@ -120,7 +120,7 @@ public class ProfilePicDialogFragment extends DialogFragment {
                 @Override
                 public void onSuccess(final User result) {
                     if (result != null) {
-                        setupPhoto(result.getProfilePicUrl());
+                        setupPhoto(result.getHDProfilePicUrl());
                     }
                 }
 
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/HdProfilePicUrlInfo.java b/app/src/main/java/awais/instagrabber/repositories/responses/HdProfilePicUrlInfo.java
new file mode 100644
index 00000000..86787880
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/HdProfilePicUrlInfo.java
@@ -0,0 +1,16 @@
+package awais.instagrabber.repositories.responses;
+
+public class HdProfilePicUrlInfo {
+    private final String url;
+    private final int width, height;
+
+    public HdProfilePicUrlInfo(final String url, final int width, final int height) {
+        this.url = url;
+        this.width = width;
+        this.height = height;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/User.java b/app/src/main/java/awais/instagrabber/repositories/responses/User.java
index 29660685..efae4dbf 100644
--- a/app/src/main/java/awais/instagrabber/repositories/responses/User.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/User.java
@@ -26,6 +26,7 @@ public class User implements Serializable {
     private final String externalUrl;
     private final long usertagsCount;
     private final String publicEmail;
+    private final HdProfilePicUrlInfo hdProfilePicUrlInfo;
 
 
     public User(final long pk,
@@ -49,7 +50,8 @@ public class User implements Serializable {
                 final String biography,
                 final String externalUrl,
                 final long usertagsCount,
-                final String publicEmail) {
+                final String publicEmail,
+                final HdProfilePicUrlInfo hdProfilePicUrlInfo) {
         this.pk = pk;
         this.username = username;
         this.fullName = fullName;
@@ -72,6 +74,7 @@ public class User implements Serializable {
         this.externalUrl = externalUrl;
         this.usertagsCount = usertagsCount;
         this.publicEmail = publicEmail;
+        this.hdProfilePicUrlInfo = hdProfilePicUrlInfo;
     }
 
     public long getPk() {
@@ -94,6 +97,10 @@ public class User implements Serializable {
         return profilePicUrl;
     }
 
+    public String getHDProfilePicUrl() {
+        return hdProfilePicUrlInfo.getUrl();
+    }
+
     public String getProfilePicId() {
         return profilePicId;
     }
diff --git a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
index 853f262c..43b24637 100644
--- a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
@@ -782,7 +782,7 @@ public final class ResponseBodyUtils {
                     null,
                     friendshipStatus,
                     owner.optBoolean("is_verified"),
-                    false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null);
+                    false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null, null);
         }
         final String id = feedItem.getString(Constants.EXTRAS_ID);
         final ImageVersions2 imageVersions2 = new ImageVersions2(
diff --git a/app/src/main/java/awais/instagrabber/webservices/GraphQLService.java b/app/src/main/java/awais/instagrabber/webservices/GraphQLService.java
index 4b744ac2..74044d29 100644
--- a/app/src/main/java/awais/instagrabber/webservices/GraphQLService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/GraphQLService.java
@@ -242,6 +242,7 @@ public class GraphQLService extends BaseService {
                                 null,
                                 null,
                                 0,
+                                null,
                                 null
                         ));
                         // userModels.add(new ProfileModel(userObject.optBoolean("is_private"),
@@ -332,6 +333,7 @@ public class GraphQLService extends BaseService {
                             userJson.getString("biography"),
                             url,
                             0,
+                            null,
                             null));
                 } catch (JSONException e) {
                     Log.e(TAG, "onResponse", e);
diff --git a/app/src/main/java/awais/instagrabber/webservices/StoriesService.java b/app/src/main/java/awais/instagrabber/webservices/StoriesService.java
index 07fbd448..108bf86c 100644
--- a/app/src/main/java/awais/instagrabber/webservices/StoriesService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/StoriesService.java
@@ -145,6 +145,7 @@ public class StoriesService extends BaseService {
                                            null,
                                            null,
                                            0,
+                                           null,
                                            null
                 );
                 final String id = node.getString("id");
@@ -201,6 +202,7 @@ public class StoriesService extends BaseService {
                                            null,
                                            null,
                                            0,
+                                           null,
                                            null
                 );
                 final String id = node.getString("id");