diff options
| author | lookshe <github@lookshe.org> | 2016-03-07 13:54:45 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-07 13:54:45 +0100 |
| commit | ecff82fcd2a34178e0f484304c800d418587a8d1 (patch) | |
| tree | bef85db9d7d91a3422a1c6471449cf228c42f16d | |
| parent | e52757ece1db2074fcad1564aae57afb1cf079a0 (diff) | |
nearly same as 1.10.1
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index c9ef4650..3ab1e20c 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -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 }); } } + |