nearly same as 1.10.1

This commit is contained in:
lookshe 2016-03-07 13:54:45 +01:00
parent e52757ece1
commit ecff82fcd2

View file

@ -278,7 +278,6 @@ public class ConversationActivity extends XmppActivity
}
});
listView.enableSwipeToDismiss();
//listView.setSwipeDirection(EnhancedListView.SwipeDirection.START);
listView.setSwipingLayout(R.id.swipeable_item);
listView.setUndoStyle(EnhancedListView.UndoStyle.SINGLE_POPUP);
listView.setUndoHideDelay(5000);
@ -290,11 +289,9 @@ public class ConversationActivity extends XmppActivity
}
if (mContentView instanceof SlidingPaneLayout) {
SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
// Move the conversation list when sliding the selected conversation
mSlidingPaneLayout.setParallaxDistance(150);
// The shadow between conversation list and selected conversation
//mSlidingPaneLayout.setShadowResourceLeft(R.drawable.es_slidingpane_shadow);
mSlidingPaneLayout.setShadowResource(R.drawable.es_slidingpane_shadow);
mSlidingPaneLayout
.setShadowResource(R.drawable.es_slidingpane_shadow);
mSlidingPaneLayout.setSliderFadeColor(0);
mSlidingPaneLayout.setPanelSlideListener(new PanelSlideListener() {
@ -1163,6 +1160,7 @@ public class ConversationActivity extends XmppActivity
setSelectedConversation(conversationList.get(0));
this.mConversationFragment.reInit(getSelectedConversation());
} else {
this.mConversationFragment.messageListAdapter.updatePreferences();
this.mConversationFragment.messagesView.invalidateViews();
this.mConversationFragment.setupIme();
}
@ -1386,7 +1384,10 @@ public class ConversationActivity extends XmppActivity
}
private void attachLocationToConversation(Conversation conversation, Uri uri) {
xmppConnectionService.attachLocationToConversation(conversation, uri, new UiCallback<Message>() {
if (conversation == null) {
return;
}
xmppConnectionService.attachLocationToConversation(conversation,uri, new UiCallback<Message>() {
@Override
public void success(Message message) {
@ -1566,3 +1567,4 @@ public class ConversationActivity extends XmppActivity
});
}
}