Fixes FS#20: Limitation of end conversation swipe to left side

1 files changed, 59 insertions, 58 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 0504ff34..bf261dba 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -188,65 +188,66 @@ public class ConversationActivity extends XmppActivity
 
 		listView.setDismissCallback(new EnhancedListView.OnDismissCallback() {
 
-			@Override
-			public EnhancedListView.Undoable onDismiss(final EnhancedListView enhancedListView, final int position) {
-
-				final int index = listView.getFirstVisiblePosition();
-				View v = listView.getChildAt(0);
-				final int top = (v == null) ? 0 : (v.getTop() - listView.getPaddingTop());
-
-				swipedConversation = listAdapter.getItem(position);
-				listAdapter.remove(swipedConversation);
-				swipedConversation.markRead();
-				xmppConnectionService.getNotificationService().clear(swipedConversation);
-
-				final boolean formerlySelected = (getSelectedConversation() == swipedConversation);
-				if (position == 0 && listAdapter.getCount() == 0) {
-					endConversation(swipedConversation, false, true);
-					return null;
-				} else if (formerlySelected) {
-					setSelectedConversation(listAdapter.getItem(0));
-					ConversationActivity.this.mConversationFragment
-							.reInit(getSelectedConversation());
-				}
-
-				return new EnhancedListView.Undoable() {
-
-					@Override
-					public void undo() {
-						listAdapter.insert(swipedConversation, position);
-						if (formerlySelected) {
-							setSelectedConversation(swipedConversation);
-							ConversationActivity.this.mConversationFragment
-									.reInit(getSelectedConversation());
-						}
-						swipedConversation = null;
-						listView.setSelectionFromTop(index + (listView.getChildCount() < position ? 1 : 0), top);
-					}
-
-					@Override
-					public void discard() {
-						if (!swipedConversation.isRead()
-								&& swipedConversation.getMode() == Conversation.MODE_SINGLE) {
-							swipedConversation = null;
-							return;
-						}
-						endConversation(swipedConversation, false, false);
-						swipedConversation = null;
-					}
-
-					@Override
-					public String getTitle() {
-						if (swipedConversation.getMode() == Conversation.MODE_MULTI) {
-							return getResources().getString(R.string.title_undo_swipe_out_muc);
-						} else {
-							return getResources().getString(R.string.title_undo_swipe_out_conversation);
-						}
-					}
-				};
-			}
-		});
+            @Override
+            public EnhancedListView.Undoable onDismiss(final EnhancedListView enhancedListView, final int position) {
+
+                final int index = listView.getFirstVisiblePosition();
+                View v = listView.getChildAt(0);
+                final int top = (v == null) ? 0 : (v.getTop() - listView.getPaddingTop());
+
+                swipedConversation = listAdapter.getItem(position);
+                listAdapter.remove(swipedConversation);
+                swipedConversation.markRead();
+                xmppConnectionService.getNotificationService().clear(swipedConversation);
+
+                final boolean formerlySelected = (getSelectedConversation() == swipedConversation);
+                if (position == 0 && listAdapter.getCount() == 0) {
+                    endConversation(swipedConversation, false, true);
+                    return null;
+                } else if (formerlySelected) {
+                    setSelectedConversation(listAdapter.getItem(0));
+                    ConversationActivity.this.mConversationFragment
+                            .reInit(getSelectedConversation());
+                }
+
+                return new EnhancedListView.Undoable() {
+
+                    @Override
+                    public void undo() {
+                        listAdapter.insert(swipedConversation, position);
+                        if (formerlySelected) {
+                            setSelectedConversation(swipedConversation);
+                            ConversationActivity.this.mConversationFragment
+                                    .reInit(getSelectedConversation());
+                        }
+                        swipedConversation = null;
+                        listView.setSelectionFromTop(index + (listView.getChildCount() < position ? 1 : 0), top);
+                    }
+
+                    @Override
+                    public void discard() {
+                        if (!swipedConversation.isRead()
+                                && swipedConversation.getMode() == Conversation.MODE_SINGLE) {
+                            swipedConversation = null;
+                            return;
+                        }
+                        endConversation(swipedConversation, false, false);
+                        swipedConversation = null;
+                    }
+
+                    @Override
+                    public String getTitle() {
+                        if (swipedConversation.getMode() == Conversation.MODE_MULTI) {
+                            return getResources().getString(R.string.title_undo_swipe_out_muc);
+                        } else {
+                            return getResources().getString(R.string.title_undo_swipe_out_conversation);
+                        }
+                    }
+                };
+            }
+        });
 		listView.enableSwipeToDismiss();
+        listView.setSwipeDirection(EnhancedListView.SwipeDirection.START);
 		listView.setSwipingLayout(R.id.swipeable_item);
 		listView.setUndoStyle(EnhancedListView.UndoStyle.SINGLE_POPUP);
 		listView.setUndoHideDelay(5000);