aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout/message_received.xml (renamed from res/layout/message_recieved.xml)40
-rw-r--r--res/layout/message_sent.xml42
-rw-r--r--src/eu/siacs/conversations/entities/Message.java4
-rw-r--r--src/eu/siacs/conversations/parser/MessageParser.java18
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java4
-rw-r--r--src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java4
-rw-r--r--src/eu/siacs/conversations/ui/adapter/MessageAdapter.java12
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java6
8 files changed, 63 insertions, 67 deletions
diff --git a/res/layout/message_recieved.xml b/res/layout/message_received.xml
index ec003920..f7ff44d5 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_received.xml
@@ -3,10 +3,10 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:paddingBottom="4dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingBottom="4dp"
- android:paddingTop="4dp">
+ android:paddingTop="4dp" >
<LinearLayout
android:id="@+id/message_box"
@@ -21,31 +21,30 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:background="@color/primarybackground"
- android:orientation="vertical"
android:gravity="center_vertical"
- android:paddingTop="4dp"
+ android:orientation="vertical"
android:paddingBottom="4dp"
+ android:paddingLeft="5dp"
android:paddingRight="5dp"
- android:paddingLeft="5dp">
+ android:paddingTop="4dp" >
- <ImageView
+ <ImageView
android:id="@+id/message_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
- android:paddingBottom="2dp"
- android:scaleType="centerCrop"
android:background="@color/primarytext"
- />
-
+ android:paddingBottom="2dp"
+ android:scaleType="centerCrop" />
+
<TextView
android:id="@+id/message_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
+ android:textColor="@color/primarytext"
android:textIsSelectable="true"
- android:textSize="14sp"
- android:textColor="@color/primarytext"/>
+ android:textSize="14sp" />
<Button
android:id="@+id/download_button"
@@ -53,24 +52,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/download_image"
- android:visibility="gone"/>
+ android:visibility="gone" />
- <LinearLayout
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingTop="1dp">
+ android:paddingTop="1dp" >
<ImageView
android:id="@+id/security_indicator"
android:layout_width="12sp"
android:layout_height="12sp"
android:layout_gravity="center_vertical"
- android:gravity="center_vertical"
+ android:layout_marginRight="6sp"
android:layout_marginTop="2sp"
- android:src="@drawable/ic_indicator"
- android:layout_marginRight="6sp"/>
-
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_indicator" />
<TextView
android:id="@+id/message_time"
@@ -79,8 +77,8 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textSize="12sp"
- android:textColor="@color/secondarytext"/>
+ android:textColor="@color/secondarytext"
+ android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index 21563eb4..11514019 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -3,10 +3,10 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:paddingBottom="4dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingBottom="4dp"
- android:paddingTop="4dp">
+ android:paddingTop="4dp" >
<LinearLayout
android:id="@+id/message_box"
@@ -21,38 +21,37 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:background="@color/primarybackground"
- android:orientation="vertical"
android:gravity="center_vertical"
- android:paddingTop="4dp"
+ android:orientation="vertical"
android:paddingBottom="4dp"
+ android:paddingLeft="5dp"
android:paddingRight="5dp"
- android:paddingLeft="5dp">
-
- <ImageView
+ android:paddingTop="4dp" >
+
+ <ImageView
android:id="@+id/message_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
- android:paddingBottom="2dp"
- android:scaleType="centerCrop"
android:background="@color/primarytext"
- />
+ android:paddingBottom="2dp"
+ android:scaleType="centerCrop" />
<TextView
android:id="@+id/message_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
+ android:textColor="@color/primarytext"
android:textIsSelectable="true"
- android:textSize="14sp"
- android:textColor="@color/primarytext"/>
+ android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
android:layout_gravity="right"
- android:paddingTop="1dp">
+ android:orientation="horizontal"
+ android:paddingTop="1dp" >
<TextView
android:id="@+id/message_time"
@@ -61,19 +60,18 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textSize="12sp"
- android:textColor="@color/secondarytext"/>
-
- <ImageView
+ android:textColor="@color/secondarytext"
+ android:textSize="12sp" />
+
+ <ImageView
android:id="@+id/security_indicator"
android:layout_width="12sp"
android:layout_height="12sp"
android:layout_gravity="center_vertical"
- android:gravity="center_vertical"
+ android:layout_marginLeft="6sp"
android:layout_marginTop="2sp"
- android:src="@drawable/ic_indicator"
- android:layout_marginLeft="6sp"/>
-
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_indicator" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java
index 6d70b66d..9dea2f8a 100644
--- a/src/eu/siacs/conversations/entities/Message.java
+++ b/src/eu/siacs/conversations/entities/Message.java
@@ -12,8 +12,8 @@ public class Message extends AbstractEntity {
public static final int STATUS_RECEPTION_FAILED = -3;
public static final int STATUS_RECEIVED_OFFER = -2;
- public static final int STATUS_RECIEVING = -1;
- public static final int STATUS_RECIEVED = 0;
+ public static final int STATUS_RECEIVING = -1;
+ public static final int STATUS_RECEIVED = 0;
public static final int STATUS_UNSEND = 1;
public static final int STATUS_SEND = 2;
public static final int STATUS_SEND_FAILED = 3;
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index ad1ce9b9..0d46074d 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -34,11 +34,11 @@ public class MessageParser extends AbstractParser implements
Message finishedMessage;
if (pgpBody != null) {
finishedMessage = new Message(conversation, packet.getFrom(),
- pgpBody, Message.ENCRYPTION_PGP, Message.STATUS_RECIEVED);
+ pgpBody, Message.ENCRYPTION_PGP, Message.STATUS_RECEIVED);
} else {
finishedMessage = new Message(conversation, packet.getFrom(),
packet.getBody(), Message.ENCRYPTION_NONE,
- Message.STATUS_RECIEVED);
+ Message.STATUS_RECEIVED);
}
finishedMessage.setRemoteMsgId(packet.getId());
if (conversation.getMode() == Conversation.MODE_MULTI
@@ -115,7 +115,7 @@ public class MessageParser extends AbstractParser implements
.setLatestMarkableMessageId(getMarkableMessageId(packet));
Message finishedMessage = new Message(conversation,
packet.getFrom(), body, Message.ENCRYPTION_OTR,
- Message.STATUS_RECIEVED);
+ Message.STATUS_RECEIVED);
finishedMessage.setTime(getTimestamp(packet));
finishedMessage.setRemoteMsgId(packet.getId());
return finishedMessage;
@@ -156,7 +156,7 @@ public class MessageParser extends AbstractParser implements
status = Message.STATUS_SEND;
}
} else {
- status = Message.STATUS_RECIEVED;
+ status = Message.STATUS_RECEIVED;
}
String pgpBody = getPgpBody(packet);
conversation.setLatestMarkableMessageId(getMarkableMessageId(packet));
@@ -169,7 +169,7 @@ public class MessageParser extends AbstractParser implements
Message.ENCRYPTION_PGP, status);
}
finishedMessage.setRemoteMsgId(packet.getId());
- if (status == Message.STATUS_RECIEVED) {
+ if (status == Message.STATUS_RECEIVED) {
finishedMessage.setTrueCounterpart(conversation.getMucOptions()
.getTrueCounterpart(counterPart));
}
@@ -186,7 +186,7 @@ public class MessageParser extends AbstractParser implements
Element forwarded;
if (packet.hasChild("received")) {
forwarded = packet.findChild("received").findChild("forwarded");
- status = Message.STATUS_RECIEVED;
+ status = Message.STATUS_RECEIVED;
} else if (packet.hasChild("sent")) {
forwarded = packet.findChild("sent").findChild("forwarded");
status = Message.STATUS_SEND;
@@ -198,12 +198,12 @@ public class MessageParser extends AbstractParser implements
}
Element message = forwarded.findChild("message");
if ((message == null) || (!message.hasChild("body"))) {
- if (status == Message.STATUS_RECIEVED && message.getAttribute("from")!=null) {
+ if (status == Message.STATUS_RECEIVED && message.getAttribute("from")!=null) {
parseNormal(message, account);
}
return null;
}
- if (status == Message.STATUS_RECIEVED) {
+ if (status == Message.STATUS_RECEIVED) {
fullJid = message.getAttribute("from");
if (fullJid == null) {
return null;
@@ -389,7 +389,7 @@ public class MessageParser extends AbstractParser implements
} else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) {
message = this.parseGroupchat(packet, account);
if (message != null) {
- if (message.getStatus() == Message.STATUS_RECIEVED) {
+ if (message.getStatus() == Message.STATUS_RECEIVED) {
message.markUnread();
} else {
message.getConversation().markRead();
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 48fa8c69..9309db9c 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 66403804..fcc57601 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 72587f99..2452a555 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);
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 1f1dfb21..bfdbb7cc 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -98,7 +98,7 @@ public class JingleConnection {
+ imageHeight);
mXmppConnectionService.databaseBackend.createMessage(message);
mXmppConnectionService.markMessage(message,
- Message.STATUS_RECIEVED);
+ Message.STATUS_RECEIVED);
}
Log.d("xmppService",
"sucessfully transmitted file:" + file.getAbsolutePath());
@@ -380,7 +380,7 @@ public class JingleConnection {
private void sendAccept() {
status = STATUS_ACCEPTED;
- mXmppConnectionService.markMessage(message, Message.STATUS_RECIEVING);
+ mXmppConnectionService.markMessage(message, Message.STATUS_RECEIVING);
this.mJingleConnectionManager.getPrimaryCandidate(this.account,
new OnPrimaryCandidateFound() {
@@ -618,7 +618,7 @@ public class JingleConnection {
this.disconnect();
this.status = STATUS_FINISHED;
this.mXmppConnectionService.markMessage(this.message,
- Message.STATUS_RECIEVED);
+ Message.STATUS_RECEIVED);
this.mJingleConnectionManager.finishConnection(this);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 03:21:20 +0000