diff --git a/libs/bcprov-jdk15on-1.50.jar b/libs/bcprov-jdk15on-1.50.jar new file mode 100644 index 00000000..d4b510d7 Binary files /dev/null and b/libs/bcprov-jdk15on-1.50.jar differ diff --git a/libs/libidn-1.15.jar b/libs/libidn-1.15.jar new file mode 100644 index 00000000..79a44f92 Binary files /dev/null and b/libs/libidn-1.15.jar differ diff --git a/libs/minidns/AndroidManifest.xml b/libs/minidns/AndroidManifest.xml new file mode 100644 index 00000000..6c9477d9 --- /dev/null +++ b/libs/minidns/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/libs/minidns/lint.xml b/libs/minidns/lint.xml new file mode 100644 index 00000000..ee0eead5 --- /dev/null +++ b/libs/minidns/lint.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/libs/minidns/project.properties b/libs/minidns/project.properties new file mode 100644 index 00000000..4ab12569 --- /dev/null +++ b/libs/minidns/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-19 diff --git a/libs/otr4j-0.21.jar b/libs/otr4j-0.21.jar new file mode 100644 index 00000000..85bc69e6 Binary files /dev/null and b/libs/otr4j-0.21.jar differ diff --git a/libs/zxing/android-core-3.1.0.jar b/libs/zxing/android-core-3.1.0.jar new file mode 100644 index 00000000..0c6137de Binary files /dev/null and b/libs/zxing/android-core-3.1.0.jar differ diff --git a/libs/zxing/android-integration-3.1.0.jar b/libs/zxing/android-integration-3.1.0.jar new file mode 100644 index 00000000..fb621f8b Binary files /dev/null and b/libs/zxing/android-integration-3.1.0.jar differ diff --git a/libs/zxing/core-3.1.0.jar b/libs/zxing/core-3.1.0.jar new file mode 100644 index 00000000..63c228a9 Binary files /dev/null and b/libs/zxing/core-3.1.0.jar differ diff --git a/src/main/.project b/src/main/.project new file mode 100644 index 00000000..d2f05ef9 --- /dev/null +++ b/src/main/.project @@ -0,0 +1,33 @@ + + + ConversationActivity + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 32f95431..a44851e3 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -2,6 +2,7 @@ package eu.siacs.conversations.ui.adapter; import java.util.List; +import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Downloadable; @@ -139,7 +140,7 @@ public class ConversationAdapter extends ArrayAdapter { if ((message.getEncryption() != Message.ENCRYPTION_PGP) && (message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) { mLastMessage.setText(Config.PARSE_EMOTICONS ? UIHelper - .transformAsciiEmoticons(message.getBody()) : message + .transformAsciiEmoticons(getContext(), message.getBody()) : message .getBody()); } else { mLastMessage.setText(R.string.encrypted_message_received); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 83b4e41b..249edecd 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -23,6 +23,7 @@ import android.widget.Toast; import java.util.List; +import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Contact; @@ -225,7 +226,7 @@ public class MessageAdapter extends ArrayAdapter { if (message.getBody() != null) { if (message.getType() != Message.TYPE_PRIVATE) { viewHolder.messageBody.setText(Config.PARSE_EMOTICONS ? UIHelper - .transformAsciiEmoticons(message.getMergedBody()) + .transformAsciiEmoticons(getContext(), message.getMergedBody()) : message.getMergedBody()); } else { String privateMarker; diff --git a/src/main/project.properties b/src/main/project.properties new file mode 100644 index 00000000..4ab12569 --- /dev/null +++ b/src/main/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-19