Fixed profile pictures after the first 80 never loading in the avatar gallery. (#463)

Author: 23rd

TMessagesProj/src/main/java/org/telegram/messenger/FileRefController.java

@@ -357,6 +357,12 @@ public void requestReference(Object parentObject, Object... args) {
             sendErrorToObject(args, 0);
             return;
         }
+        if (parentObject instanceof String && ((String) parentObject).startsWith("avatar_") && Utilities.parseLong((String) parentObject) > 0) {
+            long photoId = getRequestedPhotoId(args[0]);
+            if (photoId != 0) {
+                parentKey += "_" + photoId;
+            }
+        }
 
         Requester requester = new Requester();
         requester.args = args;
@@ -595,9 +601,16 @@ private void requestReferenceFromServer(Object parentObject, String locationKey,
                 long id = Utilities.parseLong(string);
                 if (id > 0) {
                     TLRPC.TL_photos_getUserPhotos req = new TLRPC.TL_photos_getUserPhotos();
-                    req.limit = 80;
-                    req.offset = 0;
-                    req.max_id = 0;
+                    long photoId = getRequestedPhotoId(args[0]);
+                    if (photoId != 0) {
+                        req.limit = 1;
+                        req.offset = -1;
+                        req.max_id = photoId;
+                    } else {
+                        req.limit = 80;
+                        req.offset = 0;
+                        req.max_id = 0;
+                    }
                     req.user_id = getMessagesController().getInputUser(id);
                     getConnectionsManager().sendRequest(req, (response, error) -> onRequestComplete(locationKey, parentKey, response, error, true, false));
                 } else {
@@ -652,6 +665,16 @@ private void requestReferenceFromServer(Object parentObject, String locationKey,
         }
     }
 
+    private static long getRequestedPhotoId(Object arg) {
+        if (arg instanceof TLRPC.TL_inputPhotoFileLocation) {
+            return ((TLRPC.TL_inputPhotoFileLocation) arg).id;
+        }
+        if (arg instanceof TLRPC.TL_inputPeerPhotoFileLocation) {
+            return ((TLRPC.TL_inputPeerPhotoFileLocation) arg).photo_id;
+        }
+        return 0;
+    }
+
     private boolean isSameReference(byte[] oldRef, byte[] newRef) {
         return Arrays.equals(oldRef, newRef);
     }

TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java

@@ -17228,12 +17228,12 @@ private void setIndexToImage(ImageReceiver imageReceiver, int index, CropTransfo
                     }
                 } else if (avatarsDialogId != 0) {
                     if (avatarsDialogId > 0) {
-                        parentObject = MessagesController.getInstance(currentAccount).getUser(avatarsDialogId);
+                        parentObject = "avatar_" + avatarsDialogId;
                     } else {
                         parentObject = MessagesController.getInstance(currentAccount).getChat(-avatarsDialogId);
-                    }
-                    if (photoObject != null) {
-                        parentObject = photoObject;
+                        if (photoObject != null) {
+                            parentObject = photoObject;
+                        }
                     }
                     if (placeHolder == null && thumbLocation instanceof TLRPC.TL_photoStrippedSize) {
                         placeHolder = new ImageReceiver.BitmapHolder(ImageLoader.getStrippedPhotoBitmap(thumbLocation.bytes, "b"));