vrr/Partisan-Telegram-Android
2
0
Fork 0
mirror of https://github.com/wrwrabbit/Partisan-Telegram-Android.git synced 2026-05-05 15:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'upstram_master' into 3.1

Browse source 
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/res/values/strings.xml
This commit is contained in:
vivabelarus 2022-12-31 21:49:56 +03:00
commit 4e0b090d18
No known key found for this signature in database
GPG key ID: D8D8542F5B70C314
45 changed files with 482 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
View file

@ -12780,7 +12780,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
SecureDocument location = secureDocuments.get(index);
f1 = FileLoader.getInstance(currentAccount).getPathToAttach(location, true);
f1 = FileLoader.getInstance(currentAccount).getPathToAttach(location, false);
f2 = FileLoader.getInstance(currentAccount).getPathToAttach(location, false);
} else if (currentPathObject != null) {
f1 = new File(FileLoader.getDirectory(FileLoader.MEDIA_DIR_DOCUMENT), currentFileNames[a]);
f2 = new File(FileLoader.getDirectory(FileLoader.MEDIA_DIR_CACHE), currentFileNames[a]);
@ -15898,7 +15898,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
}
if (currentEditMode == EDIT_MODE_PAINT) {
photoPaintView.setTransform(currentScale, currentTranslationX, currentTranslationY, bitmapWidth * scaleToFitX, bitmapHeight * scaleToFitX);
photoPaintView.setTransform(currentScale, currentTranslationX, currentTranslationY + (sendPhotoType == SELECT_TYPE_AVATAR ? AndroidUtilities.statusBarHeight / 2f : 0) * photoPaintView.getRenderView().getScaleX(), bitmapWidth * scaleToFitX, bitmapHeight * scaleToFitX);
}
if (drawCenterImage) {