Browse Source

close #1040 (probably)

renovate/org.robolectric-robolectric-4.x
Austin Huang 4 years ago
parent
commit
fc70129c96
No known key found for this signature in database GPG Key ID: 84C23AA04587A91F
  1. 4
      app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
  2. 12
      app/src/main/java/awais/instagrabber/repositories/responses/User.java
  3. 1
      app/src/main/java/awais/instagrabber/webservices/GraphQLService.java

4
app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java

@ -407,7 +407,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
} }
chainingMenuItem = menu.findItem(R.id.chaining); chainingMenuItem = menu.findItem(R.id.chaining);
if (chainingMenuItem != null) { if (chainingMenuItem != null) {
chainingMenuItem.setVisible(isNotMe);
chainingMenuItem.setVisible(isNotMe && profileModel.hasChaining());
} }
} }
@ -976,7 +976,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
mutePostsMenuItem.setTitle(profileModel.getFriendshipStatus().isMuting() ? R.string.unmute_posts : R.string.mute_posts); mutePostsMenuItem.setTitle(profileModel.getFriendshipStatus().isMuting() ? R.string.unmute_posts : R.string.mute_posts);
} }
if (chainingMenuItem != null) { if (chainingMenuItem != null) {
chainingMenuItem.setVisible(true);
chainingMenuItem.setVisible(profileModel.hasChaining());
} }
} }
} }

12
app/src/main/java/awais/instagrabber/repositories/responses/User.java

@ -17,6 +17,7 @@ public class User implements Serializable {
private final boolean isUnpublished; private final boolean isUnpublished;
private final boolean isFavorite; private final boolean isFavorite;
private final boolean isDirectappInstalled; private final boolean isDirectappInstalled;
private final boolean hasChaining;
private final String reelAutoArchive; private final String reelAutoArchive;
private final String allowedCommenterType; private final String allowedCommenterType;
private final long mediaCount; private final long mediaCount;
@ -45,6 +46,7 @@ public class User implements Serializable {
final boolean isUnpublished, final boolean isUnpublished,
final boolean isFavorite, final boolean isFavorite,
final boolean isDirectappInstalled, final boolean isDirectappInstalled,
final boolean hasChaining,
final String reelAutoArchive, final String reelAutoArchive,
final String allowedCommenterType, final String allowedCommenterType,
final long mediaCount, final long mediaCount,
@ -72,6 +74,7 @@ public class User implements Serializable {
this.isUnpublished = isUnpublished; this.isUnpublished = isUnpublished;
this.isFavorite = isFavorite; this.isFavorite = isFavorite;
this.isDirectappInstalled = isDirectappInstalled; this.isDirectappInstalled = isDirectappInstalled;
this.hasChaining = hasChaining;
this.reelAutoArchive = reelAutoArchive; this.reelAutoArchive = reelAutoArchive;
this.allowedCommenterType = allowedCommenterType; this.allowedCommenterType = allowedCommenterType;
this.mediaCount = mediaCount; this.mediaCount = mediaCount;
@ -118,6 +121,7 @@ public class User implements Serializable {
this.isUnpublished = false; this.isUnpublished = false;
this.isFavorite = false; this.isFavorite = false;
this.isDirectappInstalled = false; this.isDirectappInstalled = false;
this.hasChaining = false;
this.reelAutoArchive = null; this.reelAutoArchive = null;
this.allowedCommenterType = null; this.allowedCommenterType = null;
this.mediaCount = 0; this.mediaCount = 0;
@ -194,6 +198,10 @@ public class User implements Serializable {
return isDirectappInstalled; return isDirectappInstalled;
} }
public boolean hasChaining() {
return hasChaining;
}
public String getReelAutoArchive() { public String getReelAutoArchive() {
return reelAutoArchive; return reelAutoArchive;
} }
@ -282,7 +290,7 @@ public class User implements Serializable {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(pk, username, fullName, isPrivate, profilePicUrl, profilePicId, friendshipStatus, isVerified, hasAnonymousProfilePicture, return Objects.hash(pk, username, fullName, isPrivate, profilePicUrl, profilePicId, friendshipStatus, isVerified, hasAnonymousProfilePicture,
isUnpublished, isFavorite, isDirectappInstalled, reelAutoArchive, allowedCommenterType, mediaCount, followerCount,
followingCount, followingTagCount, biography, externalUrl, usertagsCount, publicEmail);
isUnpublished, isFavorite, isDirectappInstalled, hasChaining, reelAutoArchive, allowedCommenterType, mediaCount,
followerCount, followingCount, followingTagCount, biography, externalUrl, usertagsCount, publicEmail);
} }
} }

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

@ -324,6 +324,7 @@ public class GraphQLService extends BaseService {
false, false,
false, false,
false, false,
false,
null, null,
null, null,
timelineMedia.getLong("count"), timelineMedia.getLong("count"),

Loading…
Cancel
Save