awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Remove unneeded merge-dialog option.

Browse Source
This commit is contained in:
B. Petersen
2017-02-24 20:48:04 +01:00
parent e47c6406f8
commit 898e4a45e3
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+1 -1
View File
@@ -2813,7 +2813,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
MessageObject message = cell.getMessageObject();
if( (Build.VERSION.SDK_INT >= 16 && message.isVideo()) || message.type == MessageObject.MO_TYPE1_PHOTO || message.isGif()) {
PhotoViewer.getInstance().setParentActivity(getParentActivity());
PhotoViewer.getInstance().openPhoto(message, message.type != MessageObject.MO_TYPE0_TEXT ? dialog_id : 0, 0, ChatActivity.this);
PhotoViewer.getInstance().openPhoto(message, message.type != MessageObject.MO_TYPE0_TEXT ? dialog_id : 0, ChatActivity.this);
} else if (message.type == MessageObject.MO_TYPE9_FILE || message.type == MessageObject.MO_TYPE3_VIDEO ) {
AndroidUtilities.openForViewOrShare(getParentActivity(), message.getId(), Intent.ACTION_VIEW);
}
MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java
+9 -10
View File
@@ -215,7 +215,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
private int avatarsDialogId;
private long currentDialogId;
private long mergeDialogId;
private final long mergeDialogId = 0;
private int totalImagesCount;
private int totalImagesCountMerge;
private boolean isFirstLoading;
@@ -2977,24 +2977,24 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
return isVisible && !disableShowCheck && object != null && currentPathObject != null && object.equals(currentPathObject);
}
public void openPhoto(final MessageObject messageObject, long dialogId, long mergeDialogId, final PhotoViewerProvider provider) {
openPhoto(messageObject, null, null, null, 0, provider, null, dialogId, mergeDialogId);
public void openPhoto(final MessageObject messageObject, long dialogId, final PhotoViewerProvider provider) {
openPhoto(messageObject, null, null, null, 0, provider, null, dialogId);
}
public void openPhoto(final TLRPC.FileLocation fileLocation, final PhotoViewerProvider provider) {
openPhoto(null, fileLocation, null, null, 0, provider, null, 0, 0);
openPhoto(null, fileLocation, null, null, 0, provider, null, 0);
}
public void openPhoto(final ArrayList<MessageObject> messages, final int index, long dialogId, long mergeDialogId, final PhotoViewerProvider provider) {
openPhoto(messages.get(index), null, messages, null, index, provider, null, dialogId, mergeDialogId);
}
/*public void openPhoto(final ArrayList<MessageObject> messages, final int index, long dialogId, final PhotoViewerProvider provider) {
openPhoto(messages.get(index), null, messages, null, index, provider, null, dialogId);
}*/
public void openPhotoForSelect(final ArrayList<Object> photos, final int index, int type, final PhotoViewerProvider provider, ChatActivity chatActivity) {
sendPhotoType = type;
if (pickerView != null) {
pickerView.doneButtonTextView.setText(sendPhotoType == 1 ? LocaleController.getString("Set", R.string.Set).toUpperCase() : LocaleController.getString("Send", R.string.Send).toUpperCase());
}
openPhoto(null, null, null, photos, index, provider, chatActivity, 0, 0);
openPhoto(null, null, null, photos, index, provider, chatActivity, 0);
}
private boolean checkAnimation() {
@@ -3010,7 +3010,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
return animationInProgress != 0;
}
public void openPhoto(final MessageObject messageObject, final TLRPC.FileLocation fileLocation, final ArrayList<MessageObject> messages, final ArrayList<Object> photos, final int index, final PhotoViewerProvider provider, ChatActivity chatActivity, long dialogId, long mDialogId) {
public void openPhoto(final MessageObject messageObject, final TLRPC.FileLocation fileLocation, final ArrayList<MessageObject> messages, final ArrayList<Object> photos, final int index, final PhotoViewerProvider provider, ChatActivity chatActivity, long dialogId) {
if (parentActivity == null || isVisible || provider == null && checkAnimation() || messageObject == null && fileLocation == null && messages == null && photos == null) {
return;
}
@@ -3053,7 +3053,6 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
NotificationCenter.getInstance().addObserver(this, NotificationCenter.emojiDidLoaded);
placeProvider = provider;
mergeDialogId = mDialogId;
currentDialogId = dialogId;
if (velocityTracker == null) {