Merge branch 'trz/rebase' into trz/rename

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
	src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java

5 files changed, 120 insertions, 213 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
index f5de4ae8..cff681a9 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/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);
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
index a30b3483..26e2b3c1 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
@@ -10,7 +10,9 @@ import android.content.Intent;
 import android.content.IntentSender;
 import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.InputType;
+import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
@@ -22,8 +24,6 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AbsListView;
-import android.widget.AbsListView.OnScrollListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ImageButton;
@@ -107,7 +107,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		}
 	};
 	protected ListView messagesView;
-	final protected List<Message> messageList = new ArrayList<>();
+    protected SwipeRefreshLayout swipeLayout;
+    final protected List<Message> messageList = new ArrayList<>();
 	protected MessageAdapter messageListAdapter;
 	private EditMessage mEditMessage;
 	private ImageButton mSendButton;
@@ -117,96 +118,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 	private RelativeLayout snackbar;
 	private TextView snackbarMessage;
 	private TextView snackbarAction;
-	private boolean messagesLoaded = true;
-	private Toast messageLoaderToast;
-
-	private OnScrollListener mOnScrollListener = new OnScrollListener() {
-
-		@Override
-		public void onScrollStateChanged(AbsListView view, int scrollState) {
-			// TODO Auto-generated method stub
-
-		}
-
-		private int getIndexOf(String uuid, List<Message> messages) {
-			if (uuid == null) {
-				return 0;
-			}
-			for(int i = 0; i < messages.size(); ++i) {
-				if (uuid.equals(messages.get(i).getUuid())) {
-					return i;
-				} else {
-					Message next = messages.get(i);
-					while(next != null && next.wasMergedIntoPrevious()) {
-						if (uuid.equals(next.getUuid())) {
-							return i;
-						}
-						next = next.next();
-					}
-
-				}
-			}
-			return 0;
-		}
-
-		@Override
-		public void onScroll(AbsListView view, int firstVisibleItem,
-							 int visibleItemCount, int totalItemCount) {
-			synchronized (ConversationFragment.this.messageList) {
-				if (firstVisibleItem < 5 && messagesLoaded && messageList.size() > 0) {
-					long timestamp = ConversationFragment.this.messageList.get(0).getTimeSent();
-					messagesLoaded = false;
-					activity.xmppConnectionService.loadMoreMessages(conversation, timestamp, new XmppConnectionService.OnMoreMessagesLoaded() {
-						@Override
-						public void onMoreMessagesLoaded(final int c, Conversation conversation) {
-							if (ConversationFragment.this.conversation != conversation) {
-								return;
-							}
-							activity.runOnUiThread(new Runnable() {
-								@Override
-								public void run() {
-									final int oldPosition = messagesView.getFirstVisiblePosition();
-									Message message = messageList.get(oldPosition);
-									String uuid = message != null ? message.getUuid() : null;
-									View v = messagesView.getChildAt(0);
-									final int pxOffset = (v == null) ? 0 : v.getTop();
-									ConversationFragment.this.conversation.populateWithMessages(ConversationFragment.this.messageList);
-									updateStatusMessages();
-									messageListAdapter.notifyDataSetChanged();
-									int pos = getIndexOf(uuid,messageList);
-									messagesView.setSelectionFromTop(pos, pxOffset);
-									messagesLoaded = true;
-									if (messageLoaderToast != null) {
-										messageLoaderToast.cancel();
-									}
-								}
-							});
-						}
-
-						@Override
-						public void informUser(final int resId) {
-
-							activity.runOnUiThread(new Runnable() {
-								@Override
-								public void run() {
-									if (messageLoaderToast != null) {
-										messageLoaderToast.cancel();
-									}
-									if (ConversationFragment.this.conversation != conversation) {
-										return;
-									}
-									messageLoaderToast = Toast.makeText(activity, resId, Toast.LENGTH_LONG);
-									messageLoaderToast.show();
-								}
-							});
-
-						}
-					});
-
-				}
-			}
-		}
-	};
 	private IntentSender askForPassphraseIntent = null;
 	protected OnClickListener clickToDecryptListener = new OnClickListener() {
 
@@ -322,8 +233,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		if (conversation.getMode() == Conversation.MODE_MULTI
 				&& conversation.getNextCounterpart() != null) {
 			this.mEditMessage.setHint(getString(
-					R.string.send_private_message_to,
-					conversation.getNextCounterpart().getResourcepart()));
+                    R.string.send_private_message_to,
+                    conversation.getNextCounterpart().getResourcepart()));
 		} else {
 			switch (conversation.getNextEncryption(activity.forceEncryption())) {
 				case Message.ENCRYPTION_NONE:
@@ -379,69 +290,61 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
         //Will automatically set size according to the soft keyboard size
         mEmojPopup.setSizeForSoftKeyboard();
 
-        //Set on emojicon click listener
-        mEmojPopup.setOnEmojiconClickedListener(new EmojiconGridView.OnEmojiconClickedListener() {
-
-            @Override
-            public void onEmojiconClicked(Emojicon emojicon) {
-                mEditMessage.append(emojicon.getEmoji());
-            }
-        });
-
-        //Set on backspace click listener
-        mEmojPopup.setOnEmojiconBackspaceClickedListener(new EmojiconsPopup.OnEmojiconBackspaceClickedListener() {
-
-            @Override
-            public void onEmojiconBackspaceClicked(View v) {
-                KeyEvent event = new KeyEvent(
-                        0, 0, 0, KeyEvent.KEYCODE_DEL, 0, 0, 0, 0, KeyEvent.KEYCODE_ENDCALL);
-                mEditMessage.dispatchKeyEvent(event);
-            }
-        });
-
         //If the emoji popup is dismissed, change emojiButton to smiley icon
         mEmojPopup.setOnDismissListener(new PopupWindow.OnDismissListener() {
 
-            @Override
-            public void onDismiss() {
-                changeEmojiKeyboardIcon(mEmojButton, R.drawable.smiley);
-            }
-        });
+			@Override
+			public void onDismiss() {
+				changeEmojiKeyboardIcon(mEmojButton, R.drawable.smiley);
+			}
+		});
 
         //If the text keyboard closes, also dismiss the emoji popup
         mEmojPopup.setOnSoftKeyboardOpenCloseListener(new EmojiconsPopup.OnSoftKeyboardOpenCloseListener() {
 
-            @Override
-            public void onKeyboardOpen(int keyBoardHeight) {
+			@Override
+			public void onKeyboardOpen(int keyBoardHeight) {
 
-            }
+			}
 
-            @Override
-            public void onKeyboardClose() {
-                if (mEmojPopup.isShowing())
-                    mEmojPopup.dismiss();
-            }
-        });
+			@Override
+			public void onKeyboardClose() {
+				if (mEmojPopup.isShowing())
+					mEmojPopup.dismiss();
+			}
+		});
 
         //On emoji clicked, add it to edittext
         mEmojPopup.setOnEmojiconClickedListener(new EmojiconGridView.OnEmojiconClickedListener() {
 
-            @Override
-            public void onEmojiconClicked(Emojicon emojicon) {
-                mEditMessage.append(emojicon.getEmoji());
-            }
-        });
+			@Override
+			public void onEmojiconClicked(Emojicon emojicon) {
+				if (mEditMessage == null || emojicon == null) {
+					return;
+				}
+
+				int start = mEditMessage.getSelectionStart();
+				int end = mEditMessage.getSelectionEnd();
+				if (start < 0) {
+					mEditMessage.append(emojicon.getEmoji());
+				} else {
+					mEditMessage.getText().replace(Math.min(start, end),
+							Math.max(start, end), emojicon.getEmoji(), 0,
+							emojicon.getEmoji().length());
+				}
+			}
+		});
 
         //On backspace clicked, emulate the KEYCODE_DEL key event
         mEmojPopup.setOnEmojiconBackspaceClickedListener(new EmojiconsPopup.OnEmojiconBackspaceClickedListener() {
 
-            @Override
-            public void onEmojiconBackspaceClicked(View v) {
-                KeyEvent event = new KeyEvent(
-                        0, 0, 0, KeyEvent.KEYCODE_DEL, 0, 0, 0, 0, KeyEvent.KEYCODE_ENDCALL);
-                mEditMessage.dispatchKeyEvent(event);
-            }
-        });
+			@Override
+			public void onEmojiconBackspaceClicked(View v) {
+				KeyEvent event = new KeyEvent(
+						0, 0, 0, KeyEvent.KEYCODE_DEL, 0, 0, 0, 0, KeyEvent.KEYCODE_ENDCALL);
+				mEditMessage.dispatchKeyEvent(event);
+			}
+		});
 
         // To toggle between text keyboard and emoji keyboard keyboard(Popup)
         mEmojButton.setOnClickListener(new OnClickListener() {
@@ -486,7 +389,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		snackbarAction = (TextView) view.findViewById(R.id.snackbar_action);
 
 		messagesView = (ListView) view.findViewById(R.id.messages_view);
-		messagesView.setOnScrollListener(mOnScrollListener);
 		messagesView.setTranscriptMode(ListView.TRANSCRIPT_MODE_NORMAL);
 		messageListAdapter = new MessageAdapter((ConversationActivity) getActivity(), this.messageList);
 		messageListAdapter.setOnContactPictureClicked(new OnContactPictureClicked() {
@@ -533,6 +435,12 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 
 		registerForContextMenu(messagesView);
 
+		// Start of swipe refresh
+		// New Swipe refresh
+		swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.swipe_refresh_container);
+		swipeLayout.setOnRefreshListener(new ConversationSwipeRefreshListener(messageList, swipeLayout, this, messagesView, messageListAdapter));
+		// End of swipe refresh
+
 		return view;
 	}
 
@@ -671,7 +579,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			resId = R.string.file_url;
 			url = message.getFileParams().url.toString();
 		} else {
-			url = message.getBody().trim();
+			url = message.getBody();
 			resId = R.string.file_url;
 		}
 		if (activity.copyTextToClipboard(url, resId)) {
@@ -763,11 +671,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		this.mEditMessage.setKeyboardListener(this);
 		this.messagesView.setAdapter(messageListAdapter);
 		updateMessages();
-		this.messagesLoaded = true;
 		int size = this.messageList.size();
 		if (size > 0) {
 			messagesView.setSelection(size - 1);
 		}
+        swipeLayout.setRefreshing(false);
 	}
 
 	private OnClickListener mUnblockClickListener = new OnClickListener() {
@@ -1094,7 +1002,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		this.mSendButton.setImageResource(getSendButtonImageResource(action, status));
 	}
 
-	protected void updateStatusMessages() {
+	public void updateStatusMessages() {
 		synchronized (this.messageList) {
 			if (conversation.getMode() == Conversation.MODE_SINGLE) {
 				ChatState state = conversation.getIncomingChatState();
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
index 36e2cca0..46a68f65 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
@@ -12,6 +12,7 @@ import de.duenndns.ssl.MemorizingTrustManager;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.xmpp.XmppConnection;
+import github.ankushsachdeva.emojicon.EmojiconHandler;
 
 import android.app.AlertDialog;
 import android.app.Fragment;
@@ -165,8 +166,11 @@ public class SettingsActivity extends XmppActivity implements
 				}
 				break;
 			case "dont_trust_system_cas":
-			xmppConnectionService.updateMemorizingTrustmanager();
-			reconnectAccounts();
+				xmppConnectionService.updateMemorizingTrustmanager();
+				reconnectAccounts();
+				break;
+			case "parse_emoticons":
+				EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS);
 				break;
 		}
 	}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
index c9698114..2da7bea3 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
@@ -107,8 +107,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			Pair<String,Boolean> preview = UIHelper.getMessagePreview(activity,message);
 			mLastMessage.setVisibility(View.VISIBLE);
 			imagePreview.setVisibility(View.GONE);
-            boolean parseEmoticons = Settings.PARSE_EMOTICONS;
-            CharSequence msgText = parseEmoticons ? UIHelper.transformAsciiEmoticons(getContext(), preview.first) : preview.first;
+            CharSequence msgText = preview.first;
 			mLastMessage.setText(msgText);
 			if (preview.second) {
 				if (conversation.isRead()) {
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index 67391136..48debdaf 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -251,10 +251,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 							Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 					viewHolder.messageBody.setText(span);
 				} else {
-                    boolean parseEmoticons = Settings.PARSE_EMOTICONS;
-                    viewHolder.messageBody.setText(parseEmoticons ? UIHelper
-                            .transformAsciiEmoticons(getContext(), message.getMergedBody())
-                            : formattedBody);
+                    viewHolder.messageBody.setText(formattedBody);
 				}
 			} else {
 				String privateMarker;
@@ -528,8 +525,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		} else {
 			if (GeoHelper.isGeoUri(message.getBody())) {
 				displayLocationMessage(viewHolder,message);
-			} else if (message.bodyIsHeart()) {
-				displayHeartMessage(viewHolder, message.getBody().trim());
 			} else if (message.treatAsDownloadable() == Message.Decision.MUST) {
 				displayDownloadableMessage(viewHolder, message, activity.getString(R.string.check_x_filesize, UIHelper.getFileDescriptionString(activity, message)));
 			} else {