changes to get it working under eclipse
This commit is contained in:
parent
95e2a53951
commit
71bb1e90b0
13 changed files with 81 additions and 2 deletions
libs
src/main
BIN
libs/bcprov-jdk15on-1.50.jar
Normal file
BIN
libs/bcprov-jdk15on-1.50.jar
Normal file
Binary file not shown.
BIN
libs/libidn-1.15.jar
Normal file
BIN
libs/libidn-1.15.jar
Normal file
Binary file not shown.
13
libs/minidns/AndroidManifest.xml
Normal file
13
libs/minidns/AndroidManifest.xml
Normal file
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="de.measite.minidns"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="9"
|
||||
android:targetSdkVersion="19" />
|
||||
|
||||
<application/>
|
||||
|
||||
</manifest>
|
3
libs/minidns/lint.xml
Normal file
3
libs/minidns/lint.xml
Normal file
|
@ -0,0 +1,3 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<lint>
|
||||
</lint>
|
14
libs/minidns/project.properties
Normal file
14
libs/minidns/project.properties
Normal file
|
@ -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
|
BIN
libs/otr4j-0.21.jar
Normal file
BIN
libs/otr4j-0.21.jar
Normal file
Binary file not shown.
BIN
libs/zxing/android-core-3.1.0.jar
Normal file
BIN
libs/zxing/android-core-3.1.0.jar
Normal file
Binary file not shown.
BIN
libs/zxing/android-integration-3.1.0.jar
Normal file
BIN
libs/zxing/android-integration-3.1.0.jar
Normal file
Binary file not shown.
BIN
libs/zxing/core-3.1.0.jar
Normal file
BIN
libs/zxing/core-3.1.0.jar
Normal file
Binary file not shown.
33
src/main/.project
Normal file
33
src/main/.project
Normal file
|
@ -0,0 +1,33 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>ConversationActivity</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
|
@ -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<Conversation> {
|
|||
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);
|
||||
|
|
|
@ -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<Message> {
|
|||
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;
|
||||
|
|
14
src/main/project.properties
Normal file
14
src/main/project.properties
Normal file
|
@ -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
|
Loading…
Add table
Reference in a new issue