moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed a small graphic glitch

This commit is contained in:
Daniel Gultsch 2014-02-28 03:22:05 +01:00
parent 9581dfcde4
commit 03d96266f8
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/fragment_conversation.xml
View File

@ -45,14 +45,16 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/textsend"
android:layout_below="@+id/info_box"
android:layout_alignParentLeft="true"
android:layout_below="@+id/info_box"
android:background="#e5e5e5"
tools:listitem="@layout/message_sent"
android:divider="@null"
android:dividerHeight="0dp"
android:transcriptMode="alwaysScroll"
android:listSelector="@android:color/transparent">
android:dividerHeight="0dp"
android:listSelector="@android:color/transparent"
android:transcriptMode="alwaysScroll"
tools:listitem="@layout/message_sent"
android:stackFromBottom="true">
</ListView>
<LinearLayout
android:id="@+id/info_box"

22
src/de/gultsch/chat/services/XmppConnectionService.java
View File

@ -210,16 +210,18 @@ public class XmppConnectionService extends Service {
} else if (show.getContent().equals("dnd")) {
contact.updatePresence(fromParts[1], Presences.DND);
}
Element x = packet.findChild("x");
if ((x != null)
&& (x.getAttribute("xmlns").equals("jabber:x:signed"))) {
try {
Log.d(LOGTAG,"pgp signature for contact" +packet.getAttribute("from"));
contact.setPgpKeyId(getPgpEngine().fetchKeyId(packet.findChild("status")
.getContent(), x.getContent()));
databaseBackend.updateContact(contact);
} catch (OpenPgpException e) {
Log.d(LOGTAG,"faulty pgp. just ignore");
PgpEngine pgp = getPgpEngine();
if (pgp!=null) {
Element x = packet.findChild("x");
if ((x != null)
&& (x.getAttribute("xmlns").equals("jabber:x:signed"))) {
try {
Log.d(LOGTAG,"pgp signature for contact" +packet.getAttribute("from"));
contact.setPgpKeyId(pgp.fetchKeyId(packet.findChild("status")
.getContent(), x.getContent()));
} catch (OpenPgpException e) {
Log.d(LOGTAG,"faulty pgp. just ignore");
}
}
}
databaseBackend.updateContact(contact);