Browse Source

restore hd avatar

renovate/org.robolectric-robolectric-4.x
Austin Huang 4 years ago
parent
commit
3baa82090e
No known key found for this signature in database GPG Key ID: 84C23AA04587A91F
  1. 6
      app/src/main/java/awais/instagrabber/asyncs/CommentsFetcher.java
  2. 2
      app/src/main/java/awais/instagrabber/dialogs/ProfilePicDialogFragment.java
  3. 16
      app/src/main/java/awais/instagrabber/repositories/responses/HdProfilePicUrlInfo.java
  4. 9
      app/src/main/java/awais/instagrabber/repositories/responses/User.java
  5. 2
      app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
  6. 2
      app/src/main/java/awais/instagrabber/webservices/GraphQLService.java
  7. 2
      app/src/main/java/awais/instagrabber/webservices/StoriesService.java

6
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"), owner.getString("profile_pic_url"),
null, null,
new FriendshipStatus(false, false, false, false, false, false, false, false, false, false), 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"); final JSONObject likedBy = childComment.optJSONObject("edge_liked_by");
commentModels.add(new CommentModel(childComment.getString(Constants.EXTRAS_ID), commentModels.add(new CommentModel(childComment.getString(Constants.EXTRAS_ID),
childComment.getString("text"), childComment.getString("text"),
@ -193,7 +193,7 @@ public final class CommentsFetcher extends AsyncTask<Void, Void, List<CommentMod
null, null,
new FriendshipStatus(false, false, false, false, false, false, false, false, false, false), new FriendshipStatus(false, false, false, false, false, false, false, false, false, false),
owner.optBoolean("is_verified"), 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 JSONObject likedBy = comment.optJSONObject("edge_liked_by");
final String commentId = comment.getString(Constants.EXTRAS_ID); final String commentId = comment.getString(Constants.EXTRAS_ID);
final CommentModel commentModel = new CommentModel(commentId, final CommentModel commentModel = new CommentModel(commentId,
@ -235,7 +235,7 @@ public final class CommentsFetcher extends AsyncTask<Void, Void, List<CommentMod
null, null,
new FriendshipStatus(false, false, false, false, false, false, false, false, false, false), 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, 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"); tempJsonObject = childComment.optJSONObject("edge_liked_by");
childCommentModels.add(new CommentModel(childComment.getString(Constants.EXTRAS_ID), childCommentModels.add(new CommentModel(childComment.getString(Constants.EXTRAS_ID),

2
app/src/main/java/awais/instagrabber/dialogs/ProfilePicDialogFragment.java

@ -120,7 +120,7 @@ public class ProfilePicDialogFragment extends DialogFragment {
@Override @Override
public void onSuccess(final User result) { public void onSuccess(final User result) {
if (result != null) { if (result != null) {
setupPhoto(result.getProfilePicUrl());
setupPhoto(result.getHDProfilePicUrl());
} }
} }

16
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;
}
}

9
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 String externalUrl;
private final long usertagsCount; private final long usertagsCount;
private final String publicEmail; private final String publicEmail;
private final HdProfilePicUrlInfo hdProfilePicUrlInfo;
public User(final long pk, public User(final long pk,
@ -49,7 +50,8 @@ public class User implements Serializable {
final String biography, final String biography,
final String externalUrl, final String externalUrl,
final long usertagsCount, final long usertagsCount,
final String publicEmail) {
final String publicEmail,
final HdProfilePicUrlInfo hdProfilePicUrlInfo) {
this.pk = pk; this.pk = pk;
this.username = username; this.username = username;
this.fullName = fullName; this.fullName = fullName;
@ -72,6 +74,7 @@ public class User implements Serializable {
this.externalUrl = externalUrl; this.externalUrl = externalUrl;
this.usertagsCount = usertagsCount; this.usertagsCount = usertagsCount;
this.publicEmail = publicEmail; this.publicEmail = publicEmail;
this.hdProfilePicUrlInfo = hdProfilePicUrlInfo;
} }
public long getPk() { public long getPk() {
@ -94,6 +97,10 @@ public class User implements Serializable {
return profilePicUrl; return profilePicUrl;
} }
public String getHDProfilePicUrl() {
return hdProfilePicUrlInfo.getUrl();
}
public String getProfilePicId() { public String getProfilePicId() {
return profilePicId; return profilePicId;
} }

2
app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java

@ -782,7 +782,7 @@ public final class ResponseBodyUtils {
null, null,
friendshipStatus, friendshipStatus,
owner.optBoolean("is_verified"), 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 String id = feedItem.getString(Constants.EXTRAS_ID);
final ImageVersions2 imageVersions2 = new ImageVersions2( final ImageVersions2 imageVersions2 = new ImageVersions2(

2
app/src/main/java/awais/instagrabber/webservices/GraphQLService.java

@ -242,6 +242,7 @@ public class GraphQLService extends BaseService {
null, null,
null, null,
0, 0,
null,
null null
)); ));
// userModels.add(new ProfileModel(userObject.optBoolean("is_private"), // userModels.add(new ProfileModel(userObject.optBoolean("is_private"),
@ -332,6 +333,7 @@ public class GraphQLService extends BaseService {
userJson.getString("biography"), userJson.getString("biography"),
url, url,
0, 0,
null,
null)); null));
} catch (JSONException e) { } catch (JSONException e) {
Log.e(TAG, "onResponse", e); Log.e(TAG, "onResponse", e);

2
app/src/main/java/awais/instagrabber/webservices/StoriesService.java

@ -145,6 +145,7 @@ public class StoriesService extends BaseService {
null, null,
null, null,
0, 0,
null,
null null
); );
final String id = node.getString("id"); final String id = node.getString("id");
@ -201,6 +202,7 @@ public class StoriesService extends BaseService {
null, null,
null, null,
0, 0,
null,
null null
); );
final String id = node.getString("id"); final String id = node.getString("id");

Loading…
Cancel
Save