diff options
Diffstat (limited to 'src/eu/siacs/conversations/ui')
3 files changed, 10 insertions, 10 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 48fa8c69a..9309db9cf 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -406,7 +406,7 @@ public class ConversationFragment extends Fragment { } for (Message message : this.conversation.getMessages()) { if ((message.getEncryption() == Message.ENCRYPTION_PGP) - && ((message.getStatus() == Message.STATUS_RECIEVED) || (message + && ((message.getStatus() == Message.STATUS_RECEIVED) || (message .getStatus() == Message.STATUS_SEND))) { decryptMessage(message); break; @@ -472,7 +472,7 @@ public class ConversationFragment extends Fragment { --i; } } else { - if (this.messageList.get(i).getStatus() == Message.STATUS_RECIEVED) { + if (this.messageList.get(i).getStatus() == Message.STATUS_RECEIVED) { addedStatusMsg = true; } else { if (this.messageList.get(i).getStatus() == Message.STATUS_SEND_DISPLAYED) { diff --git a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 664038043..fcc576018 100644 --- a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -67,7 +67,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { convLastMsg.setVisibility(View.VISIBLE); imagePreview.setVisibility(View.GONE); } else if (latestMessage.getType() == Message.TYPE_IMAGE) { - if (latestMessage.getStatus() >= Message.STATUS_RECIEVED) { + if (latestMessage.getStatus() >= Message.STATUS_RECEIVED) { convLastMsg.setVisibility(View.GONE); imagePreview.setVisibility(View.VISIBLE); activity.loadBitmap(latestMessage, imagePreview); @@ -77,7 +77,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { if (latestMessage.getStatus() == Message.STATUS_RECEIVED_OFFER) { convLastMsg.setText(activity .getText(R.string.image_offered_for_download)); - } else if (latestMessage.getStatus() == Message.STATUS_RECIEVING) { + } else if (latestMessage.getStatus() == Message.STATUS_RECEIVING) { convLastMsg.setText(activity .getText(R.string.receiving_image)); } else { diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 72587f990..2452a5555 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -81,7 +81,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { public int getItemViewType(int position) { if (getItem(position).getType() == Message.TYPE_STATUS) { return STATUS; - } else if (getItem(position).getStatus() <= Message.STATUS_RECIEVED) { + } else if (getItem(position).getStatus() <= Message.STATUS_RECEIVED) { return RECIEVED; } else { return SENT; @@ -93,7 +93,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { String info = null; boolean error = false; boolean multiReceived = message.getConversation().getMode() == Conversation.MODE_MULTI - && message.getStatus() <= Message.STATUS_RECIEVED; + && message.getStatus() <= Message.STATUS_RECEIVED; if (message.getType() == Message.TYPE_IMAGE) { String[] fileParams = message.getBody().split(","); try { @@ -152,7 +152,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { String formatedTime = UIHelper.readableTimeDifference(getContext(), message.getTimeSent()); - if (message.getStatus() <= Message.STATUS_RECIEVED) { + if (message.getStatus() <= Message.STATUS_RECEIVED) { if ((filesize != null) && (info != null)) { viewHolder.time.setText(filesize + " \u00B7 " + info); } else if ((filesize == null) && (info != null)) { @@ -215,7 +215,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { viewHolder.messageBody.setText(message.getBody().trim()); } else { String privateMarker; - if (message.getStatus() <= Message.STATUS_RECIEVED) { + if (message.getStatus() <= Message.STATUS_RECEIVED) { privateMarker = activity.getString(R.string.private_message); } else { String to; @@ -321,7 +321,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { break; case RECIEVED: view = (View) activity.getLayoutInflater().inflate( - R.layout.message_recieved, parent, false); + R.layout.message_received, parent, false); viewHolder.message_box = (LinearLayout) view .findViewById(R.id.message_box); viewHolder.contact_picture = (ImageView) view @@ -428,7 +428,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { } if (item.getType() == Message.TYPE_IMAGE) { - if (item.getStatus() == Message.STATUS_RECIEVING) { + if (item.getStatus() == Message.STATUS_RECEIVING) { displayInfoMessage(viewHolder, R.string.receiving_image); } else if (item.getStatus() == Message.STATUS_RECEIVED_OFFER) { viewHolder.image.setVisibility(View.GONE); |